Add toilet supplies to most toilets (CleverRaven#79887)

* Itemgroups * Mapgen * Palettes * Mods
ShnitzelX2 · Feb 28, 2025 · 8d20bf8 · 8d20bf8
1 parent a123b39
commit 8d20bf8
Show file tree

Hide file tree

Showing 204 changed files with 431 additions and 139 deletions.
diff --git a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json
@@ -1125,7 +1125,8 @@
       { "item": "mag_porn", "prob": 35 },
       { "item": "hairpin", "prob": 5 },
       { "item": "purse", "prob": 15 },
-      { "item": "armrig", "prob": 1 }
+      { "item": "armrig", "prob": 1 },
+      { "group": "SUS_toilet", "prob": 80 }
     ]
   },
   {

diff --git a/data/json/itemgroups/food_service.json b/data/json/itemgroups/food_service.json
@@ -268,7 +268,8 @@
       { "prob": 7, "group": "heroin_bag_zipper_1_4" },
       { "item": "mag_porn", "prob": 35 },
       { "item": "hairpin", "prob": 5 },
-      { "item": "purse", "prob": 15 }
+      { "item": "purse", "prob": 15 },
+      { "group": "SUS_toilet", "prob": 80 }
     ]
   },
   {
@@ -509,7 +510,8 @@
       { "prob": 45, "group": "bottle_otc_painkiller_1_20" },
       { "item": "mag_news", "prob": 30 },
       { "item": "purse", "prob": 10 },
-      { "item": "hairpin", "prob": 25 }
+      { "item": "hairpin", "prob": 25 },
+      { "group": "SUS_toilet", "prob": 40 }
     ]
   },
   {

diff --git a/data/json/mapgen/Glassblower.json b/data/json/mapgen/Glassblower.json
@@ -97,6 +97,7 @@
         "B": { "item": "glass_shop", "chance": 70, "repeat": [ 2, 10 ] },
         "Q": { "item": "glass_shop", "chance": 50, "repeat": [ 2, 10 ] },
         "q": { "item": "glass_workroom", "chance": 75, "repeat": [ 2, 5 ] },
+        "t": { "item": "SUS_toilet", "chance": 50 },
         "R": { "item": "SUS_trash_trashcan", "chance": 66, "repeat": [ 1, 3 ] },
         "U": { "item": "SUS_trash_dumpster", "chance": 80, "repeat": [ 1, 5 ] }
       },

diff --git a/data/json/mapgen/Metalworker.json b/data/json/mapgen/Metalworker.json
@@ -69,6 +69,7 @@
         "?": "f_sofa",
         "b": "f_bench"
       },
+      "items": { "t": { "item": "SUS_toilet", "chance": 50 } },
       "toilets": { "t": {  } },
       "vendingmachines": { "N": { "item_group": "vending_drink", "lootable": true }, "n": { "item_group": "vending_food", "lootable": true } },
       "place_items": [

diff --git a/data/json/mapgen/Pottery_Sewing_Shops.json b/data/json/mapgen/Pottery_Sewing_Shops.json
@@ -88,7 +88,8 @@
       "items": {
         "L": { "item": "SUS_janitors_closet", "chance": 90 },
         "U": { "item": "SUS_trash_dumpster", "chance": 75, "repeat": [ 1, 5 ] },
-        "R": { "item": "SUS_trash_trashcan", "chance": 60, "repeat": [ 1, 3 ] }
+        "R": { "item": "SUS_trash_trashcan", "chance": 60, "repeat": [ 1, 3 ] },
+        "t": { "item": "SUS_toilet", "chance": 50 }
       },
       "place_items": [
         { "item": "sewing_group", "x": [ 8, 8 ], "y": [ 9, 11 ], "chance": 75, "repeat": [ 2, 10 ] },

diff --git a/data/json/mapgen/animalpound.json b/data/json/mapgen/animalpound.json
@@ -108,6 +108,7 @@
         "s": "f_sink",
         "y": "f_indoor_plant"
       },
+      "items": { "t": { "item": "SUS_toilet", "chance": 50 } },
       "toilets": { "t": {  } },
       "place_items": [
         { "item": "SUS_trash_floor", "x": 14, "y": 4, "chance": 35, "repeat": [ 1, 3 ] },

diff --git a/data/json/mapgen/animalshelter.json b/data/json/mapgen/animalshelter.json
@@ -177,6 +177,7 @@
         "y": "f_indoor_plant",
         "A": "f_armchair"
       },
+      "items": { "t": { "item": "SUS_toilet", "chance": 50 } },
       "toilets": { "t": {  } },
       "place_items": [
         { "item": "SUS_trash_trashcan", "x": 7, "y": 8, "chance": 35, "repeat": [ 1, 3 ] },
@@ -320,6 +321,7 @@
         "y": "f_indoor_plant",
         "A": "f_armchair"
       },
+      "items": { "t": { "item": "SUS_toilet", "chance": 50 } },
       "toilets": { "t": {  } },
       "place_items": [
         { "item": "SUS_trash_trashcan", "x": 7, "y": 8, "chance": 35, "repeat": [ 1, 3 ] },

diff --git a/data/json/mapgen/arcade.json b/data/json/mapgen/arcade.json
@@ -51,6 +51,7 @@
         "4": "t_gutter_downspout"
       },
       "furniture": { "c": "f_counter", "F": "f_arcade_machine", "S": "f_sink", "B": "f_stool", "T": "f_locker", "x": "f_pinball_machine" },
+      "items": { "%": { "item": "SUS_toilet", "chance": 50 } },
       "toilets": { "%": {  } },
       "vendingmachines": { "l": { "item_group": "vending_drink", "lootable": true }, "m": { "item_group": "vending_food", "lootable": true } },
       "place_items": [

diff --git a/data/json/mapgen/art_gallery.json b/data/json/mapgen/art_gallery.json
@@ -65,6 +65,7 @@
         "3": "f_sink",
         "w": "f_wreckage"
       },
+      "items": { "&": { "item": "SUS_toilet", "chance": 50 } },
       "toilets": { "&": {  } },
       "place_item": [ { "item": "jar_glass_sealed", "x": 5, "y": 3 } ],
       "place_monsters": [
@@ -141,7 +142,7 @@
         "9": "f_displaycase"
       },
       "toilets": { "&": {  } },
-      "items": { "9": { "item": "art_display", "chance": 100 } },
+      "items": { "&": { "item": "SUS_toilet", "chance": 50 }, "9": { "item": "art_display", "chance": 100 } },
       "place_monsters": [
         { "monster": "GROUP_ZOMBIE", "x": 4, "y": 16, "chance": 2 },
         { "monster": "GROUP_ZOMBIE", "x": 19, "y": 14, "chance": 2 }

diff --git a/data/json/mapgen/bakery.json b/data/json/mapgen/bakery.json
@@ -98,7 +98,8 @@
         "@": { "item": "SUS_trash_trashcan", "chance": 75 },
         "a": { "item": "SUS_trash_dumpster", "chance": 75, "repeat": [ 2, 4 ] },
         "k": [ { "item": "groce_ingredient", "chance": 50, "repeat": [ 1, 3 ] }, { "item": "sugar_various", "chance": 20 } ],
-        "{": { "item": "bakery_dairy", "chance": 75, "repeat": [ 1, 2 ] }
+        "{": { "item": "bakery_dairy", "chance": 75, "repeat": [ 1, 2 ] },
+        "T": { "item": "SUS_toilet", "chance": 100 }
       },
       "place_items": [
         { "item": "SUS_knife_drawer", "x": 4, "y": 16, "chance": 75 },

diff --git a/data/json/mapgen/barber_shop.json b/data/json/mapgen/barber_shop.json
@@ -88,7 +88,8 @@
           { "item": "SUS_hair_drawer", "chance": 45, "repeat": [ 1, 2 ] },
           { "item": "SUS_janitors_closet", "chance": 15 },
           { "item": "SUS_bathroom_sink", "chance": 45 }
-        ]
+        ],
+        "X": { "item": "SUS_toilet", "chance": 100 }
       },
       "place_monster": [
         { "monster": "mon_zombie", "x": 7, "y": 13, "chance": 10 },

diff --git a/data/json/mapgen/basement/basement_chem.json b/data/json/mapgen/basement/basement_chem.json
@@ -81,7 +81,8 @@
         "i": [ { "item": "SUS_trash_floor", "chance": 60 } ],
         "F": [ { "item": "fridgesnacks", "chance": 60 } ],
         "T": [ { "item": "chem_home", "chance": 10 }, { "item": "electronics", "chance": 30 } ],
-        "H": [ { "item": "magazines", "chance": 30, "repeat": [ 1, 2 ] }, { "item": "hardware_books", "chance": 30 } ]
+        "H": [ { "item": "magazines", "chance": 30, "repeat": [ 1, 2 ] }, { "item": "hardware_books", "chance": 30 } ],
+        "&": { "item": "SUS_toilet", "chance": 50 }
       },
       "toilets": { "&": {  } },
       "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 9, 16 ], "y": [ 9, 14 ], "chance": 4 } ]
@@ -189,7 +190,8 @@
         "T": [ { "item": "chem_home", "chance": 30 }, { "item": "electronics", "chance": 50 } ],
         "f": [ { "item": "file_room", "chance": 70, "repeat": [ 1, 5 ] } ],
         "G": [ { "item": "office_paper", "chance": 30 } ],
-        "H": [ { "item": "magazines", "chance": 40, "repeat": [ 1, 2 ] }, { "item": "lab_bookshelves", "chance": 20 } ]
+        "H": [ { "item": "magazines", "chance": 40, "repeat": [ 1, 2 ] }, { "item": "lab_bookshelves", "chance": 20 } ],
+        "&": { "item": "SUS_toilet", "chance": 50 }
       },
       "toilets": { "&": {  } },
       "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 9, 16 ], "y": [ 9, 14 ] } ]

diff --git a/data/json/mapgen/basement/basement_survival.json b/data/json/mapgen/basement/basement_survival.json
@@ -86,6 +86,7 @@
         "{": "f_rack",
         "é": "f_freezer"
       },
+      "items": { "t": { "item": "SUS_toilet", "chance": 50 } },
       "toilets": { "t": {  } },
       "place_liquids": [ { "liquid": "water", "x": [ 4, 15 ], "y": [ 14, 15 ], "repeat": 3 } ],
       "place_loot": [

diff --git a/data/json/mapgen/boxing.json b/data/json/mapgen/boxing.json
@@ -67,6 +67,7 @@
         "^": "f_indoor_plant",
         "f": "f_trashcan"
       },
+      "items": { "T": { "item": "SUS_toilet", "chance": 50 } },
       "toilets": { "T": {  } },
       "vendingmachines": { "V": { "item_group": "vending_drink", "lootable": true } },
       "place_items": [

diff --git a/data/json/mapgen/bus_station.json b/data/json/mapgen/bus_station.json
@@ -78,7 +78,8 @@
         "l": { "item": "SUS_janitors_closet", "chance": 100 },
         "r": { "item": "SUS_trash_trashcan_public", "chance": 60, "repeat": [ 1, 2 ] },
         "B": [ { "item": "novels", "chance": 10 }, { "item": "jackets", "chance": 5 } ],
-        "F": { "item": "SUS_office_filing_cabinet", "chance": 70, "repeat": [ 1, 3 ] }
+        "F": { "item": "SUS_office_filing_cabinet", "chance": 70, "repeat": [ 1, 3 ] },
+        "T": { "item": "SUS_toilet", "chance": 50 }
       },
       "place_monster": [ { "group": "GROUP_ZOMBIE", "x": [ 3, 17 ], "y": [ 13, 15 ], "repeat": [ 1, 4 ] } ],
       "place_vehicles": [

diff --git a/data/json/mapgen/butcher.json b/data/json/mapgen/butcher.json
@@ -244,6 +244,7 @@
         "p": "f_metal_butcher_rack",
         "S": "f_sink"
       },
+      "items": { "t": { "item": "SUS_toilet", "chance": 50 } },
       "toilets": { "t": {  } },
       "place_loot": [
         { "group": "butcher_meat", "chance": 80, "x": [ 4, 5 ], "y": 3, "repeat": [ 1, 3 ] },
@@ -443,7 +444,8 @@
       "items": {
         "F": { "item": "butcher_raw_meat", "chance": 80, "repeat": [ 1, 3 ] },
         "k": { "item": "butcher_meat", "chance": 80, "repeat": [ 1, 3 ] },
-        "i": { "item": "butcher_raw_meat", "chance": 80, "repeat": [ 1, 3 ] }
+        "i": { "item": "butcher_raw_meat", "chance": 80, "repeat": [ 1, 3 ] },
+        "t": { "item": "SUS_toilet", "chance": 50 }
       },
       "place_loot": [
         { "group": "SUS_trash_trashcan", "chance": 80, "x": 11, "y": 16 },

diff --git a/data/json/mapgen/cabin.json b/data/json/mapgen/cabin.json
@@ -663,6 +663,7 @@
         "h": "f_chair",
         "t": "f_table"
       },
+      "items": { "T": { "item": "SUS_toilet", "chance": 50 } },
       "toilets": { "T": {  } },
       "place_monster": [ { "monster": "mon_darkman", "x": 8, "y": 10 } ]
     }

diff --git a/data/json/mapgen/cemetery_medium.json b/data/json/mapgen/cemetery_medium.json
@@ -63,6 +63,7 @@
         "c": "f_chair",
         "n": "f_slab"
       },
+      "items": { "T": { "item": "SUS_toilet", "chance": 50 } },
       "toilets": { "T": {  } },
       "place_loot": [
         { "item": "shovel", "repeat": 1, "x": 17, "y": 4 },

diff --git a/data/json/mapgen/city_blocks/urban_25_dense_diner_apt.json b/data/json/mapgen/city_blocks/urban_25_dense_diner_apt.json
@@ -100,7 +100,8 @@
         "D": { "item": "allclothes", "chance": 60 },
         "L": { "item": "homeguns", "chance": 80 },
         "W": { "item": "allclothes", "chance": 60 },
-        "X": { "item": "allclothes", "chance": 60 }
+        "X": { "item": "allclothes", "chance": 60 },
+        "T": { "item": "SUS_toilet", "chance": 50 }
       },
       "toilets": { "T": {  } },
       "place_monsters": [

diff --git a/data/json/mapgen/collapsed_tower.json b/data/json/mapgen/collapsed_tower.json
@@ -185,6 +185,7 @@
         "p": "t_metal_floor"
       },
       "mapping": { "r": { "item": { "item": "standard_template_construct" } }, "R": { "item": { "item": "nanomaterial" } } },
+      "items": { ";": { "item": "SUS_toilet", "chance": 50 } },
       "toilets": { ";": {  } },
       "place_items": [
         { "item": "office_mess", "x": [ 8, 23 ], "y": [ 4, 23 ], "chance": 100, "repeat": [ 20, 70 ] },

diff --git a/data/json/mapgen/cs_car_dealership.json b/data/json/mapgen/cs_car_dealership.json
@@ -73,7 +73,8 @@
         "D": { "item": "SUS_trash_dumpster", "chance": 60 },
         "d": { "item": "SUS_office_desk", "chance": 33 },
         "L": { "item": "oa_ig_cd_lockers", "chance": 70, "repeat": [ 1, 4 ] },
-        "F": { "item": "SUS_fridge_breakroom", "chance": 90 }
+        "F": { "item": "SUS_fridge_breakroom", "chance": 90 },
+        "T": { "item": "SUS_toilet", "chance": 50 }
       },
       "place_items": [ { "item": "oa_ig_cd_fuel", "chance": 30, "x": 6, "y": 19 } ],
       "add": [ { "item": "microwave", "x": 5, "y": 16, "chance": 2 }, { "item": "coffeemaker", "x": 6, "y": 16, "chance": 2 } ],

diff --git a/data/json/mapgen/cs_car_showroom.json b/data/json/mapgen/cs_car_showroom.json
@@ -75,7 +75,8 @@
         "d": { "item": "SUS_office_desk", "chance": 33 },
         "L": { "item": "oa_ig_cs_lockers", "chance": 70, "repeat": [ 1, 4 ] },
         "F": { "item": "SUS_fridge_breakroom", "chance": 90 },
-        "f": { "item": "SUS_office_filing_cabinet", "chance": 70 }
+        "f": { "item": "SUS_office_filing_cabinet", "chance": 70 },
+        "t": { "item": "SUS_toilet", "chance": 50 }
       },
       "place_items": [
         { "item": "SUS_trash_dumpster", "chance": 80, "repeat": [ 2, 4 ], "x": 17, "y": 22 },

diff --git a/data/json/mapgen/cs_private_park.json b/data/json/mapgen/cs_private_park.json
@@ -71,7 +71,8 @@
         "B": { "item": "homebooks", "chance": 60, "repeat": [ 1, 5 ] },
         "1": { "item": "office", "chance": 50 },
         "S": { "item": "fireplace_fill", "chance": 80, "repeat": [ 1, 3 ] },
-        "L": { "item": "tools_earthworking", "chance": 40, "repeat": [ 1, 2 ] }
+        "L": { "item": "tools_earthworking", "chance": 40, "repeat": [ 1, 2 ] },
+        "t": { "item": "SUS_toilet", "chance": 50 }
       },
       "place_vehicles": [ { "vehicle": "bicycle", "x": 6, "y": 0, "rotation": 0, "chance": 50 } ],
       "place_signs": [ { "signage": "Private Property: No Trespassing", "x": 15, "y": 0 } ]
@@ -160,7 +161,8 @@
         "E": { "item": "bed", "chance": 100, "repeat": [ 1, 5 ] },
         "1": { "item": "office", "chance": 50 },
         "S": { "item": "fireplace_fill", "chance": 100, "repeat": [ 1, 3 ] },
-        "L": { "item": "tools_earthworking", "chance": 70, "repeat": [ 1, 2 ] }
+        "L": { "item": "tools_earthworking", "chance": 70, "repeat": [ 1, 2 ] },
+        "t": { "item": "SUS_toilet", "chance": 50 }
       },
       "place_vehicles": [ { "vehicle": "bicycle", "x": 6, "y": 2, "rotation": 0, "chance": 80 } ],
       "place_signs": [ { "signage": "Private Property: No Trespassing", "x": 15, "y": 0 } ]

diff --git a/data/json/mapgen/cs_sex_shop.json b/data/json/mapgen/cs_sex_shop.json
@@ -76,7 +76,8 @@
         "t": { "item": "ss_merch_3", "chance": 80 },
         "Á": { "item": "cash_register_random", "chance": 100 },
         "r": { "item": "ss_merch_1", "chance": 80, "repeat": [ 1, 3 ] },
-        "L": { "item": "cleaning", "chance": 30 }
+        "L": { "item": "cleaning", "chance": 30 },
+        "T": { "item": "SUS_toilet", "chance": 50 }
       },
       "place_loot": [
         { "item": "roadmap", "x": 3, "y": 6, "chance": 10 },
@@ -174,7 +175,8 @@
         "t": { "item": "ss_merch_3", "chance": 80 },
         "Á": { "item": "cash_register_random", "chance": 100 },
         "r": { "item": "ss_merch_1", "chance": 80, "repeat": [ 1, 3 ] },
-        "L": { "item": "cleaning", "chance": 30 }
+        "L": { "item": "cleaning", "chance": 30 },
+        "T": { "item": "SUS_toilet", "chance": 50 }
       },
       "place_loot": [
         { "item": "roadmap", "x": 3, "y": 6, "chance": 10 },

diff --git a/data/json/mapgen/cs_tire_shop.json b/data/json/mapgen/cs_tire_shop.json
@@ -73,7 +73,8 @@
         "r": { "item": "oa_ig_ts_tires", "chance": 70 },
         "L": { "item": "oa_ig_ts_lockers", "chance": 50, "repeat": [ 2, 8 ] },
         "A": { "item": "tools_tire", "chance": 100, "repeat": [ 3, 7 ] },
-        "C": { "item": "oa_ig_ts_crates", "chance": 50 }
+        "C": { "item": "oa_ig_ts_crates", "chance": 50 },
+        "T": { "item": "SUS_toilet", "chance": 50 }
       },
       "place_loot": [ { "group": "cash_register_random", "x": 6, "y": 18 } ],
       "add": [ { "item": "microwave", "x": 16, "y": 18, "chance": 2 }, { "item": "coffeemaker", "x": 16, "y": 19, "chance": 2 } ],

diff --git a/data/json/mapgen/diner.json b/data/json/mapgen/diner.json
@@ -60,7 +60,7 @@
         "t": "f_table"
       },
       "toilets": { "T": {  } },
-      "items": { "Y": { "item": "coat_rack", "chance": 35, "repeat": [ 1, 4 ] } },
+      "items": { "T": { "item": "SUS_toilet", "chance": 50 }, "Y": { "item": "coat_rack", "chance": 35, "repeat": [ 1, 4 ] } },
       "place_items": [
         { "item": "diner_food", "x": [ 4, 17 ], "y": [ 14, 14 ], "chance": 75, "repeat": [ 1, 8 ] },
         { "item": "diner_back", "x": [ 4, 16 ], "y": [ 16, 16 ], "chance": 95, "repeat": [ 1, 8 ] },

diff --git a/data/json/mapgen/dispensary.json b/data/json/mapgen/dispensary.json
@@ -44,7 +44,8 @@
       "n": { "item": "stoner", "chance": 50 },
       "b": { "item": "stoner", "chance": 15 },
       "B": { "item": "stoner", "chance": 15 },
-      "3": { "item": "tools_earthworking", "chance": 50, "repeat": [ 1, 3 ] }
+      "3": { "item": "tools_earthworking", "chance": 50, "repeat": [ 1, 3 ] },
+      "t": { "item": "SUS_toilet", "chance": 50 }
     },
     "item": {
       "&": { "item": "joint_roach", "chance": 33, "repeat": [ 1, 6 ] },

diff --git a/data/json/mapgen/dive_shop.json b/data/json/mapgen/dive_shop.json
@@ -63,7 +63,8 @@
     "items": {
       "R": { "item": "SUS_scuba_gear", "chance": 10 },
       "D": { "item": "SUS_scuba_gear", "chance": 40 },
-      "]": { "item": "swimmer_wetsuit", "chance": 80, "repeat": [ 0, 3 ] }
+      "]": { "item": "swimmer_wetsuit", "chance": 80, "repeat": [ 0, 3 ] },
+      "t": { "item": "SUS_toilet", "chance": 50 }
     }
   },
   {

diff --git a/data/json/mapgen/dojo.json b/data/json/mapgen/dojo.json
@@ -61,6 +61,7 @@
         "X": "f_rack",
         "x": "f_region_flower_decorative"
       },
+      "items": { "T": { "item": "SUS_toilet", "chance": 50 } },
       "toilets": { "T": {  } },
       "place_items": [
         { "item": "gi", "x": [ 3, 11 ], "y": [ 18, 18 ], "chance": 80, "repeat": [ 5, 8 ] },
@@ -248,7 +249,8 @@
         "e": { "item": "SUS_fridge_breakroom", "chance": 70 },
         "E": { "item": "oven", "chance": 75, "repeat": [ 1, 2 ] },
         "@": { "item": "bed", "chance": 20, "repeat": [ 1, 2 ] },
-        "c": { "item": "cannedfood", "chance": 40, "repeat": [ 1, 2 ] }
+        "c": { "item": "cannedfood", "chance": 40, "repeat": [ 1, 2 ] },
+        "T": { "item": "SUS_toilet", "chance": 50 }
       },
       "place_monster": [ { "group": "GROUP_DOJO", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 75, "repeat": [ 3, 8 ] } ]
     }

diff --git a/data/json/mapgen/dollar_store.json b/data/json/mapgen/dollar_store.json
@@ -66,7 +66,8 @@
         "X": { "item": "cash_register_random", "chance": 100 },
         "I": { "item": "office", "chance": 30 },
         "S": { "item": "office_paper", "chance": 30 },
-        "U": { "item": "SUS_trash_dumpster", "chance": 20, "repeat": [ 2, 4 ] }
+        "U": { "item": "SUS_trash_dumpster", "chance": 20, "repeat": [ 2, 4 ] },
+        "T": { "item": "SUS_toilet", "chance": 50 }
       },
       "place_items": [
         { "chance": 10, "repeat": [ 1, 3 ], "item": "SUS_trash_dumpster", "x": 20, "y": 6 },
@@ -218,6 +219,7 @@
         "X": { "item": "cash_register_random", "chance": 100 },
         "I": { "item": "office", "chance": 30 },
         "S": { "item": "office_paper", "chance": 30 },
+        "T": { "item": "SUS_toilet", "chance": 50 },
         "U": { "item": "SUS_trash_dumpster", "chance": 20, "repeat": [ 2, 4 ] },
         "L": { "item": "cleaning", "chance": 20, "repeat": [ 2, 4 ] }
       },

diff --git a/data/json/mapgen/drive-in_theater.json b/data/json/mapgen/drive-in_theater.json
@@ -371,6 +371,7 @@
     },
     "item": { "N": { "item": "movie_poster", "chance": 100 } },
     "vendingmachines": { "$": { "item_group": "vending_drink", "lootable": true }, "V": { "item_group": "vending_food", "lootable": true } },
+    "items": { "T": { "item": "SUS_toilet", "chance": 50 } },
     "toilets": { "T": {  } }
   }
 ]
diff --git a/data/json/mapgen/farm_supply.json b/data/json/mapgen/farm_supply.json
@@ -89,6 +89,7 @@
           "chance": 80,
           "repeat": [ 0, 3 ]
         },
+        "T": { "item": "SUS_toilet", "chance": 50 },
         "1": { "item": "petstore_shelves", "chance": 80, "repeat": [ 0, 3 ] },
         "2": {
           "item": {
@@ -535,6 +536,7 @@
           "chance": 100,
           "repeat": [ 0, 2 ]
         },
+        "T": { "item": "SUS_toilet", "chance": 50 },
         "1": { "item": "petstore_shelves", "chance": 70, "repeat": [ 0, 3 ] },
         "2": {
           "item": {

diff --git a/data/json/mapgen/fire_station.json b/data/json/mapgen/fire_station.json
@@ -71,6 +71,7 @@
         "r": { "item": "fireman_doc", "chance": 50, "repeat": [ 1, 2 ] },
         "d": { "item": "dresser", "chance": 66, "repeat": [ 1, 3 ] },
         "t": [ { "item": "novels", "chance": 33 }, { "item": "dining", "chance": 33 } ],
+        "T": { "item": "SUS_toilet", "chance": 50 },
         "l": [
           { "item": "fireman_gear", "chance": 70 },
           { "item": "fireman_boots", "chance": 70 },
@@ -223,6 +224,7 @@
         "d": { "item": "dresser", "chance": 66, "repeat": [ 1, 3 ] },
         "t": [ { "item": "novels", "chance": 33 }, { "item": "dining", "chance": 33 } ],
         "B": { "item": "novels", "chance": 80, "repeat": [ 4, 10 ] },
+        "T": { "item": "SUS_toilet", "chance": 50 },
         "l": [
           { "item": "fireman_doc", "chance": 50, "repeat": [ 1, 2 ] },
           { "item": "fireman_gear", "chance": 70 },