From 2707dc1d0c618112ba9e2016910d4125e5f275c3 Mon Sep 17 00:00:00 2001
From: Southbridge <7013162+southbridge-fur@users.noreply.github.com>
Date: Mon, 13 Jan 2025 23:16:58 -0500
Subject: [PATCH 1/6] Added spanwers and modified others

---
 .../Catalog/Fills/Crates/engineering.yml      |  27 ++
 .../Catalog/Fills/Crates/materials.yml        |  34 +++
 .../Prototypes/Catalog/Fills/Lockers/misc.yml |   3 +
 .../Markers/Spawners/Random/crates.yml        | 231 +++++++++---------
 .../Markers/Spawners/Random/vending.yml       |  67 +++--
 .../VendingMachines/random.rsi/clothing.png   | Bin 0 -> 5580 bytes
 .../VendingMachines/random.rsi/meta.json      |   5 +-
 7 files changed, 229 insertions(+), 138 deletions(-)
 create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/random.rsi/clothing.png

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml b/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml
index 62d07b0beda2..825b2444c56f 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml
@@ -215,3 +215,30 @@
   - type: StorageFill
     contents:
       - id: SpaceHeaterFlatpack
+
+- type: entityTable
+  id: RandomTechBoardTable
+  table: !type:GroupSelector
+    children:
+    - id: AirAlarmElectronics
+    - id: FireAlarmElectronics
+    - id: DoorElectronics
+    - id: FirelockElectronics
+    - id: APCElectronics
+    - id: SignalTimerElectronics
+    - id: SMESMachineCircuitboard
+    - id: SubstationMachineCircuitboard
+    - id: SpaceVillainArcadeComputerCircuitboard
+    - id: BlockGameArcadeComputerCircuitboard
+
+- type: entity
+  id: CrateTechBoardRandom
+  parent: CrateEngineering
+  name: surplus boards
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: RandomTechBoardTable
+        rolls: !type:RangeNumberSelector
+          range: 4, 8
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/materials.yml b/Resources/Prototypes/Catalog/Fills/Crates/materials.yml
index f425b48c07ef..6194ef56c280 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/materials.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/materials.yml
@@ -107,6 +107,40 @@
       - id: SheetPaper
         amount: 3
 
+- type: entityTable
+  id: RandomMaterialCrateTable
+  table: !type:GroupSelector
+    children:
+    - id: SheetGlass
+      weight: 25
+    - id: SheetSteel
+      weight: 25
+    - id: SheetPlastic
+      weight: 10
+    - id: MaterialCloth
+      weight: 10
+    - id: SheetPlasteel
+      weight: 10
+    - id: MaterialWoodPlank
+      weight: 10
+    - id: PartRodMetal
+      weight: 10
+    - id: SheetPlasma10
+      weight: 1
+
+- type: entity
+  id: CrateMaterialRandom
+  parent: CrateGenericSteel
+  name: surplus materials
+  description: Surplus materials from somewhere.
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: RandomMaterialCrateTablea
+        rolls: !type:RangeNumberSelector
+          range: 2, 4
+
 #- type: entity
 #  id: CrateMaterialHFuelTank
 #  name: fueltank crate
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
index 4c0a9826de7c..340083f40416 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
@@ -159,6 +159,9 @@
     - !type:NestedSelector
       tableId: SyndieMaintLoot
       prob: 0.05
+    # Recursive
+    - id: ClosetMaintenanceFilledRandom
+      prob: 0.01
 
 - type: entity
   id: ClosetMaintenanceFilledRandom
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml
index 1986dfc29c52..14852de558ba 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml
@@ -3,26 +3,26 @@
   id: CrateEmptySpawner
   parent: MarkerBase
   components:
-    - type: Sprite
-      layers:
-        - state: red
-        - sprite: Structures/Storage/Crates/generic.rsi
-          state: icon
-    - type: RandomSpawner
-      prototypes:
-        - CrateGenericSteel
-        - CratePlastic
-        - CrateFreezer
-        - CrateHydroponics
-        - CrateMedical
-        - CrateRadiation
-        - CrateInternals
-        - CrateElectrical
-        - CrateEngineering
-        - CrateScience
-        - CrateSurgery
-      chance: 0.7
-      offset: 0.0
+  - type: Sprite
+    layers:
+    - state: red
+    - sprite: Structures/Storage/Crates/generic.rsi
+      state: icon
+  - type: RandomSpawner
+    prototypes:
+    - CrateGenericSteel
+    - CratePlastic
+    - CrateFreezer
+    - CrateHydroponics
+    - CrateMedical
+    - CrateRadiation
+    - CrateInternals
+    - CrateElectrical
+    - CrateEngineering
+    - CrateScience
+    - CrateSurgery
+    chance: 0.7
+    offset: 0.0
 
 - type: entity
   name: Filled Crate Spawner
@@ -30,109 +30,112 @@
   suffix: Low Value
   parent: MarkerBase
   components:
-    - type: Sprite
-      layers:
-        - state: red
-        - sprite: Structures/Storage/Crates/o2.rsi
-          state: icon
-    - type: RandomSpawner
-      prototypes:
-        - CrateServiceReplacementLights
-        - CrateServiceBureaucracy
-        - CrateChemistrySupplies
-        - CrateMaterialGlass
-        - CrateMaterialSteel
-        - CrateMaterialPlastic
-        - CrateMaterialWood
-        - CrateMaterialPlasteel
-        - CrateFunArtSupplies
-        - CrateEngineeringCableLV
-        - CrateEngineeringCableMV
-        - CrateEngineeringCableHV
-        - CrateEngineeringCableBulk
-        - CrateEmergencyFire
-        - CrateEmergencyInternals
-        - CrateEmergencyInflatablewall
-        - CrateHydroponicsTools
-        - CrateHydroponicsSeeds
-      chance: 0.7
-      rarePrototypes:
-        - CrateMaterialPlasma
-        - CrateHydroponicsSeedsExotic
-      rareChance: 0.1
-      offset: 0.0
+  - type: Sprite
+    layers:
+    - state: red
+    - sprite: Structures/Storage/Crates/o2.rsi
+      state: icon
+  - type: RandomSpawner
+    prototypes:
+    - CrateServiceReplacementLights
+    - CrateServiceBureaucracy
+    - CrateChemistrySupplies
+    - CrateMaterialGlass
+    - CrateMaterialSteel
+    - CrateMaterialPlastic
+    - CrateMaterialWood
+    - CrateMaterialPlasteel
+    - CrateMaterialRandom
+    - CrateFunArtSupplies
+    - CrateEngineeringCableLV
+    - CrateEngineeringCableMV
+    - CrateEngineeringCableHV
+    - CrateEngineeringCableBulk
+    - CrateTechBoardRandom
+    - CrateEmergencyFire
+    - CrateEmergencyInternals
+    - CrateEmergencyInflatablewall
+    - CrateHydroponicsTools
+    - CrateHydroponicsSeeds
+    - PetCarrier
+    chance: 0.7
+    rarePrototypes:
+    - CrateMaterialPlasma
+    - CrateHydroponicsSeedsExotic
+    rareChance: 0.1
+    offset: 0.0
 
 - type: entity
   name: random engineering crate spawner
   id: LootSpawnerRandomCrateEngineering
   parent: MarkerBase
   components:
-    - type: Sprite
-      layers:
-        - state: red
-        - sprite: Structures/Storage/Crates/engineering.rsi
-          state: icon
-    - type: RandomSpawner
-      rarePrototypes:
-        - CrateEngineeringSingularityGenerator
-        - CrateEngineeringTeslaGenerator
-        - CrateEngineeringTeslaGroundingRod
-        - CrateEngineeringParticleAccelerator
-        - CrateRCD
-        - CrateEngineeringGear
-      rareChance: 0.2
-      prototypes:
-        - CrateEngineering
-        - CrateElectrical
-        - CrateEngineeringElectricalSupplies
-        - CrateRCDAmmo
-        - CrateEngineeringCableLV
-        - CrateEngineeringCableMV
-        - CrateEngineeringCableHV
-        - CrateEngineeringCableBulk
-        - CrateEngineeringSingularityContainment
-        - CrateEngineeringSingularityCollector
-        - CrateEngineeringTeslaCoil
-        - CrateEngineeringSingularityEmitter
-        - CrateEngineeringGyroscope
-        - CrateEngineeringThruster
-        - CrateEngineeringToolbox
-        - CrateEngineeringShuttle
-        - CrateEngineeringSolar
-        - CrateEngineeringJetpack
-        - CrateEmergencyRadiation
-        - CrateRadiation
-      chance: 0.9
-      offset: 0.0
+  - type: Sprite
+    layers:
+    - state: red
+    - sprite: Structures/Storage/Crates/engineering.rsi
+      state: icon
+  - type: RandomSpawner
+    rarePrototypes:
+    - CrateEngineeringSingularityGenerator
+    - CrateEngineeringTeslaGenerator
+    - CrateEngineeringTeslaGroundingRod
+    - CrateEngineeringParticleAccelerator
+    - CrateRCD
+    - CrateEngineeringGear
+    rareChance: 0.2
+    prototypes:
+    - CrateEngineering
+    - CrateElectrical
+    - CrateEngineeringElectricalSupplies
+    - CrateRCDAmmo
+    - CrateEngineeringCableLV
+    - CrateEngineeringCableMV
+    - CrateEngineeringCableHV
+    - CrateEngineeringCableBulk
+    - CrateEngineeringSingularityContainment
+    - CrateEngineeringSingularityCollector
+    - CrateEngineeringTeslaCoil
+    - CrateEngineeringSingularityEmitter
+    - CrateEngineeringGyroscope
+    - CrateEngineeringThruster
+    - CrateEngineeringToolbox
+    - CrateEngineeringShuttle
+    - CrateEngineeringSolar
+    - CrateEngineeringJetpack
+    - CrateEmergencyRadiation
+    - CrateRadiation
+    chance: 0.9
+    offset: 0.0
 
 - type: entity
   name: random security crate spawner
   id: LootSpawnerRandomCrateSecurity
   parent: MarkerBase
   components:
-    - type: Sprite
-      layers:
-        - state: red
-        - sprite: Structures/Storage/Crates/sec_gear.rsi
-          state: icon
-    - type: RandomSpawner
-      rarePrototypes: #Very useful stuff we probably don't want random people getting on space ruins often, even if there are hurdles to open it
-        - CrateArmoryShotgun
-        - CrateArmorySMG
-        - CrateSecurityRiot
-        - CrateSecurityNonlethal
-      rareChance: 0.1
-      prototypes:
-        - CrateWeaponSecure
-        - CrateArmoryLaser
-        - CrateArmoryPistols
-        - CrateTrainingBombs
-        - CrateTrackingImplants
-        - CrateSecurityTrackingMindshieldImplants
-        - CrateSecurityHelmet
-        - CrateSecurityArmor
-        - CrateRestraints
-        - CrateEmergencyExplosive
-        - CrateSecurityBiosuit
-      chance: 0.9
-      offset: 0.0
\ No newline at end of file
+  - type: Sprite
+    layers:
+    - state: red
+    - sprite: Structures/Storage/Crates/sec_gear.rsi
+      state: icon
+  - type: RandomSpawner
+    rarePrototypes: #Very useful stuff we probably don't want random people getting on space ruins often, even if there are hurdles to open it
+    - CrateArmoryShotgun
+    - CrateArmorySMG
+    - CrateSecurityRiot
+    - CrateSecurityNonlethal
+    rareChance: 0.1
+    prototypes:
+    - CrateWeaponSecure
+    - CrateArmoryLaser
+    - CrateArmoryPistols
+    - CrateTrainingBombs
+    - CrateTrackingImplants
+    - CrateSecurityTrackingMindshieldImplants
+    - CrateSecurityHelmet
+    - CrateSecurityArmor
+    - CrateRestraints
+    - CrateEmergencyExplosive
+    - CrateSecurityBiosuit
+    chance: 0.9
+    offset: 0.0
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/vending.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/vending.yml
index d55a7916b464..b7b2f829aabb 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/vending.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/vending.yml
@@ -6,29 +6,50 @@
   components:
   - type: Sprite
     layers:
-      - state: red
-      - sprite: Structures/Machines/VendingMachines/random.rsi
-        state: any
+    - state: red
+    - sprite: Structures/Machines/VendingMachines/random.rsi
+      state: any
   - type: RandomSpawner
     prototypes:
-      - VendingMachineCigs
-      - VendingMachineCoffee
-      - VendingMachineCola
-      - VendingMachineColaRed
-      - VendingMachineColaBlack
-      - VendingMachineDiscount
-      - VendingMachineSnack
-      - VendingMachineSnackBlue
-      - VendingMachineSnackGreen
-      - VendingMachineSnackOrange
-      - VendingMachineSnackTeal
-      - VendingMachineSovietSoda
-      - VendingMachineChang
-      - VendingMachineDonut
-      - VendingMachineShamblersJuice
-      - VendingMachinePwrGame
-      - VendingMachineDrGibb
-      - VendingMachineSoda
-      - VendingMachineStarkist
-      - VendingMachineSpaceUp
+    - VendingMachineCigs
+    - VendingMachineCoffee
+    - VendingMachineCola
+    - VendingMachineColaRed
+    - VendingMachineColaBlack
+    - VendingMachineDiscount
+    - VendingMachineSnack
+    - VendingMachineSnackBlue
+    - VendingMachineSnackGreen
+    - VendingMachineSnackOrange
+    - VendingMachineSnackTeal
+    - VendingMachineSovietSoda
+    - VendingMachineChang
+    - VendingMachineDonut
+    - VendingMachineShamblersJuice
+    - VendingMachinePwrGame
+    - VendingMachineDrGibb
+    - VendingMachineSoda
+    - VendingMachineStarkist
+    - VendingMachineSpaceUp
     chance: 1
+
+
+- type: entity
+  id: RandomVendingClothing
+  name: random vending machine spawner
+  suffix: Clothing
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+    - state: red
+    - sprite: Structures/Machines/VendingMachines/random.rsi
+      state: clothing
+  - type: RandomSpawner
+    prototypes:
+    - VendingMachineClothing
+    - VendingMachineWinter
+    - VendingMachinePride
+    rarePrototypes:
+    - VendingMachineTheater
+    rareChance: 0.1
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/random.rsi/clothing.png b/Resources/Textures/Structures/Machines/VendingMachines/random.rsi/clothing.png
new file mode 100644
index 0000000000000000000000000000000000000000..207d79da348f6b0df774674fc23bdabb2a24e6bd
GIT binary patch
literal 5580
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
W%H6|j`4n_21K}Yv*!zQd1^)q`YFMlQ

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Machines/VendingMachines/random.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/random.rsi/meta.json
index 64adf522b93c..2c0b0b72d1e7 100644
--- a/Resources/Textures/Structures/Machines/VendingMachines/random.rsi/meta.json
+++ b/Resources/Textures/Structures/Machines/VendingMachines/random.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/a879151ef04192ae2a791278ee882c1bce7c5062, cola and any sprite modified by potato1234x (github) for ss14",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/a879151ef04192ae2a791278ee882c1bce7c5062, cola and any sprite modified by potato1234x (github) for ss14, clothing by Southbridge_fur (github) for SS14",
   "size": {
     "x": 32,
     "y": 32
@@ -15,6 +15,9 @@
     },
     {
       "name": "any"
+    },
+    {
+      "name": "clothing"
     }
   ]
 }

From aaa7ca2f33bffe2d303baf20e0db6d81dc48401a Mon Sep 17 00:00:00 2001
From: Southbridge <7013162+southbridge-fur@users.noreply.github.com>
Date: Tue, 14 Jan 2025 00:20:03 -0500
Subject: [PATCH 2/6] adjusted values to be more in line with what I want

---
 .../Catalog/Fills/Crates/engineering.yml      |  3 +-
 .../Catalog/Fills/Crates/materials.yml        | 50 ++++++++++++-------
 .../Markers/Spawners/Random/vending.yml       | 24 ++++++---
 3 files changed, 49 insertions(+), 28 deletions(-)

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml b/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml
index 825b2444c56f..5538c0d0fe9c 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml
@@ -235,10 +235,11 @@
   id: CrateTechBoardRandom
   parent: CrateEngineering
   name: surplus boards
+  description: Surplus boards from somewhere.
   components:
   - type: EntityTableContainerFill
     containers:
       entity_storage: !type:NestedSelector
         tableId: RandomTechBoardTable
         rolls: !type:RangeNumberSelector
-          range: 4, 8
+          range: 3, 7
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/materials.yml b/Resources/Prototypes/Catalog/Fills/Crates/materials.yml
index 6194ef56c280..f7215f2f45f4 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/materials.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/materials.yml
@@ -111,35 +111,47 @@
   id: RandomMaterialCrateTable
   table: !type:GroupSelector
     children:
-    - id: SheetGlass
-      weight: 25
-    - id: SheetSteel
-      weight: 25
-    - id: SheetPlastic
-      weight: 10
-    - id: MaterialCloth
-      weight: 10
-    - id: SheetPlasteel
-      weight: 10
-    - id: MaterialWoodPlank
-      weight: 10
-    - id: PartRodMetal
-      weight: 10
-    - id: SheetPlasma10
-      weight: 1
+    - !type:GroupSelector # regular materials, 10
+      weight: 35
+      children:
+      - id: SheetGlass10
+      - id: SheetSteel10
+      - id: SheetPlastic10
+    - !type:GroupSelector # regular materials, stack
+      weight: 30
+      children:
+      - id: SheetGlass
+      - id: SheetSteel
+      - id: SheetPlastic
+    - !type:GroupSelector # secondary materials, stack
+      weight: 30
+      children:
+      - id: MaterialCloth
+      - id: SheetPlasteel
+      - id: MaterialWoodPlank
+      - id: PartRodMetal
+    - !type:GroupSelector # tertiary materials, singles
+      weight: 5
+      children:
+      - id: SheetPlasma1
+      - id: SheetUranium1
+      - id: IngotGold1
+      - id: IngotSilver1
 
 - type: entity
   id: CrateMaterialRandom
   parent: CrateGenericSteel
   name: surplus materials
   description: Surplus materials from somewhere.
-  components:
+  components:D
   - type: EntityTableContainerFill
     containers:
       entity_storage: !type:NestedSelector
-        tableId: RandomMaterialCrateTablea
+        tableId: RandomMaterialCrateTable
         rolls: !type:RangeNumberSelector
-          range: 2, 4
+          # for some reason, the selector here adds 1 to whatever value it generates,
+          # so this is actually 2-4
+          range: 1, 3
 
 #- type: entity
 #  id: CrateMaterialHFuelTank
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/vending.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/vending.yml
index b7b2f829aabb..37d83cc857d3 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/vending.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/vending.yml
@@ -34,6 +34,19 @@
     chance: 1
 
 
+- type: entityTable
+  id: ClothingVendorTable
+  table: !type:GroupSelector
+    children:
+    - id: VendingMachineClothing
+      weight: 30
+    - id: VendingMachineWinter
+      weight: 30
+    - id: VendingMachinePride
+      weight: 30
+    - id: VendingMachineTheater
+      weight: 10
+
 - type: entity
   id: RandomVendingClothing
   name: random vending machine spawner
@@ -45,11 +58,6 @@
     - state: red
     - sprite: Structures/Machines/VendingMachines/random.rsi
       state: clothing
-  - type: RandomSpawner
-    prototypes:
-    - VendingMachineClothing
-    - VendingMachineWinter
-    - VendingMachinePride
-    rarePrototypes:
-    - VendingMachineTheater
-    rareChance: 0.1
+  - type: EntityTableSpawner
+    table: !type:NestedSelector
+      tableId: ClothingVendorTable

From 8d59556885b10b597a0a7c0158972618d02e20b3 Mon Sep 17 00:00:00 2001
From: Southbridge <7013162+southbridge-fur@users.noreply.github.com>
Date: Tue, 14 Jan 2025 00:35:39 -0500
Subject: [PATCH 3/6] this comment may have caused that test fail

---
 Resources/Prototypes/Catalog/Fills/Crates/materials.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/materials.yml b/Resources/Prototypes/Catalog/Fills/Crates/materials.yml
index f7215f2f45f4..74513c738fda 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/materials.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/materials.yml
@@ -149,9 +149,9 @@
       entity_storage: !type:NestedSelector
         tableId: RandomMaterialCrateTable
         rolls: !type:RangeNumberSelector
+          range: 1, 3
           # for some reason, the selector here adds 1 to whatever value it generates,
           # so this is actually 2-4
-          range: 1, 3
 
 #- type: entity
 #  id: CrateMaterialHFuelTank

From 026d4b05a12e2af190dd2923e98de2f7a9e34e34 Mon Sep 17 00:00:00 2001
From: Southbridge <7013162+southbridge-fur@users.noreply.github.com>
Date: Tue, 14 Jan 2025 01:18:41 -0500
Subject: [PATCH 4/6] oh my god another typo

---
 Resources/Prototypes/Catalog/Fills/Crates/materials.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/materials.yml b/Resources/Prototypes/Catalog/Fills/Crates/materials.yml
index 74513c738fda..3934812ae4e2 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/materials.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/materials.yml
@@ -143,7 +143,7 @@
   parent: CrateGenericSteel
   name: surplus materials
   description: Surplus materials from somewhere.
-  components:D
+  components:
   - type: EntityTableContainerFill
     containers:
       entity_storage: !type:NestedSelector

From 9e3705bde865ee63add797a98087ca701d722ba0 Mon Sep 17 00:00:00 2001
From: Southbridge <7013162+southbridge-fur@users.noreply.github.com>
Date: Tue, 14 Jan 2025 01:28:36 -0500
Subject: [PATCH 5/6] Modified door crate to be engineering flavored

---
 Resources/Prototypes/Catalog/Fills/Crates/engineering.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml b/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml
index 5538c0d0fe9c..db01b7ab4152 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml
@@ -150,7 +150,7 @@
 
 - type: entity
   id: CrateAirlockKit
-  parent: CrateGenericSteel
+  parent: CrateEngineering
   name: airlock kit
   description: A kit for building 6 airlocks, doesn't include tools.
   components:

From 88fcbe19443785b50408050941e832ddd246346d Mon Sep 17 00:00:00 2001
From: Southbridge <7013162+southbridge-fur@users.noreply.github.com>
Date: Tue, 14 Jan 2025 18:42:30 -0500
Subject: [PATCH 6/6] reduced the pride vendor odds

Webedit lmao
---
 .../Prototypes/Entities/Markers/Spawners/Random/vending.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/vending.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/vending.yml
index 37d83cc857d3..9f50ab899f9d 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/vending.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/vending.yml
@@ -39,11 +39,11 @@
   table: !type:GroupSelector
     children:
     - id: VendingMachineClothing
-      weight: 30
+      weight: 40
     - id: VendingMachineWinter
-      weight: 30
+      weight: 40
     - id: VendingMachinePride
-      weight: 30
+      weight: 10
     - id: VendingMachineTheater
       weight: 10