summaryrefslogtreecommitdiff
path: root/0003-inconsistent-ammo-names.patch
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2021-10-18 08:54:08 -0700
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2021-10-18 08:54:08 -0700
commita334eb2b6e6eafe6ca7366e21900cc69af7f35bf (patch)
treeacae28822c4721c95e84d5e99d44fc0bf4f921a3 /0003-inconsistent-ammo-names.patch
parentFix more foods listed as incorrect materials. (diff)
downloadcataclysm-bn-a334eb2b6e6eafe6ca7366e21900cc69af7f35bf.tar.xz
Updated to 2021-10-16-1440
Fixes for electric shears, missing prices, military base overmap
Diffstat (limited to '0003-inconsistent-ammo-names.patch')
-rw-r--r--0003-inconsistent-ammo-names.patch11
1 files changed, 0 insertions, 11 deletions
diff --git a/0003-inconsistent-ammo-names.patch b/0003-inconsistent-ammo-names.patch
index 61d17ac..2c55e7f 100644
--- a/0003-inconsistent-ammo-names.patch
+++ b/0003-inconsistent-ammo-names.patch
@@ -45,17 +45,6 @@
"proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 },
"extend": { "effects": [ "RECYCLED" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
---- a/data/json/items/ammo/300blk.json
-+++ b/data/json/items/ammo/300blk.json
-@@ -26,7 +26,7 @@
- "id": "300blk_ss",
- "copy-from": "300blk",
- "type": "AMMO",
-- "name": { "str": ".300 AAC Blackout" },
-+ "name": { "str": ".300 AAC Blackout SS" },
- "description": "A subsonic .300 AAC Blackout round with a 220gr open tip match bullet. 300 BLK is an intermediate cartridge necked up from 5.56x45mm, designed to achieve similar ballistics to 7.62x39mm. It is compatible with standard AR-15 lower receivers and will feed from STANAG magazines.",
- "weight": "21 g",
- "range": 40,
--- a/data/json/items/ammo/308.json
+++ b/data/json/items/ammo/308.json
@@ -26,7 +26,7 @@