diff options
author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2023-05-03 15:58:03 -0700 |
---|---|---|
committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2023-05-03 15:58:03 -0700 |
commit | 6b8d5abd7fc1d2f1d6f794640117c649eae3e01a (patch) | |
tree | 0ad0436287ad1f9bbd3cfb28f7574d5a6710592f /revert-11_Obsoletion-and-removal-of-useless-bathroom-fluff-247.patch | |
parent | Updated to 2023-04-15-1344 (diff) | |
download | cataclysm-bn-6b8d5abd7fc1d2f1d6f794640117c649eae3e01a.tar.xz |
Updated to 2023-04-30-2223
Revert more ammo patches.
Revert more books patches.
Clean up old book patch.
Fix removed traits patch.
Fix bathroom fluff patch.
Remove obsolete vacutainer patch.
Rename source patches.
Diffstat (limited to 'revert-11_Obsoletion-and-removal-of-useless-bathroom-fluff-247.patch')
-rw-r--r-- | revert-11_Obsoletion-and-removal-of-useless-bathroom-fluff-247.patch | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/revert-11_Obsoletion-and-removal-of-useless-bathroom-fluff-247.patch b/revert-11_Obsoletion-and-removal-of-useless-bathroom-fluff-247.patch index a923498..d77abe5 100644 --- a/revert-11_Obsoletion-and-removal-of-useless-bathroom-fluff-247.patch +++ b/revert-11_Obsoletion-and-removal-of-useless-bathroom-fluff-247.patch @@ -358,7 +358,7 @@ diff --git a/data/json/obsoletion/items.json b/data/json/obsoletion/items.json index f2a8063e7ef..e0a1a36ce29 100644 --- a/data/json/obsoletion/items.json +++ b/data/json/obsoletion/items.json -@@ -4354,5 +4354,131 @@ +@@ -4354,6 +4354,132 @@ "cutting": 3, "to_hit": -3, "flags": [ "STAB", "SHEATH_KNIFE", "CONDUCTIVE" ] @@ -488,8 +488,9 @@ index f2a8063e7ef..e0a1a36ce29 100644 + "material": [ "steel", "plastic" ], + "bashing": 3, + "to_hit": 1 - } - ] + }, + { + "id": "lycra_patch", diff --git a/data/json/uncraft/generic.json b/data/json/uncraft/generic.json index 30a4c1b1ace..ceacdc75895 100644 --- a/data/json/uncraft/generic.json |