Update to 0.GHEADmaster

Port patches back to DDA.

1 files changed, 0 insertions, 56 deletions

diff --git a/tools-02_normalize-drone-volume.patch b/tools-02_normalize-drone-volume.patch
deleted file mode 100644
index 52a4157..0000000
--- a/tools-02_normalize-drone-volume.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/data/json/items/corpses/inactive_bots.json
-+++ b/data/json/items/corpses/inactive_bots.json
-@@ -5,7 +5,7 @@
-     "name": { "str": "inactive EMP hack" },
-     "description": "This is an inactive EMP hack.  EMP hacks are fist-sized robots that fly through the air.  This one contains an EMP grenade and attacks by flying at its target and detonating.  Use this item to reprogram and release the EMP hack.  Electronics and computer skill determines if the targeting matrix is reprogrammed successfully.",
-     "weight": "4700 g",
--    "volume": "750 ml",
-+    "volume": "250 ml",
-     "price": 64500,
-     "price_postapoc": 3000,
-     "to_hit": -3,
-@@ -31,7 +31,7 @@
-     "name": { "str": "inactive C-4 hack" },
-     "description": "This is an inactive C-4 hack.  C-4 hacks are fist-sized robots that fly through the air.  This one contains some C-4 and attacks by flying at its target and detonating.  Use this item to reprogram and activate the C-4 hack.  Electronics and computer skill determines if the targeting matrix is reprogrammed successfully.",
-     "weight": "5870 g",
--    "volume": "250 ml",
-+    "volume": "1000 ml",
-     "price": 67500,
-     "price_postapoc": 3000,
-     "to_hit": -3,
-@@ -57,7 +57,7 @@
-     "name": { "str": "inactive flashbang hack" },
-     "description": "This is an inactive flashbang hack.  Flashbang hacks are fist-sized robots that fly through the air.  This one contains a flashbang and attacks by flying at its target and detonating.  Use this item to reprogram and activate the flashbang hack.  Electronics and computer skill determines if the targeting matrix is reprogrammed successfully.",
-     "weight": "4536 g",
--    "volume": "750 ml",
-+    "volume": "250 ml",
-     "price": 59500,
-     "price_postapoc": 500,
-     "to_hit": -3,
-@@ -83,7 +83,7 @@
-     "name": { "str": "inactive tear gas hack" },
-     "description": "This is an inactive tear gas hack.  Tear gas hacks are fist-sized robots that fly through the air.  This one contains a tear gas canister and attacks by flying at its target and releasing tear gas.  Use this item to reprogram and activate the tear gas hack.  Electronics and computer skill determines if the targeting matrix is reprogrammed successfully.",
-     "weight": "5360 g",
--    "volume": "750 ml",
-+    "volume": "250 ml",
-     "price": 60500,
-     "price_postapoc": 500,
-     "to_hit": -3,
-@@ -157,7 +157,7 @@
-     "name": { "str": "inactive manhack" },
-     "description": "This is an inactive manhack.  Manhacks are fist-sized robots that fly through the air.  They are covered with whirring blades and attack by throwing themselves against their target.  Use this item to reprogram and activate the manhack.  Electronics and computer skill determines if the targeting matrix is reprogrammed successfully.",
-     "weight": "5400 g",
--    "volume": "750 ml",
-+    "volume": "250 ml",
-     "price": 60000,
-     "price_postapoc": 500,
-     "to_hit": -3,
-@@ -183,7 +183,7 @@
-     "name": { "str": "inactive mininuke hack" },
-     "description": "This is an inactive mininuke hack.  Many times as large as a normal manhack, a mininuke hack contains a mininuke and attack by flying at their target and detonating.  Use this item to reprogram and activate the mininuke hack.  Electronics and computer skill determines if the targeting matrix is reprogrammed successfully.",
-     "weight": "25000 g",
--    "volume": "18750 ml",
-+    "volume": "16 L",
-     "price": 2677500,
-     "price_postapoc": 10000,
-     "to_hit": -3,