Update locker storage to entity tables (#37809)

* Update locker storage to entity tables

* tidy

* Requested changes

---------

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>

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

@@ -1,49 +1,84 @@
- - type: entity
+- type: entity
   id: ClosetL3Filled
   suffix: Filled, Generic
   parent: ClosetL3
   components:
-   - type: StorageFill
+  - type: EntityTableContainerFill
-     contents:
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillBiohazardGearGeneric
+
+- type: entityTable
+  id: FillBiohazardGearGeneric
+  table: !type:AllSelector
+    children:
     - id: ClothingOuterBioGeneral
     - id: ClothingHeadHatHoodBioGeneral
 
- - type: entity
+- type: entity
   id: ClosetL3VirologyFilled
   suffix: Filled, Virology
   parent: ClosetL3Virology
   components:
-   - type: StorageFill
+  - type: EntityTableContainerFill
-     contents:
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillBiohazardGearVirology
+
+- type: entityTable
+  id: FillBiohazardGearVirology
+  table: !type:AllSelector
+    children:
     - id: ClothingOuterBioVirology
     - id: ClothingHeadHatHoodBioVirology
 
- - type: entity
+- type: entity
   id: ClosetL3SecurityFilled
   suffix: Filled, Security
   parent: ClosetL3Security
   components:
-   - type: StorageFill
+  - type: EntityTableContainerFill
-     contents:
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillBiohazardGearSecurity
+
+- type: entityTable
+  id: FillBiohazardGearSecurity
+  table: !type:AllSelector
+    children:
     - id: ClothingOuterBioSecurity
     - id: ClothingHeadHatHoodBioSecurity
 
- - type: entity
+- type: entity
   id: ClosetL3JanitorFilled
   suffix: Filled, Janitor
   parent: ClosetL3Janitor
   components:
-   - type: StorageFill
+  - type: EntityTableContainerFill
-     contents:
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillBiohazardGearJanitor
+
+- type: entityTable
+  id: FillBiohazardGearJanitor
+  table: !type:AllSelector
+    children:
     - id: ClothingOuterBioJanitor
     - id: ClothingHeadHatHoodBioJanitor
 
- - type: entity
+- type: entity
   id: ClosetL3ScienceFilled
   suffix: Filled, Science
   parent: ClosetL3Science
   components:
-   - type: StorageFill
+  - type: EntityTableContainerFill
-     contents:
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillBiohazardGearScience
+
+- type: entityTable
+  id: FillBiohazardGearScience
+  table: !type:AllSelector
+    children:
     - id: ClothingOuterBioScientist
     - id: ClothingHeadHatHoodBioScientist

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

@@ -3,8 +3,15 @@
   parent: ClosetTool
   suffix: Filled
   components:
-  - type: StorageFill
+  - type: EntityTableContainerFill
-    contents:
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillClosetTool
+
+- type: entityTable
+  id: FillClosetTool
+  table: !type:AllSelector
+    children:
     - id: ClothingOuterVestHazard
       prob: 0.4
     - id: FlashlightLantern
@@ -29,14 +36,19 @@
       prob: 0.2
     - id: ClothingHandsGlovesColorYellow
       prob: 0.05
-      - id: ClothingHeadHatHardhatRed
+    - !type:GroupSelector
       prob: 0.4
+      children:
+      - id: ClothingHeadHatHardhatRed
+      - id: ClothingHeadHatHardhatBlue
+      - id: ClothingHeadHatHardhatOrange
+      - id: ClothingHeadHatHardhatWhite
+      - id: ClothingHeadHatHardhatYellow
+      - id: ClothingHeadHatHardhatYellowDark
     - id: CableApcStack
       prob: 0.3
-      - id: CableApcStack
+      rolls: !type:ConstantNumberSelector
-        prob: 0.3
+        value: 3
-      - id: CableApcStack
-        prob: 0.3
     - id: SprayPainter
       prob: 0.7
 
@@ -45,18 +57,29 @@
   suffix: Filled
   parent: LockerElectricalSupplies
   components:
-  - type: StorageFill
+  - type: EntityTableContainerFill
-    contents:
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillElectricalSupplies
+
+- type: entityTable
+  id: FillElectricalSupplies
+  table: !type:AllSelector
+    children:
     - id: ToolboxElectricalFilled
       prob: 0.7
     - id: FirelockElectronics
       prob: 0.05
     - id: APCElectronics
       prob: 0.1
-      - id: CableMVStack
+    - !type:GroupSelector
-        prob: 0.2
+      prob: 0.5
+      children:
       - id: CableApcStack
-        prob: 0.3
+        weight: 5
+      - id: CableMVStack
+      - id: CableHVStack
+        weight: 0.5
 
 - type: entity
   id: LockerWeldingSuppliesFilled
@@ -104,26 +127,29 @@
   suffix: Filled, Hardsuit
   parent: LockerAtmospherics
   components:
-  - type: StorageFill
+  - type: EntityTableContainerFill
-    contents:
+    containers:
-      - id: ClothingOuterHardsuitAtmos
+      entity_storage: !type:AllSelector
-      - id: ClothingMaskGasAtmos
+        children:
-      - id: ClothingOuterSuitAtmosFire
+        - !type:NestedSelector
-      - id: ClothingHeadHelmetAtmosFire
+          tableId: FillLockerAtmospherics
-      - id: GasAnalyzer
+        - !type:NestedSelector
-      - id: MedkitOxygenFilled
+          tableId: FillAtmosphericsHardsuit
-      - id: HolofanProjector
-      - id: RCD
-      - id: RCDAmmo
-      - id: AirGrenade
 
 - type: entity
   id: LockerAtmosphericsFilled
   suffix: Filled
   parent: LockerAtmospherics
   components:
-  - type: StorageFill
+  - type: EntityTableContainerFill
-    contents:
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillLockerAtmospherics
+
+- type: entityTable
+  id: FillLockerAtmospherics
+  table: !type:AllSelector
+    children:
     - id: ClothingMaskGasAtmos
     - id: ClothingOuterSuitAtmosFire
     - id: ClothingHeadHelmetAtmosFire
@@ -134,28 +160,42 @@
     - id: RCDAmmo
     - id: AirGrenade
 
+- type: entityTable
+  id: FillAtmosphericsHardsuit
+  table: !type:AllSelector
+    children:
+    - id: ClothingOuterHardsuitAtmos
+    - id: OxygenTankFilled
+    - id: ClothingMaskBreath
+
 - type: entity
   id: LockerEngineerFilledHardsuit
   suffix: Filled, Hardsuit
   parent: LockerEngineer
   components:
-  - type: StorageFill
+  - type: EntityTableContainerFill
-    contents:
+    containers:
-      - id: ClothingOuterHardsuitEngineering
+      entity_storage: !type:AllSelector
-      - id: ClothingHandsGlovesColorYellow
+        children:
-      - id: ClothingMaskGas
+        - !type:NestedSelector
-      - id: ClothingShoesBootsMag
+          tableId: FillLockerEngineer
-      - id: RCD
+        - !type:NestedSelector
-      - id: RCDAmmo
+          tableId: FillEngineerHardsuit
-      - id: MetalFoamGrenade
 
 - type: entity
   id: LockerEngineerFilled
   suffix: Filled
   parent: LockerEngineer
   components:
-  - type: StorageFill
+  - type: EntityTableContainerFill
-    contents:
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillLockerEngineer
+
+- type: entityTable
+  id: FillLockerEngineer
+  table: !type:AllSelector
+    children:
     - id: ClothingHandsGlovesColorYellow
     - id: ClothingMaskGas
     - id: trayScanner
@@ -163,14 +203,32 @@
     - id: RCDAmmo
     - id: MetalFoamGrenade
 
+- type: entityTable
+  id: FillEngineerHardsuit
+  table: !type:AllSelector
+    children:
+    - id: ClothingOuterHardsuitEngineering
+    - id: OxygenTankFilled
+    - id: ClothingShoesBootsMag
+    - id: ClothingMaskBreath
+
 - type: entity
   id: ClosetRadiationSuitFilled
   parent: ClosetRadiationSuit
   suffix: Filled
   components:
-  - type: StorageFill
+  - type: EntityTableContainerFill
-    contents:
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillRadiationSuit
+
+- type: entityTable
+  id: FillRadiationSuit
+  table: !type:AllSelector
+    children:
     - id: ClothingOuterSuitRad
-        amount: 2
+      amount: !type:ConstantNumberSelector
+        value: 2
     - id: GeigerCounter
-        amount: 2
+      amount: !type:ConstantNumberSelector
+        value: 2

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

@@ -3,8 +3,15 @@
   suffix: Filled
   parent: LockerScientist
   components:
-  - type: StorageFill
+  - type: EntityTableContainerFill
-    contents:
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillLockerScientist
+
+- type: entityTable
+  id: FillLockerScientist
+  table: !type:AllSelector
+    children:
     - id: ClothingHandsGlovesLatex
     - id: ClothingHeadsetScience
     - id: ClothingMaskSterile

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

@@ -95,12 +95,10 @@
   parent: SuitStorageBase
   suffix: Station Engineer
   components:
-  - type: StorageFill
+  - type: EntityTableContainerFill
-    contents:
+    containers:
-        - id: OxygenTankFilled
+      entity_storage: !type:NestedSelector
-        - id: ClothingShoesBootsMag
+        tableId: FillEngineerHardsuit
-        - id: ClothingOuterHardsuitEngineering
-        - id: ClothingMaskBreath
   - type: AccessReader
     access: [["Engineering"]]
 
@@ -110,11 +108,10 @@
   parent: SuitStorageBase
   suffix: Atmospheric Technician
   components:
-  - type: StorageFill
+  - type: EntityTableContainerFill
-    contents:
+    containers:
-        - id: OxygenTankFilled
+      entity_storage: !type:NestedSelector
-        - id: ClothingOuterHardsuitAtmos
+        tableId: FillAtmosphericsHardsuit
-        - id: ClothingMaskBreath
   - type: AccessReader
     access: [["Atmospherics"]]