[IDK] Cleaning the code from useless variables (#15323)

diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/security.yml b/Resources/Prototypes/Catalog/Fills/Boxes/security.yml
index 1c35b125016e4c6e82e9e42b739c582145eeafec..77e01921de96c7c63488fd5b2ed1b96e7d662127 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Boxes/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/security.yml
@@ -71,4 +71,4 @@
   - type: Sprite
     layers:
       - state: box_security
-      - state: forensic
\ No newline at end of file
+      - state: forensic

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/antag.yml b/Resources/Prototypes/Catalog/Fills/Crates/antag.yml
index 429f594e2c51d8b9fa59f83e85136bff93400599..24f22ebef7f65d7e267aa7e3ce030e11da326d21 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Crates/antag.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/antag.yml
@@ -7,13 +7,9 @@
   - type: StorageFill
     contents:
       - id: ClothingOuterHardsuitPirateCap
-        amount: 1
       - id: ClothingNeckCloakPirateCap
-        amount: 1
       - id: EnergyCutlass
-        amount: 1
       - id: MicroBombImplanter
-        amount: 1
 
 - type: entity
   id: CratePirateChest
@@ -26,7 +22,6 @@
       - id: WeaponLauncherPirateCannon
         amount: 2
       - id: ClothingOuterCoatGentle
-        amount: 1
       - id: Cutlass
         amount: 2
       - id: CannonBall

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml
index 0f70bcb8a52ea586fc2b6d4e22353e481dd7901d..39e8839152219562fccaa6c9d17b257545cc2d14 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml
@@ -45,21 +45,13 @@
   - type: StorageFill
     contents:
       - id: HydroponicsToolMiniHoe
-        amount: 1
       - id: PlantBGoneSpray
-        amount: 1
       - id: WeedSpray
-        amount: 1
       - id: PestSpray
-        amount: 1
       - id: HydroponicsToolScythe
-        amount: 1
       - id: HydroponicsToolHatchet
-        amount: 1
       - id: ClothingOuterApronBotanist
-        amount: 1
       - id: ClothingHandsGlovesLeather
-        amount: 1
 
 - type: entity
   id: CrateHydroponicsSeeds
@@ -68,44 +60,23 @@
   - type: StorageFill
     contents:
       - id: ChiliSeeds
-        amount: 1
       - id: CornSeeds
-        amount: 1
       - id: EggplantSeeds
-        amount: 1
       - id: TomatoSeeds
-        amount: 1
       - id: WheatSeeds
-        amount: 1
       - id: CarrotSeeds
-        amount: 1
       - id: CabbageSeeds
-        amount: 1
       - id: GarlicSeeds
-        amount: 1
       - id: ChanterelleSeeds
-        amount: 1
       - id: PotatoSeeds
-        amount: 1
       - id: SugarcaneSeeds
-        amount: 1
       - id: LemonSeeds
-        amount: 1
       - id: LimeSeeds
-        amount: 1
       - id: OrangeSeeds
-        amount: 1
       - id: OatSeeds
-        amount: 1
       - id: OnionSeeds
-        amount: 1
       - id: OnionRedSeeds
-        amount: 1
       - id: RiceSeeds
-        amount: 1
       - id: SoybeanSeeds
-        amount: 1
       - id: GrapeSeeds
-        amount: 1
       - id: WatermelonSeeds
-        amount: 1

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/emergency.yml b/Resources/Prototypes/Catalog/Fills/Crates/emergency.yml
index dd8f9f3363ba6a3854433b75a9fab7de1b805d8f..956664ec65c0a5dc67e338fb598557f43a9d2a49 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Crates/emergency.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/emergency.yml
@@ -5,17 +5,11 @@
   - type: StorageFill
     contents:
       - id: ClothingHeadHelmetBombSuit
-        amount: 1
       - id: ClothingMaskGas
-        amount: 1
       - id: Screwdriver
-        amount: 1
       - id: Wirecutter
-        amount: 1
       - id: Multitool
-        amount: 1
       - id: ClothingOuterSuitBomb
-        amount: 1
 
 - type: entity
   id: CrateEmergencyFire
@@ -79,7 +73,6 @@
       - id: GeigerCounter
         amount: 2
       - id: DrinkVodkaBottleFull
-        amount: 1
       - id: DrinkShotGlass
         amount: 2
 

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml b/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml
index a3c6a31ddb854a09f046b79ae00ff866f9082d8e..6a65f8e548ff1e3cee76897f829bf0c9c9a62175 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml
@@ -113,8 +113,6 @@
   - type: StorageFill
     contents:
       - id: SheetSteel
-        amount: 1
       - id: CableApcStack
-        amount: 1
       - id: DoorElectronics
         amount: 6

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/engines.yml b/Resources/Prototypes/Catalog/Fills/Crates/engines.yml
index 6709862bf3c73b406e0dbaada501974d52d55771..be1cbb70da52585cd5bc6930709d88924b79a5e9 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Crates/engines.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/engines.yml
@@ -25,7 +25,6 @@
   - type: StorageFill
     contents:
       - id: AMEControllerUnanchored
-        amount: 1
 
 # Singularity
 
@@ -36,7 +35,6 @@
   - type: StorageFill
     contents:
       - id: Emitter
-        amount: 1
 
 - type: entity
   id: CrateEngineeringSingularityCollector
@@ -45,7 +43,6 @@
   - type: StorageFill
     contents:
       - id: RadiationCollector
-        amount: 1
 
 - type: entity
   id: CrateEngineeringSingularityContainment
@@ -54,7 +51,6 @@
   - type: StorageFill
     contents:
       - id: ContainmentFieldGenerator
-        amount: 1
 
 - type: entity
   id: CrateEngineeringSingularityGenerator
@@ -63,7 +59,6 @@
   - type: StorageFill
     contents:
       - id: SingularityGenerator
-        amount: 1
 
 # Particle Accelerator
 
@@ -74,19 +69,12 @@
   - type: StorageFill
     contents:
       - id: MachineParticleAcceleratorEndCapCircuitboard
-        amount: 1
       - id: MachineParticleAcceleratorEmitterLeftCircuitboard
-        amount: 1
       - id: MachineParticleAcceleratorEmitterCenterCircuitboard
-        amount: 1
       - id: MachineParticleAcceleratorEmitterRightCircuitboard
-        amount: 1
       - id: MachineParticleAcceleratorFuelChamberCircuitboard
-        amount: 1
       - id: MachineParticleAcceleratorPowerBoxCircuitboard
-        amount: 1
       - id: ParticleAcceleratorComputerCircuitboard
-        amount: 1
 
 # Non-functional for some reason
 
@@ -108,7 +96,6 @@
   - type: StorageFill
     contents:
       - id: DebugGenerator
-        amount: 1
 
 - type: entity
   id: CrateEngineeringSolar
@@ -126,10 +113,6 @@
   - type: StorageFill
     contents:
       - id: WallmountSubstationElectronics
-        amount: 1
       - id: WallmountGeneratorAPUElectronics
-        amount: 1
       - id: HandheldGPSBasic
-        amount: 1
       - id: InflatableDoorStack1
-        amount: 1

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
index 289f79917c7490a5231300dc147821dd87e01477..5f6337230cb26d911201ffb36029771845ebbea3 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
@@ -193,9 +193,7 @@
     - type: StorageFill
       contents:
         - id: VehicleSyndicateSegway
-          amount: 1
         - id: VehicleKeySyndicateSegway
-          amount: 1
 
 - type: entity
   id: CrateFunPirate
@@ -206,12 +204,9 @@
       - id: ClothingUniformJumpsuitPirate
         amount: 2
       - id: ClothingHeadHatPirate
-        amount: 1
       - id: ClothingOuterCoatPirate
-        amount: 1
       - id: ClothingShoesBootsLaceup
         amount: 2
       - id: HatBandRed
-        amount: 1
       - id: FoamCutlass
         amount: 2

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/materials.yml b/Resources/Prototypes/Catalog/Fills/Crates/materials.yml
index b4cafc8a343ec9032d7b9beee80870aa79e71c9f..f5c493473a4ad34bb1a60ed11b4ca0acd246a73a 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Crates/materials.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/materials.yml
@@ -25,7 +25,6 @@
       - id: MaterialCloth
         amount: 2
       - id: MaterialDurathread
-        amount: 1
 
 - type: entity
   id: CrateMaterialPlastic
@@ -43,7 +42,6 @@
   - type: StorageFill
     contents:
       - id: MaterialWoodPlank
-        amount: 1
 
 - type: entity
   id: CrateMaterialPlasteel

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/medical.yml b/Resources/Prototypes/Catalog/Fills/Crates/medical.yml
index 969002c2860a2cd053709598c717464a8c68ec1a..1b40e17ddb06250d6d0caa866b5d0e742b92a20a 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Crates/medical.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/medical.yml
@@ -20,11 +20,8 @@
       - id: Bloodpack
         amount: 2
       - id: BoxLatexGloves
-        amount: 1
       - id: BoxSterileMask
-        amount: 1
       - id: BoxMouthSwab
-        amount: 1
 
 - type: entity
   id: CrateChemistrySupplies
@@ -33,11 +30,8 @@
   - type: StorageFill
     contents:
       - id: BoxSyringe
-        amount: 1
       - id: BoxBeaker
-        amount: 1
       - id: BoxPillCanister
-        amount: 1
       - id: Dropper
         amount: 2
       - id: BoxBottle
@@ -50,19 +44,12 @@
   - type: StorageFill
     contents:
       - id: Scalpel
-        amount: 1
       - id: Retractor
-        amount: 1
       - id: Cautery
-        amount: 1
       - id: Drill
-        amount: 1
       - id: Saw
-        amount: 1
       - id: Hemostat
-        amount: 1
       - id: ClothingMaskSterile
-        amount: 1
 
 - type: entity
   id: CrateMedicalScrubs
@@ -71,17 +58,11 @@
   - type: StorageFill
     contents:
       - id: UniformScrubsColorGreen
-        amount: 1
       - id: UniformScrubsColorPurple
-        amount: 1
       - id: UniformScrubsColorBlue
-        amount: 1
       - id: HatBandBlue
-        amount: 1
       - id: HatBandRed
-        amount: 1
       - id: HatBandGreen
-        amount: 1
       - id: ClothingMaskSterile
         amount: 3
 

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/npc.yml b/Resources/Prototypes/Catalog/Fills/Crates/npc.yml
index a1d6034712243baf07a398db48592b4223a6b4d0..6587da5841af677f50d38e0e5ad93463980ef249 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Crates/npc.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/npc.yml
@@ -23,7 +23,6 @@
   - type: StorageFill
     contents:
       - id: MobCat
-        amount: 1
 
 - type: entity
   id: CrateNPCChicken
@@ -54,7 +53,6 @@
   - type: StorageFill
     contents:
       - id: MobCorgi
-        amount: 1
 
 - type: entity
   id: CrateNPCCow
@@ -63,7 +61,6 @@
   - type: StorageFill
     contents:
       - id: MobCow
-        amount: 1
 
 - type: entity
   id: CrateNPCGoat
@@ -72,7 +69,6 @@
   - type: StorageFill
     contents:
       - id: MobGoat
-        amount: 1
 
 - type: entity
   id: CrateNPCGoose
@@ -90,7 +86,6 @@
   - type: StorageFill
     contents:
       - id: MobGorilla
-        amount: 1
 
 - type: entity
   id: CrateNPCMonkeyCube
@@ -99,7 +94,6 @@
   - type: StorageFill
     contents:
       - id: MonkeyCubeBox
-        amount: 1
 
 - type: entity
   id: CrateNPCMouse
@@ -135,7 +129,6 @@
   - type: StorageFill
     contents:
       - id: MobPig
-        amount: 1
 
 - type: entity
   id: CrateNPCSnake

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/security.yml b/Resources/Prototypes/Catalog/Fills/Crates/security.yml
index 7a29131c311d4978fb094113a29d140e8ba9fd71..cc4884e637ca7ac2a938682340a1fff5f822ca4f 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Crates/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/security.yml
@@ -27,7 +27,6 @@
       - id: Stunbaton
         amount: 3
       - id: BoxFlashbang
-        amount: 1
       - id: Flash
         amount: 3
 #      - Pepperspray
@@ -57,9 +56,7 @@
   - type: StorageFill
     contents:
       - id: BoxHandcuff
-        amount: 1
       - id: BoxSechud
-        amount: 1
 #      - SecBelt
 #      - SecGasmask
 #      - SpacelawBook

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
index 0efd57227a4791f37d93bb2147b1132c48adff83..532ed3494964955ec1853c8257eced8505badd87 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
@@ -5,15 +5,12 @@
   - type: StorageFill
     contents:
       - id: MopItem
-        amount: 1
       - id: MopBucket
-        amount: 1
       - id: Bucket
         amount: 3
       - id: WetFloorSign
         amount: 2
       - id: Soap
-        amount: 1
       - id: SprayBottleSpaceCleaner
         amount: 2
       - id: TrashBag
@@ -26,9 +23,7 @@
   - type: StorageFill
     contents:
       - id: BoxLighttube
-        amount: 1
       - id: BoxLightbulb
-        amount: 1
 
 - type: entity
   id: CrateMousetrapBoxes
@@ -37,7 +32,6 @@
     - type: StorageFill
       contents:
         - id: BoxMousetrap
-          amount: 1
 
 - type: entity
   id: CrateServiceSmokeables
@@ -116,9 +110,7 @@
   - type: StorageFill
     contents:
     - id: BoxPDA
-      amount: 1
     - id: BoxID
-      amount: 1
 
 - type: entity
   id: CrateServiceBooks

diff --git a/Resources/Prototypes/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
index 55bce72aacd9d04ee7faf7312b1771f4dbadbf1b..9b4703f90607392ab4e54f609ef4b1324a467a16 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
@@ -65,7 +65,6 @@
       - id: Bloodpack
         amount: 2
       - id: Gauze
-        amount: 1
       - id: EmergencyMedipen #You never know what people are going to latejoin into
 
 - type: entity
@@ -101,7 +100,6 @@
       - id: EphedrineChemistryBottle
         amount: 2
       - id: OmnizineChemistryBottle
-        amount: 1
       - id: MedkitCombatFilled
 
 - type: entity

diff --git a/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml b/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml
index a96cb28b4a50dc9f37e9bf31f004b62fe1fec87e..9740647bb461e9af826d8bb5a0df33d9c63067fa 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml
@@ -7,7 +7,6 @@
   - type: StorageFill
     contents:
       - id: HandheldHealthAnalyzer
-        amount: 1
       - id: Brutepack
         amount: 2
       - id: Ointment
@@ -40,11 +39,8 @@
       - id: PillIron
         amount: 2
       - id: Gauze
-        amount: 1
       - id: Bloodpack
-        amount: 1
       - id: SyringeTranexamicAcid
-        amount: 1
 
 - type: entity
   id: MedkitToxinFilled
@@ -54,13 +50,10 @@
   - type: StorageFill
     contents:
       - id: SyringeSpaceacillin
-        amount: 1
       - id: SyringeIpecac
-        amount: 1
       - id: PillDylovene
         amount: 3
       - id: AntiPoisonMedipen
-        amount: 1
 
 - type: entity
   id: MedkitOxygenFilled
@@ -70,7 +63,6 @@
   - type: StorageFill
     contents:
       - id: EmergencyMedipen
-        amount: 1
       - id: PillDexalin
         amount: 3
       - id: SyringeInaprovaline
@@ -88,7 +80,6 @@
       - id: PillHyronalin
         amount: 3
       - id: EmergencyMedipen
-        amount: 1
 
 - type: entity
   id: MedkitAdvancedFilled
@@ -100,9 +91,7 @@
       - id: Brutepack
         amount: 2 # TO DO: Advanced fills
       - id: Gauze
-        amount: 1
       - id: Ointment
-        amount: 1
       - id: Bloodpack
         amount: 2
 
@@ -114,13 +103,9 @@
   - type: StorageFill
     contents:
       - id: HandheldHealthAnalyzer
-        amount: 1
       - id: SyringeEphedrine
-        amount: 1 # TO DO: More combat meds
       - id: SyringeTranexamicAcid
-        amount: 1
       - id: AntiPoisonMedipen
-        amount: 1
       - id: Bloodpack
         amount: 2
 
@@ -133,4 +118,3 @@
     contents:
       - id: StimpackMini
         amount: 6
-        

diff --git a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml
index 7f7b1b86df7acaa448ff171f83df8c8f7d40cb6c..75344cbbca48f8a0b533a44fdd47fd8c00c9cb8d 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml
@@ -7,12 +7,10 @@
   - type: StorageFill
     contents:
       - id: CrowbarRed
-        amount: 1
       - id: ClothingMaskBreath
         amount: 2
       - id: FoodSnackChocolate
       - id: FlashlightLantern
-        amount: 1
       - id: FlashlightLantern
         prob: 0.5
       - id: HarmonicaInstrument
@@ -82,6 +80,5 @@
   - type: StorageFill
     contents:
       - id: IngotGold
-        amount: 1
       - id: DrinkGoldenCup
         prob: 0.05

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
index db079b78dd83e9f0e50c84b3875a356ce5c13f3a..10fd6c09caf2340340bae2ecb21082b2418993b6 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
@@ -6,9 +6,7 @@
   - type: StorageFill
     contents:
       - id: BoxPillCanister
-        amount: 1
       - id: BoxSyringe
-        amount: 1
       - id: EpinephrineChemistryBottle
         amount: 3
       - id: Brutepack
@@ -27,9 +25,7 @@
   - type: StorageFill
     contents:
       - id: BoxPillCanister
-        amount: 1
       - id: BoxSyringe
-        amount: 1
       - id: EpinephrineChemistryBottle
         amount: 3
       - id: Brutepack
@@ -89,10 +85,7 @@
   - type: StorageFill
     contents:
       - id: BoxSyringe
-        amount: 1
       - id: BoxBeaker
-        amount: 1
       - id: BoxPillCanister
-        amount: 1
       - id: BoxBottle
         amount: 2

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
index 6d48d7b8844f9dd695d2dbf1c132f3f5a3b940a0..4f94a41ac38559b0fb9be1cbb76aedf383944db5 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
@@ -63,11 +63,8 @@
       - id: TrashBag
         amount: 2
       - id: LightReplacer
-        amount: 1
       - id: BoxLightMixed
-        amount: 1
       - id: Holoprojector
-        amount: 1
       - id: SoapNT
         amount: 2
       - id: FlashlightLantern

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_colors.yml b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_colors.yml
index 56364ee1085bf37543ebe09cd1653347c6becb82..57d90a796487ebe8bcd67521fbb00d7518bc25ec 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_colors.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_colors.yml
@@ -12,7 +12,6 @@
       - id: ClothingShoesColorBlack
         amount: 3
       - id: ClothingHeadHatGreysoft
-        amount: 1
       - id: ClothingBackpackDuffel
         prob: 0.5
       - id: ClothingOuterCoatBomber
@@ -84,13 +83,10 @@
   - type: StorageFill
     contents:
       - id: ClothingUniformJumpsuitColorYellow
-        amount: 1
       - id: ClothingUniformJumpskirtColorYellow
-        amount: 1
       - id: ClothingShoesColorOrange
         amount: 2
       - id: HatBandGold
-        amount: 1
 
 
 - type: entity
@@ -101,13 +97,10 @@
   - type: StorageFill
     contents:
       - id: ClothingUniformJumpsuitColorWhite
-        amount: 1
       - id: ClothingUniformJumpskirtColorWhite
-        amount: 1
       - id: ClothingShoesColorWhite
         amount: 2
       - id: ClothingHeadHatMimesoft
-        amount: 1
 
 - type: entity
   id: WardrobeBlueFilled
@@ -117,9 +110,7 @@
   - type: StorageFill
     contents:
       - id: ClothingUniformJumpsuitColorBlue
-        amount: 1
       - id: ClothingUniformJumpskirtColorBlue
-        amount: 1
       - id: ClothingShoesColorBrown
         amount: 2
 
@@ -131,9 +122,7 @@
   - type: StorageFill
     contents:
       - id: ClothingUniformJumpsuitColorPink
-        amount: 1
       - id: ClothingUniformJumpskirtColorPink
-        amount: 1
       - id: ClothingShoesColorBrown
         amount: 2
 
@@ -145,13 +134,10 @@
   - type: StorageFill
     contents:
       - id: ClothingUniformJumpsuitColorBlack
-        amount: 1
       - id: ClothingUniformJumpskirtColorBlack
-        amount: 1
       - id: ClothingShoesColorBlack
         amount: 2
       - id: HatBandBlack
-        amount: 1
       - id: HatBandSkull
         prob: 0.4
 
@@ -163,11 +149,7 @@
   - type: StorageFill
     contents:
       - id: ClothingUniformJumpsuitColorGreen
-        amount: 1
       - id: ClothingUniformJumpskirtColorGreen
-        amount: 1
       - id: ClothingShoesColorBlack
         amount: 2
       - id: HatBandGreen
-        amount: 1
-

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml
index 3b4872581e7e1372c7f59495e64122cd29a35d7c..d50cace0cf5c1cf9e1d4e020a5a54da022a098ec 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml
@@ -13,7 +13,6 @@
        - id: ClothingShoesColorBlack
          amount: 2
        - id: ClothingMaskMuzzle
-         amount: 1
 
 #- type: entity
 #  id: WardrobePajamaFilled
@@ -35,15 +34,10 @@
    - type: StorageFill
      contents:
        - id: ClothingUniformJumpsuitChemistry
-         amount: 1
        - id: ClothingBackpackChemistry
-         amount: 1
        - id: ClothingShoesColorWhite
-         amount: 1
        - id: ClothingOuterCoatLabChem
-         amount: 1
        - id: ClothingUniformJumpskirtChemistry
-         amount: 1
 
  - type: entity
    id: WardrobeGeneticsFilled
@@ -54,15 +48,10 @@
    - type: StorageFill
      contents:
        - id: ClothingUniformJumpsuitGenetics
-         amount: 1
        - id: ClothingBackpackGenetics
-         amount: 1
        - id: ClothingShoesColorWhite
-         amount: 1
        - id: ClothingOuterCoatLabGene
-         amount: 1
        - id: ClothingUniformJumpskirtGenetics
-         amount: 1
 
  - type: entity
    id: WardrobeVirologyFilled
@@ -73,15 +62,10 @@
    - type: StorageFill
      contents:
        - id: ClothingUniformJumpsuitVirology
-         amount: 1
        - id: ClothingBackpackVirology
-         amount: 1
        - id: ClothingShoesColorWhite
-         amount: 1
        - id: ClothingOuterCoatLabViro
-         amount: 1
        - id: ClothingUniformJumpskirtVirology
-         amount: 1
 
  - type: entity
    id: WardrobeScienceFilled
@@ -92,15 +76,10 @@
    - type: StorageFill
      contents:
        - id: ClothingUniformJumpsuitScientist
-         amount: 1
        - id: ClothingBackpackScience
-         amount: 1
        - id: ClothingShoesColorWhite
-         amount: 1
        - id: ClothingOuterCoatLab
-         amount: 1
        - id: ClothingUniformJumpskirtScientist
-         amount: 1
        - id: ClothingEyesGlasses
          prob: 0.5
        - id: CrowbarRed #The jojoke - hit video game Half-Life
@@ -116,17 +95,11 @@
    - type: StorageFill
      contents:
        - id: ClothingUniformJumpsuitHydroponics
-         amount: 1
        - id: ClothingBackpackHydroponics
-         amount: 1
        - id: ClothingShoesColorBrown
-         amount: 1
        - id: ClothingOuterApronBotanist
-         amount: 1
        - id: ClothingUniformJumpskirtHydroponics
-         amount: 1
        - id: ClothingUniformOveralls
-         amount: 1
        - id: ClothingHeadHatTrucker #the hat itself is a subtle joke
          prob: 0.15
        - id: ClothingHandsGlovesLeather
@@ -141,15 +114,10 @@
    - type: StorageFill
      contents:
        - id: ClothingUniformJumpsuitMedicalDoctor
-         amount: 1
        - id: ClothingBackpackMedical
-         amount: 1
        - id: ClothingShoesColorWhite
-         amount: 1
        - id: ClothingOuterCoatLab
-         amount: 1
        - id: ClothingUniformJumpskirtMedicalDoctor
-         amount: 1
        - id: ClothingHandsGlovesLatex
          prob: 0.4
        - id: ClothingEyesGlasses
@@ -164,12 +132,8 @@
    - type: StorageFill
      contents: # todo chaplain backpack
        - id: ClothingUniformJumpsuitChaplain
-         amount: 1
        - id: ClothingShoesColorBlack
-         amount: 1
        - id: ClothingUniformJumpskirtChaplain
-         amount: 1
-
 
  - type: entity
    id: WardrobeSecurityFilled
@@ -180,19 +144,12 @@
    - type: StorageFill
      contents:
        - id: ClothingUniformJumpsuitSec
-         amount: 1
        - id: ClothingBackpackSecurity
-         amount: 1
        - id: ClothingShoesBootsJack
-         amount: 1
        - id: ClothingEyesGlassesSecurity
-         amount: 1
        - id: ClothingHeadHelmetHelmetOld
-         amount: 1
        - id: ClothingOuterVestKevlar
-         amount: 1
        - id: ClothingUniformJumpskirtSec
-         amount: 1
 
  - type: entity
    id: WardrobeCargoFilled
@@ -203,17 +160,11 @@
    - type: StorageFill
      contents:
        - id: ClothingHeadHatCargosoft
-         amount: 1
        - id: ClothingUniformJumpsuitCargo
-         amount: 1
        - id: ClothingBackpack
-         amount: 1
        - id: ClothingShoesColorBlack
-         amount: 1
        - id: ClothingUniformJumpskirtCargo
-         amount: 1
        - id: ClothingHandsGlovesFingerless
-         amount: 1
 
  - type: entity
    id: WardrobeSalvageFilled
@@ -223,7 +174,6 @@
    - type: StorageFill
      contents:
        - id: ClothingBackpack
-         amount: 1
        - id: ClothingShoesBootsSalvage
          amount: 2
        - id: ClothingUniformJumpsuitSalvageSpecialist
@@ -238,13 +188,9 @@
    - type: StorageFill
      contents:
        - id: ClothingUniformJumpsuitAtmos
-         amount: 1
        - id: ClothingBackpackEngineering
-         amount: 1
        - id: ClothingShoesColorWhite
-         amount: 1
        - id: ClothingUniformJumpskirtAtmos
-         amount: 1
 
  - type: entity
    id: WardrobeEngineeringFilled
@@ -255,14 +201,8 @@
    - type: StorageFill
      contents:
        - id: ClothingHeadHatHardhatYellow
-         amount: 1
        - id: ClothingUniformJumpsuitEngineering
-         amount: 1
        - id: ClothingBackpackEngineering
-         amount: 1
        - id: ClothingShoesBootsWork
-         amount: 1
        - id: ClothingOuterVestHazard
-         amount: 1
        - id: ClothingUniformJumpskirtEngineering
-         amount: 1