summaryrefslogtreecommitdiff
path: root/0011-4570-ammo-can-be-dismantled.patch
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2021-01-25 13:31:31 -0800
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2021-01-25 13:31:31 -0800
commitc91c5214972007062998c341c0e5b226eed9267b (patch)
treef9408f0ec6a6aa7d39b8d969193b209e35ac3e66 /0011-4570-ammo-can-be-dismantled.patch
parentAdd revised stop sleeping on tables patch (diff)
downloadcataclysm-dda-c91c5214972007062998c341c0e5b226eed9267b.tar.xz
Merge CBM fixes into one patch
Expand CBM fixes to scalpels and hearing
Diffstat (limited to '0011-4570-ammo-can-be-dismantled.patch')
-rw-r--r--0011-4570-ammo-can-be-dismantled.patch34
1 files changed, 0 insertions, 34 deletions
diff --git a/0011-4570-ammo-can-be-dismantled.patch b/0011-4570-ammo-can-be-dismantled.patch
deleted file mode 100644
index 3681df5..0000000
--- a/0011-4570-ammo-can-be-dismantled.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/data/json/recipes/ammo/rifle.json
-+++ b/data/json/recipes/ammo/rifle.json
-@@ -385,6 +385,7 @@
- "batch_time_factors": [ 60, 5 ],
- "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 4 ] ],
- "charges": 1,
-+ "reversible": true,
- "using": [ [ "bullet_forming", 15 ], [ "ammo_bullet", 8 ] ],
- "components": [
- [ [ "4570_casing", 1 ] ],
-@@ -406,6 +407,7 @@
- "batch_time_factors": [ 60, 5 ],
- "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 4 ] ],
- "charges": 1,
-+ "reversible": true,
- "using": [ [ "bullet_forming", 15 ], [ "ammo_bullet", 8 ] ],
- "components": [
- [ [ "4570_casing", 1 ] ],
-@@ -426,6 +428,7 @@
- "batch_time_factors": [ 60, 5 ],
- "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 4 ] ],
- "charges": 1,
-+ "reversible": true,
- "using": [ [ "bullet_forming", 15 ], [ "ammo_bullet", 8 ] ],
- "components": [
- [ [ "4570_casing", 1 ] ],
-@@ -446,6 +449,7 @@
- "batch_time_factors": [ 60, 5 ],
- "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 4 ] ],
- "charges": 1,
-+ "reversible": true,
- "using": [ [ "bullet_forming", 15 ], [ "ammo_bullet", 8 ] ],
- "components": [ [ [ "4570_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "chem_black_powder", 12 ] ], [ [ "lead", 9 ] ] ]
- },