Lockers trim (#616)

* Medical, HOP, Jani

* CE, Engi

* BioSuit

* Botanic

* RD

* Name Fix

* qm

* More Lockers

* Chef

* Chef Vend Fix

* Fixing

* Fixing

* MedBox

* Almost forgot

* Fixes

* Botanic

* Not on the whitelist

Resources/Prototypes/Catalog/Fills/Crates/botany.yml

@@ -52,9 +52,10 @@
       - id: PestSpray
       - id: HydroponicsToolScythe
       - id: HydroponicsToolHatchet
-      - id: ClothingOuterApronBotanist
-      - id: ClothingHandsGlovesLeather
-      - id: HydroponicsToolClippers
+#      - id: ClothingOuterApronBotanist # Frontier
+#      - id: ClothingHandsGlovesLeather # Frontier
+      - id: HydroponicsToolClippers # Frontier
+      - id: HydroponicsToolSpade # Frontier
 
 - type: entity
   id: CrateHydroponicsSeeds

Resources/Prototypes/Catalog/Fills/Items/belt.yml

@@ -114,6 +114,8 @@
     - id: HydroponicsToolMiniHoe
     - id: HydroponicsToolSpade
     - id: RobustHarvestChemistryBottle
+    - id: HydroponicsToolClippers # Frontier
+    - id: EZNutrientChemistryBottle # Frontier
 
 - type: entity
   id: ClothingBeltSheathFilled

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

@@ -5,27 +5,27 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingNeckCloakQm
+#      - id: ClothingNeckCloakQm
 #      - id: BoxFolderQmClipboard # Frontier - Moved to SR backpack
-      - id: ClothingHeadsetCargo
-      - id: ClothingUniformJumpsuitQMTurtleneck
-      - id: ClothingUniformJumpskirtQMTurtleneck
-      - id: ClothingHandsGlovesColorBrown
-      - id: ClothingShoesColorBrown
-      - id: ClothingHeadHatQMsoft
+#      - id: ClothingHeadsetCargo # Frontier
+#      - id: ClothingUniformJumpsuitQMTurtleneck # Frontier
+#      - id: ClothingUniformJumpskirtQMTurtleneck # Frontier
+#      - id: ClothingHandsGlovesColorBrown # Frontier
+#      - id: ClothingShoesColorBrown # Frontier
+#      - id: ClothingHeadHatQMsoft # Frontier
 #      - id: CargoRequestComputerCircuitboard # Frontier
 #      - id: CargoShuttleComputerCircuitboard # Frontier
 #      - id: CargoShuttleConsoleCircuitboard # Frontier
 #      - id: SalvageShuttleConsoleCircuitboard # Frontier
 #      - id: CargoBountyComputerCircuitboard # Frontier
-      - id: CigPackGreen
-        prob: 0.50
+#      - id: CigPackGreen # Frontier
+#        prob: 0.50
 #      - id: DoorRemoteCargo # Frontier
       - id: RubberStampQm
       - id: ClothingHeadsetAltCargo
-      - id: BoxEncryptionKeyCargo
-      - id: ClothingNeckMantleQM # Frontier
-      - id: ClothingOuterWinterQM # Frontier
+#      - id: BoxEncryptionKeyCargo
+#      - id: ClothingNeckMantleQM # Frontier
+#      - id: ClothingOuterWinterQM # Frontier
       - id: ClothingBeltUtilityEngineering # Frontier
 
 - type: entity
@@ -48,10 +48,10 @@
 #      - id: CommsComputerCircuitboard # Frontier
 #      - id: ClothingHeadsetAltCommand # Frontier
 #      - id: SpaceCash1000 # Frontier
-      - id: PlushieNuke
-        prob: 0.1
-      - id: CigarGoldCase
-        prob: 0.25
+#      - id: PlushieNuke # Frontier
+#        prob: 0.1
+#      - id: CigarGoldCase # Frontier
+#        prob: 0.25
 #      - id: ClothingBeltSheathFilled # Frontier
 #      - id: DoorRemoteCommand # Frontier
       - id: ClothingNeckCloakCapFormal
@@ -87,10 +87,10 @@
 #      - id: CommsComputerCircuitboard # Frontier
 #      - id: ClothingHeadsetAltCommand # Frontier
 #      - id: SpaceCash1000 # Frontier
-      - id: PlushieNuke
-        prob: 0.1
-      - id: CigarGoldCase
-        prob: 0.25
+#      - id: PlushieNuke # Frontier
+#        prob: 0.1
+#      - id: CigarGoldCase # Frontier
+#        prob: 0.25
 #      - id: ClothingBeltSheathFilled # Frontier
 #      - id: DoorRemoteCommand # Frontier
       - id: ClothingNeckCloakCapFormal
@@ -111,28 +111,28 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingNeckCloakHop
-      - id: ClothingHeadHatHopcap
+#      - id: ClothingNeckCloakHop # Frontier - bloat
+#      - id: ClothingHeadHatHopcap # Frontier - bloat
       - id: HoPIDCard
 #      - id: ClothingHeadsetCommand # Frontier
       - id: ClothingHeadsetCentCom # Frontier
-      - id: BoxPDA
-      - id: BoxID
-      - id: BoxHeadset
+#      - id: BoxPDA # Frontier - bloat
+#      - id: BoxID # Frontier - bloat
+#      - id: BoxHeadset # Frontier - bloat
       - id: BoxHandcuff # Frontier
       - id: IDComputerCircuitboard
       - id: CommsComputerCircuitboard # Frontier
-      - id: WeaponDisabler
-      - id: ClothingOuterWinterHoP
-      - id: CigarGoldCase
-        prob: 0.25
+#      - id: WeaponDisabler # Frontier - bloat
+#      - id: ClothingOuterWinterHoP # Frontier - bloat
+#      - id: CigarGoldCase  # Frontier
+#        prob: 0.25
         # Fuck the HoP they don't deserve fucking cigars.
         # Yes they do fuck you.
 #      - id: DoorRemoteService # Frontier
 #      - id: ClothingNeckGoldmedal # Frontier
 #      - id: RubberStampHop # Frontier
-      - id: BoxEncryptionKeyPassenger
-      - id: BoxEncryptionKeyService
+#      - id: BoxEncryptionKeyPassenger # Frontier - bloat
+#      - id: BoxEncryptionKeyService # Frontier - bloat
       - id: ClothingBackpackIan
 #        prob: 0.5 # Frontier
 #      - id: AccessConfigurator # Frontier
@@ -152,27 +152,27 @@
     contents:
       - id: ClothingOuterHardsuitEngineeringWhite
       - id: ClothingMaskBreath
-      - id: ClothingUniformJumpsuitChiefEngineerTurtle
-      - id: ClothingUniformJumpskirtChiefEngineerTurtle
+#      - id: ClothingUniformJumpsuitChiefEngineerTurtle
+#      - id: ClothingUniformJumpskirtChiefEngineerTurtle
       - id: OxygenTankFilled
       - id: NitrogenTankFilled
-      - id: ClothingNeckCloakCe
+#      - id: ClothingNeckCloakCe
       - id: ClothingEyesGlassesMeson
 #      - id: ClothingBeltChiefEngineerFilled # Frontier
       - id: ClothingBeltUtilityEngineering # Frontier
-      - id: ClothingHeadHatBeretEngineering
+#      - id: ClothingHeadHatBeretEngineering
 #      - id: ClothingShoesBootsMagAdv # Frontier
       - id: ClothingShoesBootsMag # Frontier
       - id: ClothingHandsGlovesColorYellow
-      - id: CigarCase
-        prob: 0.15
+#      - id: CigarCase # Frontier
+#        prob: 0.15
 #      - id: DoorRemoteEngineering # Frontier
       - id: RubberStampCE
 #      - id: JetpackVoidFilled # Frontier
       - id: ClothingHeadsetAltEngineering
-      - id: BoxEncryptionKeyEngineering
+#      - id: BoxEncryptionKeyEngineering
 #      - id: AccessConfigurator # Frontier
-      - id: ClothingNeckMantleCE # Frontier
+      - id: trayScanner # Frontier
       - id: JetpackMiniFilled # Frontier
       - id: HandheldGPSBasic # Frontier
 
@@ -183,23 +183,22 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingNeckCloakCe
+#      - id: ClothingNeckCloakCe
       - id: ClothingEyesGlassesMeson
 #      - id: ClothingBeltChiefEngineerFilled # Frontier
       - id: ClothingBeltUtilityEngineering # Frontier
-      - id: ClothingHeadHatBeretEngineering
+#      - id: ClothingHeadHatBeretEngineering
       - id: ClothingHandsGlovesColorYellow
-      - id: ClothingUniformJumpsuitChiefEngineerTurtle
-      - id: ClothingUniformJumpskirtChiefEngineerTurtle
-      - id: CigarCase
-        prob: 0.15
+#      - id: ClothingUniformJumpsuitChiefEngineerTurtle
+#      - id: ClothingUniformJumpskirtChiefEngineerTurtle
+#      - id: CigarCase # Frontier
+#        prob: 0.15
 #      - id: DoorRemoteEngineering # Frontier
       - id: RubberStampCE
       - id: ClothingHeadsetAltEngineering
-      - id: BoxEncryptionKeyEngineering
+#      - id: BoxEncryptionKeyEngineering
 #      - id: AccessConfigurator # Frontier
-      - id: ClothingNeckMantleCE # Frontier
-      - id: ClothingOuterWinterCE # Frontier
+      - id: trayScanner # Frontier
 
 - type: entity
   id: LockerChiefMedicalOfficerFilledHardsuit
@@ -208,27 +207,24 @@
   components:
   - type: StorageFill
     contents:
-      - id: MedkitFilled
-      - id: ClothingHandsGlovesNitrile
-      #- name: ClothingEyesHudMedical #Removed until working properly
-      - id: ClothingHeadsetAltMedical
-      - id: ClothingCloakCmo
-      - id: ClothingBackpackDuffelSurgeryFilled
-      - id: ClothingOuterCoatLabCmo
-      - id: ClothingMaskSterile
-      - id: ClothingHeadHatBeretCmo
+#      - id: MedkitFilled # Frontier - bloat
+#      - id: ClothingHandsGlovesNitrile # Frontier - bloat
+      - id: ClothingEyesHudMedical # Frontier
+      - id: ClothingHeadsetAltMedical # Frontier - bloat
+#      - id: ClothingCloakCmo # Frontier - bloat
+#      - id: ClothingBackpackDuffelSurgeryFilled # Frontier - bloat
+#      - id: ClothingOuterCoatLabCmo # Frontier - bloat
+#      - id: ClothingMaskSterile # Frontier - bloat
+#      - id: ClothingHeadHatBeretCmo # Frontier - bloat
       - id: ClothingOuterHardsuitMedical
       - id: Hypospray
       - id: HandheldCrewMonitor
 #      - id: DoorRemoteMedical # Frontier
       - id: RubberStampCMO
-      - id: MedicalTechFabCircuitboard
+#      - id: MedicalTechFabCircuitboard # Frontier - bloat
       - id: MaterialBiomass
-        amount: 3
-      - id: BoxEncryptionKeyMedical
-      - id: HandLabeler # Frontier
-      - id: ClothingBeltMedical # Frontier
-      - id: ClothingNeckMantleCMO # Frontier
+        amount: 1 # Frontier - 3<1
+#      - id: BoxEncryptionKeyMedical # Frontier - bloat
       - id: NitrogenTankFilled # Frontier
       - id: OxygenTankFilled # Frontier
       - id: ClothingMaskBreathMedical # Frontier
@@ -242,29 +238,25 @@
   components:
   - type: StorageFill
     contents:
-      - id: MedkitFilled
-      - id: ClothingHandsGlovesNitrile
-      #- name: ClothingEyesHudMedical #Removed until working properly
-      - id: ClothingHeadsetAltMedical
-      - id: ClothingCloakCmo
-      - id: ClothingBackpackDuffelSurgeryFilled
-      - id: ClothingOuterCoatLabCmo
-      - id: ClothingMaskSterile
-      - id: ClothingHeadHatBeretCmo
-      - id: DiagnoserMachineCircuitboard
-      - id: VaccinatorMachineCircuitboard
+#      - id: MedkitFilled # Frontier - bloat
+#      - id: ClothingHandsGlovesNitrile # Frontier - bloat
+      - id: ClothingEyesHudMedical # Frontier
+      - id: ClothingHeadsetAltMedical # Frontier - bloat
+#      - id: ClothingCloakCmo # Frontier - bloat
+#      - id: ClothingBackpackDuffelSurgeryFilled # Frontier - bloat
+#      - id: ClothingOuterCoatLabCmo # Frontier - bloat
+#      - id: ClothingMaskSterile # Frontier - bloat
+#      - id: ClothingHeadHatBeretCmo # Frontier - bloat
+#      - id: DiagnoserMachineCircuitboard # Frontier - bloat
+#      - id: VaccinatorMachineCircuitboard # Frontier - bloat
       - id: Hypospray
       - id: HandheldCrewMonitor
 #      - id: DoorRemoteMedical # Frontier
       - id: RubberStampCMO
-      - id: MedicalTechFabCircuitboard
+#      - id: MedicalTechFabCircuitboard # Frontier - bloat
       - id: MaterialBiomass
-        amount: 3
-      - id: BoxEncryptionKeyMedical
-      - id: HandLabeler # Frontier
-      - id: ClothingBeltMedical # Frontier
-      - id: ClothingNeckMantleCMO # Frontier
-      - id: ClothingOuterWinterCMO # Frontier
+        amount: 1 # Frontier - 3<1
+#      - id: BoxEncryptionKeyMedical # Frontier - bloat
 
 - type: entity
   id: LockerResearchDirectorFilledHardsuit
@@ -276,19 +268,17 @@
 #      - id: ResearchComputerCircuitboard # Frontier
 #      - id: ProtolatheMachineCircuitboard # Frontier
 #      - id: CircuitImprinterMachineCircuitboard # Frontier
-      - id: ClothingNeckCloakRd
+#      - id: ClothingNeckCloakRd # Frontier
 #      - id: ClothingHeadsetMedicalScience # Frontier
       - id: ClothingOuterHardsuitRd
 #      - id: HandTeleporter # Frontier
 #      - id: DoorRemoteResearch # Frontier
-      - id: ClothingHeadHatBeretRND
-      - id: ClothingHandsGlovesColorPurple # Frontier
+#      - id: ClothingHeadHatBeretRND # Frontier
       - id: RubberStampRd
       - id: ClothingHeadsetAltScience
-      - id: BoxEncryptionKeyScience
+#      - id: BoxEncryptionKeyScience
 #      - id: BoxEncryptionKeyRobo # Frontier
       - id: ClothingBeltUtilityEngineering # Frontier
-      - id: ClothingNeckMantleRD # Frontier
       - id: NitrogenTankFilled # Frontier
       - id: OxygenTankFilled # Frontier
       - id: ClothingMaskBreath # Frontier
@@ -305,18 +295,16 @@
 #      - id: ResearchComputerCircuitboard # Frontier
 #      - id: ProtolatheMachineCircuitboard # Frontier
 #      - id: CircuitImprinterMachineCircuitboard # Frontier
-      - id: ClothingNeckCloakRd
+#      - id: ClothingNeckCloakRd # Frontier
 #      - id: ClothingHeadsetMedicalScience # Frontier
 #      - id: HandTeleporter # Frontier
 #      - id: DoorRemoteResearch # Frontier
-      - id: ClothingHeadHatBeretRND
-      - id: ClothingHandsGlovesColorPurple
+#      - id: ClothingHeadHatBeretRND # Frontier
+#      - id: ClothingHandsGlovesColorPurple # Frontier
       - id: RubberStampRd
       - id: ClothingHeadsetAltScience
-      - id: BoxEncryptionKeyScience
+#      - id: BoxEncryptionKeyScience # Frontier
       - id: ClothingBeltUtilityEngineering # Frontier
-      - id: ClothingNeckMantleRD # Frontier
-      - id: ClothingOuterWinterRD # Frontier
 
 - type: entity
   id: LockerHeadOfSecurityFilledHardsuit
@@ -339,8 +327,8 @@
       - id: ClothingHeadsetAltSecurity
       - id: ClothingEyesGlassesSecurity
       - id: ClothingShoesBootsJack
-      - id: CigarGoldCase
-        prob: 0.50
+#      - id: CigarGoldCase # Frontier
+#        prob: 0.50
 #      - id: DoorRemoteSecurity # Frontier
       - id: ClothingUniformJumpskirtHosFormal
       - id: ClothingUniformJumpsuitHosFormal
@@ -376,8 +364,8 @@
       - id: ClothingHeadsetAltSecurity
       - id: ClothingEyesGlassesSecurity
       - id: ClothingShoesBootsJack
-      - id: CigarGoldCase
-        prob: 0.50
+#      - id: CigarGoldCase # Frontier
+#        prob: 0.50
 #      - id: DoorRemoteSecurity # Frontier
       - id: ClothingUniformJumpskirtHosFormal
       - id: ClothingUniformJumpsuitHosFormal