From 0ab5f48cfc3b4ea958691a3e13ac479f02dbe66d Mon Sep 17 00:00:00 2001
From: Jerimee Richir <jerimee.richir@gmail.com>
Date: Tue, 24 Dec 2019 13:11:56 -0500
Subject: [PATCH] more variety is SUS shelter items (#36284)

* Update evac_shelter.json

* Update generic.json

* Update data/json/itemgroups/SUS/evac_shelter.json

Co-Authored-By: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>

* Update evac_shelter.json

* Update evac_shelter.json

* Update evac_shelter.json

* Update evac_shelter.json

Co-authored-by: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
---
 data/json/itemgroups/SUS/evac_shelter.json | 15 +++++++++++----
 data/json/items/generic.json               | 13 +++++++++++++
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/data/json/itemgroups/SUS/evac_shelter.json b/data/json/itemgroups/SUS/evac_shelter.json
index bd7f9d562f9e9..67739a044b844 100644
--- a/data/json/itemgroups/SUS/evac_shelter.json
+++ b/data/json/itemgroups/SUS/evac_shelter.json
@@ -3,7 +3,7 @@
     "id": "SUS_evac_shelter_locker",
     "type": "item_group",
     "//": "SUS item groups are collections that contain a reasonable realistic distribution of items that might spawn in a given storage furniture.",
-    "//2": "Each locker contains by spec one jacket, one blanket, one gas mask, a flashlight, a plastic bowl and utensils, a lighter, and two bottles of water.  Not every locker is fully stocked.",
+    "//2": "Each locker contains by spec one jacket, one blanket, one gas mask, a flashlight, a whistle, a plastic bowl and utensils, a lighter, and two bottles of water.  Not every locker is fully stocked.",
     "subtype": "collection",
     "entries": [
       { "item": "evac_pamphlet", "prob": 99 },
@@ -13,6 +13,7 @@
       { "item": "flashlight", "prob": 50 },
       { "item": "light_disposable_cell", "prob": 10 },
       { "item": "lighter", "prob": 20 },
+      { "item": "whistle", "prob": 70 },
       { "item": "water_clean", "count": [ 1, 2 ], "prob": 80 },
       { "item": "protein_bar_evac", "count": [ 2, 3 ] },
       {
@@ -83,7 +84,8 @@
               { "item": "1st_aid", "count": [ 1, 3 ], "prob": 65 },
               { "item": "two_way_radio", "prob": 65 },
               { "item": "light_disposable_cell", "count": [ 2, 4 ], "prob": 65 },
-              { "item": "electric_lantern", "prob": 35 }
+              { "item": "electric_lantern", "prob": 35 },
+              { "item": "barometer", "prob": 8 }
             ],
             "prob": 10
           },
@@ -92,7 +94,8 @@
               { "item": "detergent", "count": [ 0, 2 ] },
               { "item": "brush", "prob": 85 },
               { "item": "bleach", "prob": 45 },
-              { "item": "ammonia", "prob": 15 }
+              { "item": "ammonia", "prob": 15 },
+              { "item": "vinegar", "prob": 10 }
             ],
             "prob": 15
           },
@@ -121,6 +124,7 @@
         "distribution": [
           {
             "collection": [
+              { "item": "folding_poncho", "count": [ 1, 10 ], "prob": 60 },
               { "item": "emer_blanket", "count": [ 1, 10 ], "prob": 60 },
               { "item": "jacket_evac", "count": [ 1, 10 ], "prob": 50 }
             ],
@@ -139,7 +143,8 @@
               { "item": "extinguisher", "prob": 50 },
               { "item": "1st_aid", "prob": 5 },
               { "item": "two_way_radio", "prob": 25 },
-              { "item": "electric_lantern", "prob": 5 }
+              { "item": "electric_lantern", "prob": 5 },
+              { "item": "wearable_light", "prob": 5 }
             ],
             "prob": 10
           },
@@ -163,6 +168,7 @@
               { "item": "box_small", "prob": 5 },
               { "item": "bag_plastic", "prob": 5 },
               { "item": "bowl_plastic", "prob": 5 },
+              { "item": "vitamins", "prob": 5 },
               { "item": "can_food_unsealed", "count": [ 1, 30 ], "prob": 90 },
               { "item": "can_opener", "prob": 90 }
             ],
@@ -184,6 +190,7 @@
       { "item": "brush", "prob": 90 },
       { "item": "bleach", "prob": 45 },
       { "item": "ammonia", "prob": 25 },
+      { "item": "mirror", "prob": 12 },
       { "item": "1st_aid", "prob": 60 },
       { "item": "paper", "count": [ 1, 3 ] },
       { "item": "evac_pamphlet", "prob": 10 }
diff --git a/data/json/items/generic.json b/data/json/items/generic.json
index b7094d6e3251f..af4fe82d2a0b5 100644
--- a/data/json/items/generic.json
+++ b/data/json/items/generic.json
@@ -2403,6 +2403,19 @@
     "volume": "750 ml",
     "flags": [ "SLEEP_AID" ]
   },
+  {
+    "type": "GENERIC",
+    "id": "teddy_bear",
+    "symbol": "o",
+    "color": "brown",
+    "name": "teddy bear",
+    "description": "A mass produced plush teddy bear.  It is wearing a little red tshirt but no pants.",
+    "price": 200,
+    "material": [ "cotton" ],
+    "weight": "444 g",
+    "volume": "850 ml",
+    "flags": [ "SLEEP_AID" ]
+  },
   {
     "type": "GENERIC",
     "id": "money_bundle",