Toilet cistern stashes spawn containing basic loot

Resources/Prototypes/Catalog/Fills/Lockers/misc.yml

@@ -203,3 +203,62 @@
     containers:
       entity_storage: !type:NestedSelector
         tableId: MaintenanceLockerLoot
+
+# Intended to very occasionally be useful for prisoners, so mostly functional items instead of fluff
+- type: entityTable
+  id: ToiletCisternLoot
+  table: !type:GroupSelector
+    children:
+    # Common tools
+    - !type:GroupSelector
+      weight: 25
+      children:
+      - id: Screwdriver
+      - id: Wrench
+      - id: Wirecutter
+      - id: Welder
+      - id: ClothingMaskGas
+      - id: PowerCellSmall
+      - id: RadioHandheld
+      - id: Syringe
+      - id: CableApcStack
+      - id: EmergencyOxygenTankFilled
+      - id: EmergencyNitrogenTankFilled
+      - id: Lighter
+    # Rare tools
+    - !type:GroupSelector
+      weight: 8
+      children:
+      - id: ClothingHandsGlovesColorYellow
+      - id: DrinkSpaceLube
+      - id: WelderIndustrial
+      - id: ClothingHeadHatWeldingMaskFlame
+      - id: PowerCellMedium
+    # Utility
+    - !type:GroupSelector
+      weight: 5
+      children:
+      - id: Brutepack
+      - id: Ointment
+      - id: Gauze
+      - id: ChemistryBottleUnstableMutagen
+    # Weapons
+    - !type:GroupSelector
+      weight: 3
+      children:
+      - id: SurvivalKnife
+      - id: ScalpelShiv
+      - id: Shiv
+      - id: SawImprov
+      - id: HydroponicsToolHatchet
+      - id: ClothingHandsKnuckleDusters
+      - id: WeaponFlareGun
+    # Syndie
+    - !type:GroupSelector
+      weight: 1
+      children:
+      - id: CyberPen
+      - id: CigPackSyndicate
+      - id: SoapSyndie
+      - id: SyndicatePersonalAI
+      - id: UplinkLighterBox

Resources/Prototypes/Entities/Structures/Furniture/toilet.yml

@@ -147,6 +147,26 @@
         - ReagentId: GastroToxin
           Quantity: 20
 
+- type: entity
+  parent: ToiletEmpty
+  id: ToiletFilled
+  suffix: Empty, Random Cistern Loot
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      stash: !type:NestedSelector
+        tableId: ToiletCisternLoot
+
+- type: entity
+  parent: ToiletDirtyWater
+  id: ToiletDirtyWaterFilled
+  suffix: Dirty Water, Random Cistern Loot
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      stash: !type:NestedSelector
+        tableId: ToiletCisternLoot
+
 - type: entity
   parent: BaseToilet
   id: ToiletGoldenEmpty
@@ -203,3 +223,7 @@
           Quantity: 20
         - ReagentId: GastroToxin
           Quantity: 20
+  - type: ContainerFill
+    containers:
+      stash:
+      - ToyFigurineCaptain

Resources/migration.yml

@@ -735,3 +735,7 @@ WarpPointBombing: null
 ToyGriffin: ToyFigurineGriffin
 ToyOwlman: ToyFigurineOwlman
 ToySkeleton: ToyFigurineSkeleton
+
+# 2025-10-20
+ToiletEmpty: ToiletFilled
+ToiletDirtyWater: ToiletDirtyWaterFilled