Lockers Balance - again (#561)

* yep * QM HardSuit * Belts2lockers * RD Changes
new-frontiers-14 · Nov 12, 2023 · 07d631f · 07d631f
1 parent 7daef65
commit 07d631f
Show file tree

Hide file tree

Showing 17 changed files with 195 additions and 69 deletions.
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml b/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml
@@ -1,4 +1,4 @@
-# - type: cargoProduct
+# - type: cargoProduct # Frontier - Cannot be moved off floors
   # id: CargoPallet
   # icon:
     # sprite: Structures/catwalk.rsi
@@ -18,12 +18,12 @@
   category: Cargo
   group: market
 
-- type: cargoProduct
-  id: CargoLuxuryHardsuit
-  icon:
-    sprite: Clothing/Head/Hardsuits/luxury.rsi
-    state: icon
-  product: CrateCargoLuxuryHardsuit
-  cost: 15000
-  category: Cargo
-  group: market
+# - type: cargoProduct # Frontier - Moved to cargo locker
+  # id: CargoLuxuryHardsuit
+  # icon:
+    # sprite: Clothing/Head/Hardsuits/luxury.rsi
+    # state: icon
+  # product: CrateCargoLuxuryHardsuit
+  # cost: 15000
+  # category: Cargo
+  # group: market
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
@@ -15,11 +15,15 @@
 #      - id: ClothingBeltUtilityFilled # Frontier
       - id: ClothingBeltUtilityEngineering # Frontier
       - id: SurvivalKnife
-#      - id: HandheldGPSBasic # Frontier
+      - id: JetpackMiniFilled # Frontier
+      - id: HandheldGPSBasic # Frontier
       - id: RadioHandheld
       - id: OreBag
-      - id: Flare
-        amount: 3
+#      - id: Flare # Frontier
+#        amount: 3 # Frontier
+      - id: BoxFlare # Frontier
+      - id: MiningDrill # Frontier
+      - id: WeaponProtoKineticAccelerator # Frontier
 
 - type: entity
   id: LockerSalvageSpecialistFilled
@@ -36,5 +40,8 @@
 #      - id: HandheldGPSBasic # Frontier
       - id: RadioHandheld
       - id: OreBag
-      - id: Flare
-        amount: 3
+#      - id: Flare # Frontier
+#        amount: 3 # Frontier
+      - id: BoxFlare # Frontier
+      - id: MiningDrill # Frontier
+      - id: WeaponProtoKineticAccelerator # Frontier
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
@@ -90,6 +90,12 @@
       - id: MedkitOxygenFilled
       - id: HolofanProjector
 #      - id: DoorRemoteFirefight
+      - id: ClothingShoesBootsMag # Frontier
+      - id: ClothingHandsGlovesColorYellow # Frontier
+      - id: trayScanner # Frontier
+      - id: JetpackMiniFilled # Frontier
+      - id: HandheldGPSBasic # Frontier
+      - id: ClothingBeltUtilityEngineering # Frontier
 
 - type: entity
   id: LockerAtmosphericsFilled
@@ -105,6 +111,9 @@
       - id: MedkitOxygenFilled
       - id: HolofanProjector
 #      - id: DoorRemoteFirefight
+      - id: ClothingHandsGlovesColorYellow # Frontier
+      - id: trayScanner # Frontier
+      - id: ClothingBeltUtilityEngineering # Frontier
 
 - type: entity
   id: LockerEngineerFilledHardsuit
@@ -119,6 +128,10 @@
       - id: OxygenTankFilled
       - id: NitrogenTankFilled
       - id: ClothingShoesBootsMag
+      - id: trayScanner # Frontier
+      - id: JetpackMiniFilled # Frontier
+      - id: HandheldGPSBasic # Frontier
+      - id: ClothingBeltUtilityEngineering # Frontier
 
 - type: entity
   id: LockerEngineerFilled
@@ -130,6 +143,7 @@
       - id: ClothingHandsGlovesColorYellow
       - id: ClothingMaskGas
       - id: trayScanner
+      - id: ClothingBeltUtilityEngineering # Frontier
 
 - type: entity
   id: ClosetRadiationSuitFilled

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -66,6 +66,8 @@
       - id: DrinkFlask # Frontier
       - id: OxygenTankFilled # Frontier
       - id: NitrogenTankFilled # Frontier
+      - id: JetpackMiniFilled # Frontier
+      - id: HandheldGPSBasic # Frontier
 
 - type: entity
   id: LockerCaptainFilled
@@ -171,6 +173,8 @@
       - id: BoxEncryptionKeyEngineering
 #      - id: AccessConfigurator # Frontier
       - id: ClothingNeckMantleCE # Frontier
+      - id: JetpackMiniFilled # Frontier
+      - id: HandheldGPSBasic # Frontier
 
 - type: entity
   id: LockerChiefEngineerFilled
@@ -222,7 +226,14 @@
       - id: MaterialBiomass
         amount: 3
       - id: BoxEncryptionKeyMedical
+      - id: HandLabeler # Frontier
+      - id: ClothingBeltMedical # Frontier
       - id: ClothingNeckMantleCMO # Frontier
+      - id: NitrogenTankFilled # Frontier
+      - id: OxygenTankFilled # Frontier
+      - id: ClothingMaskBreathMedical # Frontier
+      - id: JetpackMiniFilled # Frontier
+      - id: HandheldGPSBasic # Frontier
 
 - type: entity
   id: LockerChiefMedicalOfficerFilled
@@ -250,6 +261,8 @@
       - id: MaterialBiomass
         amount: 3
       - id: BoxEncryptionKeyMedical
+      - id: HandLabeler # Frontier
+      - id: ClothingBeltMedical # Frontier
       - id: ClothingNeckMantleCMO # Frontier
       - id: ClothingOuterWinterCMO # Frontier
 
@@ -260,11 +273,11 @@
   components:
   - type: StorageFill
     contents:
-      - id: ResearchComputerCircuitboard
-      - id: ProtolatheMachineCircuitboard
-      - id: CircuitImprinterMachineCircuitboard
+#      - id: ResearchComputerCircuitboard # Frontier
+#      - id: ProtolatheMachineCircuitboard # Frontier
+#      - id: CircuitImprinterMachineCircuitboard # Frontier
       - id: ClothingNeckCloakRd
-      - id: ClothingHeadsetMedicalScience
+#      - id: ClothingHeadsetMedicalScience # Frontier
       - id: ClothingOuterHardsuitRd
 #      - id: HandTeleporter # Frontier
 #      - id: DoorRemoteResearch # Frontier
@@ -273,34 +286,14 @@
       - id: RubberStampRd
       - id: ClothingHeadsetAltScience
       - id: BoxEncryptionKeyScience
-      - id: BoxEncryptionKeyRobo
+#      - id: BoxEncryptionKeyRobo # Frontier
       - id: ClothingBeltUtilityEngineering # Frontier
       - id: ClothingNeckMantleRD # Frontier
-
-- type: entity
-  id: LockerResearchDirectorShuttleFilled
-  suffix: Filled, Shuttle
-  parent: LockerResearchDirector
-  components:
-  - type: StorageFill
-    contents:
-      - id: ResearchComputerCircuitboard
-      - id: ProtolatheMachineCircuitboard
-      - id: CircuitImprinterMachineCircuitboard
-      - id: ClothingNeckCloakRd
-      - id: ClothingHeadsetMedicalScience
-      - id: PlushieSlime
-        prob: 0.1
-#      - id: DoorRemoteResearch # Frontier
-      - id: ClothingHeadHatBeretRND
-      - id: ClothingHandsGlovesColorPurple
-      - id: ClothingBeltUtilityEngineering # Frontier
-      - id: RubberStampRd
-      - id: ClothingHeadsetAltScience
-      - id: BoxEncryptionKeyScience
-      - id: BoxEncryptionKeyRobo # Frontier
-      - id: ClothingNeckMantleRD # Frontier
-      - id: ClothingOuterWinterRD # Frontier
+      - id: NitrogenTankFilled # Frontier
+      - id: OxygenTankFilled # Frontier
+      - id: ClothingMaskBreath # Frontier
+      - id: JetpackMiniFilled # Frontier
+      - id: HandheldGPSBasic # Frontier
 
 - type: entity
   id: LockerResearchDirectorFilled
@@ -309,20 +302,19 @@
   components:
   - type: StorageFill
     contents:
-      - id: ResearchComputerCircuitboard
-      - id: ProtolatheMachineCircuitboard
-      - id: CircuitImprinterMachineCircuitboard
+#      - id: ResearchComputerCircuitboard # Frontier
+#      - id: ProtolatheMachineCircuitboard # Frontier
+#      - id: CircuitImprinterMachineCircuitboard # Frontier
       - id: ClothingNeckCloakRd
-      - id: ClothingHeadsetMedicalScience
+#      - id: ClothingHeadsetMedicalScience # Frontier
 #      - id: HandTeleporter # Frontier
 #      - id: DoorRemoteResearch # Frontier
       - id: ClothingHeadHatBeretRND
       - id: ClothingHandsGlovesColorPurple
-      - id: ClothingBeltUtilityEngineering # Frontier
       - id: RubberStampRd
       - id: ClothingHeadsetAltScience
       - id: BoxEncryptionKeyScience
-      - id: BoxEncryptionKeyRobo # Frontier
+      - id: ClothingBeltUtilityEngineering # Frontier
       - id: ClothingNeckMantleRD # Frontier
       - id: ClothingOuterWinterRD # Frontier
 
@@ -359,6 +351,10 @@
       - id: HoloprojectorSecurity
       - id: ClothingNeckMantleHOS # Frontier
       - id: CrowbarRed # Frontier
+      - id: NitrogenTankFilled # Frontier
+      - id: OxygenTankFilled # Frontier
+      - id: JetpackSecurityFilled # Frontier
+      - id: HandheldGPSBasic # Frontier
 
 - type: entity
   id: LockerHeadOfSecurityFilled

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
@@ -68,6 +68,8 @@
         prob: 0.05
         orGroup: Surgshrubs
       - id: ClothingMaskSterile
+      - id: HandLabeler # Frontier
+      - id: ClothingBeltMedical # Frontier
 
 - type: entity
   parent: LockerWallMedical
@@ -102,6 +104,8 @@
         prob: 0.05
         orGroup: Surgshrubs
       - id: ClothingMaskSterile
+      - id: HandLabeler # Frontier
+      - id: ClothingBeltMedical # Frontier
 
 - type: entity
   id: LockerChemistryFilled
@@ -120,6 +124,10 @@
       - id: ClothingHeadsetMedical
       - id: ClothingMaskSterile
       - id: HandLabeler
+      - id: ClothingBeltMedical # Frontier
+      - id: ClothingEyesGlassesChemical # Frontier
+      - id: SheetPlasma1 # Frontier
+        amount: 3
 
 - type: entity
   id: LockerParamedicFilled
@@ -139,3 +147,5 @@
       - id: ClothingHeadsetMedical
       - id: ClothingMaskSterile
       - id: MedkitFilled
+      - id: HandLabeler # Frontier
+      - id: ClothingBeltMedical # Frontier
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -23,6 +23,11 @@
       - id: HoloprojectorSecurity
       - id: ClothingEyesHudSecurity
       - id: CrowbarRed # Frontier
+      - id: NitrogenTankFilled # Frontier
+      - id: OxygenTankFilled # Frontier
+      - id: ClothingMaskGasSecurity # Frontier
+      - id: JetpackSecurityFilled # Frontier
+      - id: HandheldGPSBasic # Frontier
 
 - type: entity
   id: LockerWardenFilled

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
@@ -174,6 +174,7 @@
         - id: ClothingMaskBreath
         - id: JetpackSecurityFilled # Frontier
         - id: HandheldGPSBasic # Frontier
+#        - id: ClothingShoesBootsMagCombatFilled # Frontier
   - type: AccessReader
     access: [["Security"]]
 
@@ -245,6 +246,7 @@
         - id: ClothingOuterHardsuitSecurityRed
         - id: ClothingMaskGasSwat
         - id: HandheldGPSBasic # Frontier
+#        - id: ClothingShoesBootsMagCombatFilled # Frontier
   - type: AccessReader
     access: [["HeadOfSecurity"]]
 
@@ -262,6 +264,7 @@
         - id: ClothingMaskBreath
         - id: JetpackSecurityFilled # Frontier
         - id: HandheldGPSBasic # Frontier
+#        - id: ClothingShoesBootsMagCombatFilled # Frontier
   - type: AccessReader
     access: [["Armory"]]
 
@@ -277,7 +280,7 @@
         - id: OxygenTankFilled
         - id: ClothingOuterHardsuitCap
         - id: ClothingMaskGasCaptain
-        - id: JetpackCaptainFilled # Frontier
+        - id: JetpackMiniFilled # Frontier
         - id: HandheldGPSBasic # Frontier
   - type: AccessReader
     # access: [["Captain"]] # Frontier
@@ -328,8 +331,11 @@
         - id: OxygenTankFilled
         - id: ClothingOuterHardsuitPirateCap
         - id: ClothingMaskGas
+        - id: ClothingNeckCloakPirateCap # Frontier
         - id: JetpackBlackFilled # Frontier
         - id: HandheldGPSBasic # Frontier
+        - id: HandheldGPSBasic # Frontier
+#        - id: ClothingShoesBootsMagPirateFilled # Frontier - TODO: Add this ones its ready
 
 #Wizard
 - type: entity

diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
@@ -23,7 +23,7 @@
     shoes: ClothingShoesColorWhite
     eyes: ClothingEyesGlassesMeson
     id: AtmosPDA
-    belt: ClothingBeltUtilityEngineering
+#    belt: ClothingBeltUtilityEngineering # Frontier - Moved to locker
     ears: ClothingHeadsetEngineering
   innerClothingSkirt: ClothingUniformJumpskirtAtmos
   satchel: ClothingBackpackSatchelAtmosphericsFilled

diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
@@ -36,7 +36,7 @@
     id: CEPDA
     eyes: ClothingEyesGlassesMeson
     ears: ClothingHeadsetCE
-    belt: ClothingBeltUtilityEngineering
+#    belt: ClothingBeltUtilityEngineering # Frontier - Moved to locker
   innerClothingSkirt: ClothingUniformJumpskirtChiefEngineer
   satchel: ClothingBackpackSatchelChiefEngineerFilled
   duffelbag: ClothingBackpackDuffelChiefEngineerFilled
diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml
@@ -31,7 +31,7 @@
     shoes: ClothingShoesBootsWork
     id: SeniorEngineerPDA
     eyes: ClothingEyesGlassesMeson
-    belt: ClothingBeltUtilityEngineering
+#    belt: ClothingBeltUtilityEngineering # Frontier - Moved to locker
     ears: ClothingHeadsetEngineering
   innerClothingSkirt: ClothingUniformJumpskirtSeniorEngineer
   satchel: ClothingBackpackSatchelEngineeringFilled

diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
@@ -26,7 +26,7 @@
     outerClothing: ClothingOuterVestHazard
     id: EngineerPDA
     eyes: ClothingEyesGlassesMeson
-    belt: ClothingBeltUtilityEngineering
+#    belt: ClothingBeltUtilityEngineering # Frontier - Moved to locker
     ears: ClothingHeadsetEngineering
   innerClothingSkirt: ClothingUniformJumpskirtEngineering
   satchel: ClothingBackpackSatchelEngineeringFilled

diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
@@ -25,7 +25,7 @@
     back: ClothingBackpackEngineeringFilled
     shoes: ClothingShoesBootsWork
     id: TechnicalAssistantPDA
-    belt: ClothingBeltUtilityEngineering
+#    belt: ClothingBeltUtilityEngineering # Frontier - Moved to locker
     ears: ClothingHeadsetEngineering
   innerClothingSkirt: ClothingUniformJumpskirtColorYellow
   satchel: ClothingBackpackSatchelEngineeringFilled