Merge pull request #47878 from Xenomorph-III/1st_aid_fix

Add scissors to the First Aid Kit
CleverRaven · Mar 6, 2021 · 6b8695f · 6b8695f
2 parents 5960368 + b96a958
commit 6b8695f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/data/json/itemgroups/tools.json b/data/json/itemgroups/tools.json
@@ -347,7 +347,8 @@
       { "item": "adhesive_bandages", "charges": 6 },
       { "item": "bandages", "charges": 3 },
       { "item": "medical_gauze", "count": 6 },
-      { "item": "booklet_firstaid" }
+      { "item": "booklet_firstaid" },
+      { "item": "scissors" }
     ]
   },
   {
@@ -363,7 +364,8 @@
       { "item": "adhesive_bandages", "charges": [ 0, 6 ] },
       { "item": "bandages", "charges": [ 0, 3 ] },
       { "item": "medical_gauze", "count": [ 0, 6 ] },
-      { "item": "booklet_firstaid", "prob": 50 }
+      { "item": "booklet_firstaid", "prob": 50 },
+      { "item": "scissors", "prob": 50 }
     ]
   },
   {

diff --git a/data/json/items/containers.json b/data/json/items/containers.json
@@ -1717,15 +1717,15 @@
     "looks_like": "1st_aid",
     "description": "A plastic box that used to contain a first aid kit.",
     "weight": "50 g",
-    "volume": "2600 ml",
+    "volume": "2650 ml",
     "price": 0,
     "price_postapoc": 0,
     "to_hit": -2,
     "material": [ "plastic" ],
     "pocket_data": [
       {
         "pocket_type": "CONTAINER",
-        "max_contains_volume": "2300 ml",
+        "max_contains_volume": "2450 ml",
         "max_contains_weight": "3 kg",
         "rigid": true,
         "moves": 400

diff --git a/data/json/items/tool/stationary.json b/data/json/items/tool/stationary.json
@@ -54,7 +54,7 @@
     "description": "These are a long pair of heavy-duty scissors.  Use scissors to cut items made from cotton (like clothing) into rags.",
     "ascii_picture": "scissors",
     "weight": "113 g",
-    "volume": "250 ml",
+    "volume": "145 ml",
     "price": 400,
     "price_postapoc": 10,
     "to_hit": -1,