Further updates evac shelters, adding vandalized and used variants. (#…

…35872)

* Add mi-go atmosphere effect

* Major evac center update

* fix errors caught in play test

* minor tweaks

* further tweak spawn chances

* Adjustments to shelter, add vandalized version to first shelter, change location of basement so stairs align

* add bad food vitamin

* Update effects.json

* Add (currently nonfunctional) bad_food "vitamin" to bars

Will cause a buildup of negative morale if these are all you eat.
For now it's just a warning I guess, until morale effects json is implemented.

* Update protein.json

* more vandalism

* last vandalism

* move terminal into chunks so it can be broken

* Create shelter_nested.json

* Create graffiti.json

* Update graffiti.json

* Update shelter.json

* expand graffiti options

* more shelter graffiti

* Update shelter.json

* Add 'used' variant to shelters

* Add "used" SUS for shelters

* adjust used locker SUS appearance rate

should be the same as general locker appearance rate

* adjust appearance rate of variants, make used the most common

* more shelter graffiti

data/json/effects.json

@@ -1600,6 +1600,19 @@
     "max_intensity": 3,
     "scaling_mods": { "h_mod_min": [ -5 ] }
   },
+  {
+    "type": "effect_type",
+    "id": "bad_food_ennui",
+    "name": [ "Gross food", "Demoralizing food", "Depressing food" ],
+    "desc": [
+      "The food you eat is disgusting.",
+      "Eating nothing but disgusting rations is starting to get you down.",
+      "Sure, you survived, but what kind of survival is this, eating these disgusting rations day in and day out?"
+    ],
+    "max_intensity": 3,
+    "//": "No morale_mod is currently possible in effects, for some reason.  As soon as it's implemented, it goes here.",
+    "rating": "bad"
+  },
   {
     "type": "effect_type",
     "id": "cough_suppress"

data/json/itemgroups/SUS_specific_use_storage_items.json

@@ -9,13 +9,52 @@
       [ "evac_pamphlet", 99 ],
       [ "jacket_evac", 75 ],
       [ "emer_blanket", 75 ],
-      [ "mask_gas", 5 ],
+      [ "mask_gas", 2 ],
       [ "flashlight", 50 ],
+      [ "light_disposable_cell", 10 ],
       [ "lighter", 20 ],
-      { "item": "water_clean", "count": 2, "prob": 80 },
-      { "item": "protein_bar_evac", "count": 3 },
+      { "item": "water_clean", "count": [ 1, 2 ], "prob": 80 },
+      { "item": "protein_bar_evac", "count": [ 2, 3 ] },
       {
-        "collection": [ { "item": "plastic_spoon" }, { "item": "plastic_knife" }, { "item": "plastic_fork" }, { "item": "bowl_plastic" } ],
+        "collection": [
+          { "item": "plastic_spoon", "prob": 90 },
+          { "item": "plastic_knife", "prob": 90 },
+          { "item": "plastic_fork", "prob": 90 },
+          { "item": "bowl_plastic", "prob": 90 }
+        ],
+        "prob": 90
+      }
+    ]
+  },
+  {
+    "id": "SUS_evac_shelter_locker_used",
+    "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": "This locker has been picked through by an evacuee already. Not everyone wants the jacket, plenty leave the blanket or the gas mask, but the useful stuff is usually gone.  Some people left junk behind.",
+    "subtype": "collection",
+    "items": [
+      [ "evac_pamphlet", 95 ],
+      [ "jacket_evac", 15 ],
+      [ "emer_blanket", 45 ],
+      [ "mask_gas", 1 ],
+      [ "flashlight", 10 ],
+      [ "wrapper", 50 ],
+      [ "survnote", 5 ],
+      [ "plastic_shopping_bag", 5 ],
+      [ "box_small", 5 ],
+      [ "bag_plastic", 5 ],
+      [ "bowl_plastic", 5 ],
+      [ "can_food_unsealed", 5 ],
+      [ "can_opener", 3 ],
+      { "item": "bottle_plastic", "count": [ 1, 2 ], "prob": 50 },
+      { "item": "protein_bar_evac", "count": [ 2, 3 ], "prob": 70 },
+      {
+        "collection": [
+          { "item": "plastic_spoon", "prob": 70 },
+          { "item": "plastic_knife", "prob": 70 },
+          { "item": "plastic_fork", "prob": 70 },
+          { "item": "bowl_plastic", "prob": 50 }
+        ],
         "prob": 90
       }
     ]
@@ -30,15 +69,18 @@
       {
         "distribution": [
           {
-            "collection": [ { "item": "emer_blanket", "count": 5, "prob": 80 }, { "item": "jacket_evac", "count": 5, "prob": 80 } ],
+            "collection": [
+              { "item": "emer_blanket", "count": [ 5, 10 ], "prob": 80 },
+              { "item": "jacket_evac", "count": [ 5, 10 ], "prob": 80 }
+            ],
             "prob": 30
           },
-          { "item": "water_clean", "count": 12, "prob": 20 },
-          { "item": "protein_bar_evac", "count": 24, "prob": 60 },
+          { "item": "water_clean", "count": [ 6, 12 ], "prob": 20 },
+          { "item": "protein_bar_evac", "count": [ 20, 24 ], "prob": 60 },
           {
             "collection": [
               { "item": "extinguisher", "prob": 70 },
-              { "item": "1st_aid", "count": [ 1, 3 ], "prob": 85 },
+              { "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 }
@@ -47,18 +89,81 @@
           },
           {
             "collection": [
-              { "item": "detergent", "count": [ 1, 2 ] },
+              { "item": "detergent", "count": [ 0, 2 ] },
+              { "item": "brush", "prob": 85 },
+              { "item": "bleach", "prob": 45 },
+              { "item": "ammonia", "prob": 15 }
+            ],
+            "prob": 15
+          },
+          {
+            "collection": [
+              { "item": "can_beans", "count": [ 8, 12 ], "prob": 50 },
+              { "item": "can_tomato", "count": [ 8, 12 ], "prob": 40 },
+              { "item": "soup_chicken", "count": [ 8, 12 ], "prob": 20 },
+              { "item": "can_opener", "prob": 90 }
+            ],
+            "prob": 5
+          }
+        ]
+      },
+      [ "evac_pamphlet", 15 ]
+    ]
+  },
+  {
+    "id": "SUS_evac_shelter_cabinet_used",
+    "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": "These cabinets have been picked over by a previous flood of evacuees, but plenty of good stuff could still be left.",
+    "subtype": "collection",
+    "items": [
+      {
+        "distribution": [
+          {
+            "collection": [
+              { "item": "emer_blanket", "count": [ 1, 10 ], "prob": 60 },
+              { "item": "jacket_evac", "count": [ 1, 10 ], "prob": 50 }
+            ],
+            "prob": 30
+          },
+          {
+            "collection": [
+              { "item": "water_clean", "count": [ 1, 6 ], "prob": 60 },
+              { "item": "bottle_plastic", "count": [ 1, 6 ], "prob": 90 }
+            ],
+            "prob": 50
+          },
+          { "item": "protein_bar_evac", "count": [ 1, 23 ], "prob": 60 },
+          {
+            "collection": [
+              { "item": "extinguisher", "prob": 50 },
+              { "item": "1st_aid", "prob": 5 },
+              { "item": "two_way_radio", "prob": 25 },
+              { "item": "electric_lantern", "prob": 5 }
+            ],
+            "prob": 10
+          },
+          {
+            "collection": [
+              { "item": "detergent", "count": [ 0, 2 ] },
               { "item": "brush", "prob": 85 },
-              { "item": "bleach", "prob": 65 },
-              { "item": "ammonia", "prob": 35 }
+              { "item": "bleach", "charges-min": 1, "prob": 45 },
+              { "item": "box_small", "prob": 5 },
+              { "item": "bag_plastic", "prob": 5 },
+              { "item": "bowl_plastic", "prob": 5 },
+              { "item": "ammonia", "charges-min": 1, "prob": 15 }
             ],
             "prob": 15
           },
           {
             "collection": [
-              { "item": "can_beans", "count": 12, "prob": 50 },
-              { "item": "can_tomato", "count": 12, "prob": 40 },
-              { "item": "soup_chicken", "count": 12, "prob": 20 },
+              { "item": "can_beans", "count": [ 1, 2 ], "prob": 10 },
+              { "item": "can_tomato", "count": [ 1, 2 ], "prob": 5 },
+              { "item": "soup_chicken", "count": [ 1, 2 ], "prob": 2 },
+              { "item": "box_small", "prob": 5 },
+              { "item": "bag_plastic", "prob": 5 },
+              { "item": "bowl_plastic", "prob": 5 },
+              { "item": "can_food_unsealed", "count": [ 1, 30 ], "prob": 90 },
               { "item": "can_opener", "prob": 90 }
             ],
             "prob": 5

data/json/items/comestibles/protein.json

@@ -77,7 +77,7 @@
     "id": "protein_bar_evac",
     "type": "COMESTIBLE",
     "comestible_type": "FOOD",
-    "name": { "str": "emergency protein ration", "str_pl": "emergency protein rations" },
+    "name": { "str": "protein ration" },
     "//": "Inspired by, but not based on, a true story",
     "description": "SoyPelusa ran a highly successful crowdfunding campaign for this protein bar.  A person can live on one of these bars, three times a day, presumably forever.  After backers received their product, a single flaw was found: most consumers found starvation preferable to the flavor.  Warehouses of the product went unsold as the company went bankrupt, providing the perfect opportunity for FEMA to scoop them up and stock the evac shelters.  Now, you hold a piece of famous crowdfunding history in your hands.  How exciting.",
     "weight": "150 g",
@@ -92,7 +92,7 @@
     "color": "green",
     "container": "wrapper",
     "calories": 400,
-    "vitamins": [ [ "calcium", 30 ], [ "iron", 30 ], [ "vitA", 30 ], [ "vitB", 30 ], [ "vitC", 30 ] ]
+    "vitamins": [ [ "calcium", 30 ], [ "iron", 30 ], [ "vitA", 30 ], [ "vitB", 30 ], [ "vitC", 30 ], [ "bad_food", 5 ] ]
   },
   {
     "id": "protein_shake",