Cherry-picked commit d07fa88e1dfba6107602c9cf0d58733ed6074274 from De…

…ltaV-Station/Delta-v/master
Simple-Station · Apr 7, 2024 · b736948 · b736948
1 parent b702cbd
commit b736948
Show file tree

Hide file tree

Showing 7 changed files with 69 additions and 1 deletion.
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
@@ -26,6 +26,8 @@
         prob: 0.3
       - id: ClothingNeckSalvager # DeltaV - salvage cloak
         prob: 0.2
+      - id: LunchboxLogisticsFilledRandom # DeltaV - Lunchboxes!
+        prob: 0.3
 
 - type: entity
   id: LockerSalvageSpecialistFilled
@@ -54,3 +56,5 @@
         prob: 0.3
       - id: ClothingNeckSalvager # DeltaV - salvage cloak
         prob: 0.2
+      - id: LunchboxLogisticsFilledRandom # DeltaV - Lunchboxes!
+        prob: 0.3
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
@@ -90,6 +90,8 @@
       - id: DoorRemoteFirefight
       - id: RCD
       - id: RCDAmmo
+      - id: LunchboxEngineeringFilledRandom # Delta-V Lunchboxes!
+        prob: 0.3
 
 - type: entity
   id: LockerAtmosphericsFilled
@@ -107,6 +109,8 @@
       - id: DoorRemoteFirefight
       - id: RCD
       - id: RCDAmmo
+      - id: LunchboxEngineeringFilledRandom # Delta-V Lunchboxes!
+        prob: 0.3
 
 - type: entity
   id: LockerEngineerFilledHardsuit
@@ -121,6 +125,8 @@
       - id: ClothingShoesBootsMag
       - id: RCD
       - id: RCDAmmo
+      - id: LunchboxEngineeringFilledRandom # Delta-V Lunchboxes!
+        prob: 0.3
 
 - type: entity
   id: LockerEngineerFilled
@@ -134,6 +140,8 @@
       - id: trayScanner
       - id: RCD
       - id: RCDAmmo
+      - id: LunchboxEngineeringFilledRandom # Delta-V Lunchboxes!
+        prob: 0.3
 
 - type: entity
   id: ClosetRadiationSuitFilled

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -21,6 +21,8 @@
       - id: BoxPDACargo # Delta-V
       - id: QuartermasterIDCard # Delta-V
       - id: ClothingShoesBootsWinterLogisticsOfficer #Delta V: Add departmental winter boots
+      - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
+        prob: 0.3
 
 - type: entity
   id: LockerCaptainFilledHardsuit
@@ -53,6 +55,8 @@
       - id: ClothingShoesLeather # DeltaV - add fancy shoes for HoP and cap
       - id: ClothingShoesMiscWhite # DeltaV - add fancy shoes for HoP and cap
       - id: ClothingShoesBootsWinterCap #Delta V: Add departmental winter boots
+      - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
+        prob: 0.3
 
 - type: entity
   id: LockerCaptainFilled
@@ -83,6 +87,8 @@
       - id: ClothingShoesLeather # DeltaV - add fancy shoes for HoP and cap
       - id: ClothingShoesMiscWhite # DeltaV - add fancy shoes for HoP and cap
       - id: ClothingShoesBootsWinterCap #Delta V: Add departmental winter boots
+      - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
+        prob: 0.3
 
 - type: entity
   id: LockerCaptainFilledNoLaser
@@ -112,6 +118,8 @@
       - id: ClothingShoesLeather # DeltaV - add fancy shoes for HoP and cap
       - id: ClothingShoesMiscWhite # DeltaV - add fancy shoes for HoP and cap
       - id: ClothingShoesBootsWinterCap #Delta V: Add departmental winter boots
+      - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
+        prob: 0.3
 
 - type: entity
   id: LockerHeadOfPersonnelFilled
@@ -150,6 +158,8 @@
       - id: ClothingShoesBootsLaceup # DeltaV - add fancy shoes for HoP and cap
       - id: ClothingShoesMiscWhite # DeltaV - add fancy shoes for HoP and cap
       - id: ClothingShoesBootsWinterHeadOfPersonel #Delta V: Add departmental winter boots
+      - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
+        prob: 0.3
 
 - type: entity
   id: LockerChiefEngineerFilledHardsuit
@@ -177,6 +187,8 @@
       - id: RCDAmmo
       - id: CEIDCard # Delta-V
       - id: ClothingShoesBootsWinterChiefEngineer #Delta V: Add departmental winter boots
+      - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
+        prob: 0.3
 
 - type: entity
   id: LockerChiefEngineerFilled
@@ -200,6 +212,8 @@
       - id: ClothingShoesBootsWinterChiefEngineer #Delta V: Add departmental winter boots
       - id: RCD
       - id: RCDAmmo
+      - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
+        prob: 0.3
 
 - type: entity
   id: LockerChiefMedicalOfficerFilledHardsuit
@@ -228,6 +242,8 @@
       - id: ClothingBeltMilitaryWebbingCMO # DeltaV - add webbing for CMO. ON THIS STATION, IT'S DRIP OR [die], CAPTAIN!
       - id: CMOIDCard # Delta-V
       - id: ClothingShoesBootsWinterChiefMedicalOfficer #Delta V: Add departmental winter boots
+      - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
+        prob: 0.3
 
 - type: entity
   id: LockerChiefMedicalOfficerFilled
@@ -252,6 +268,8 @@
       - id: ClothingBeltMilitaryWebbingCMO # DeltaV - add webbing for CMO. ON THIS STATION, IT'S DRIP OR [die], CAPTAIN!
       - id: CMOIDCard # Delta-V
       - id: ClothingShoesBootsWinterChiefMedicalOfficer #Delta V: Add departmental winter boots
+      - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
+        prob: 0.3
 
 - type: entity
   id: LockerResearchDirectorFilledHardsuit
@@ -274,6 +292,8 @@
       - id: ClothingShoesBootsWinterMystagogue #Delta V: Add departmental winter boots
       - id: ClothingHeadsetAltScience
       - id: EncryptionKeyBinary
+      - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
+        prob: 0.3
 
 - type: entity
   id: LockerResearchDirectorFilled
@@ -295,6 +315,8 @@
       - id: ClothingShoesBootsWinterMystagogue #Delta V: Add departmental winter boots
       - id: ClothingHeadsetAltScience
       - id: EncryptionKeyBinary
+      - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
+        prob: 0.3
 
 - type: entity
   id: LockerHeadOfSecurityFilledHardsuit
@@ -326,6 +348,8 @@
       - id: WeaponEnergyGunMultiphase # DeltaV - HoS Energy Gun
       - id: HoSIDCard # Delta-V
       - id: ClothingShoesBootsWinterHeadOfSecurity #Delta V: Add departmental winter boots
+      - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
+        prob: 0.3
 
 - type: entity
   id: LockerHeadOfSecurityFilled
@@ -354,6 +378,8 @@
       - id: WeaponEnergyGunMultiphase # DeltaV - HoS Energy Gun
       - id: HoSIDCard # Delta-V
       - id: ClothingShoesBootsWinterHeadOfSecurity #Delta V: Add departmental winter boots
+      - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
+        prob: 0.3
 
 - type: entity
   id: LockerFreezerVaultFilled

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
@@ -108,6 +108,8 @@
       - id: NitrousOxideTankFilled
         prob: 0.3
       - id: ClothingMaskSterile
+      - id: LunchboxMedicalFilledRandom # Delta-V Lunchboxes!
+        prob: 0.3 
 
 - type: entity
   parent: LockerWallMedical
@@ -142,6 +144,8 @@
         prob: 0.05
         orGroup: Surgshrubs
       - id: ClothingMaskSterile
+      - id: LunchboxMedicalFilledRandom # Delta-V Lunchboxes!
+        prob: 0.3 
 
 - type: entity
   id: LockerChemistryFilled
@@ -182,6 +186,8 @@
       - id: ClothingShoesBootsWinterParamedic #Delta V: Add departmental winter boots
       - id: MedkitFilled
         prob: 0.3
+      - id: LunchboxMedicalFilledRandom # Delta-V Lunchboxes!
+        prob: 0.3 
 
 - type: entity
   id: LockerParamedicFilledHardsuit #Delta V - Paramedic locker with suit
@@ -204,3 +210,5 @@
       - id: HandheldGPSBasic
       - id: MedkitFilled
         prob: 0.3
+      - id: LunchboxMedicalFilledRandom # Delta-V Lunchboxes!
+        prob: 0.3 
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/science.yml b/Resources/Prototypes/Catalog/Fills/Lockers/science.yml
@@ -13,3 +13,5 @@
       - id: NodeScanner
       - id: NetworkConfigurator
         prob: 0.5
+      - id: LunchboxEpistemicsFilledRandom # Delta-V Lunchboxes!
+        prob: 0.3
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -24,7 +24,9 @@
       - id: BoxPDAPrisoner # Delta-V
       - id: ClothingShoesBootsWinterWarden #Delta V: Add departmental winter boots
       - id: BoxEncryptionKeyPrisoner #Delta-V
-
+      - id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes!
+        prob: 0.3
+
 - type: entity
   id: LockerWardenFilled
   suffix: Filled
@@ -50,6 +52,8 @@
       - id: BoxPDAPrisoner # Delta-V
       - id: ClothingShoesBootsWinterWarden #Delta V: Add departmental winter boots
       - id: BoxEncryptionKeyPrisoner #Delta-V
+      - id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes!
+        prob: 0.3
 
 - type: entity
   id: LockerSecurityFilled
@@ -93,6 +97,8 @@
       - id: ClothingEyesHudSecurity
       - id: HoloprojectorSecurity
         prob: 0.6
+      - id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes!
+        prob: 0.3
 
 - type: entity
   id: LockerBrigmedicFilled
@@ -129,6 +135,8 @@
         prob: 0.7
 ##      - id: ClothingNeckCloakMoth #bzzz Moth-pocalypse # DeltaV - why
 ##        prob: 0.15
+      - id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes!
+        prob: 0.3
 
 # DeltaV - adding corpsman locker w/ hardsuit
 
@@ -160,6 +168,8 @@
         prob: 0.3
       - id: MedkitBurnFilled
         prob: 0.7
+      - id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes!
+        prob: 0.3
 
 # DeltaV - end addition
 
@@ -185,6 +195,8 @@
       - id: RubberStampDetective
       - id: HoloprojectorSecurity
       - id: BoxEvidenceMarkers
+      - id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes!
+        prob: 0.3
 
 - type: entity
   id: ClosetBombFilled

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
@@ -21,6 +21,8 @@
         amount: 2
       - id: RagItem
         amount: 2
+      - id: LunchboxServiceFilledRandom # Delta-V Lunchboxes!
+        prob: 0.3
 
 #- type: entity
 #  id: LockerFormalFilled
@@ -52,6 +54,8 @@
       - id: DrinkMilkCarton
         amount: 2
       - id: DrinkSoyMilkCarton
+      - id: LunchboxServiceFilledRandom # Delta-V Lunchboxes!
+        prob: 0.3
 
 - type: entity
   id: ClosetJanitorFilled
@@ -77,6 +81,8 @@
         amount: 2
       - id: Plunger
         amount: 2
+      - id: LunchboxServiceFilledRandom # Delta-V Lunchboxes!
+        prob: 0.3
 
 - type: entity
   id: ClosetLegalFilled
@@ -111,6 +117,8 @@
       - id: ClothingUniformOveralls
       - id: ClothingHeadHatTrucker
         prob: 0.1
+      - id: LunchboxServiceFilledRandom # Delta-V Lunchboxes!
+        prob: 0.3
 
 - type: entity
   id: LockerBotanistLoot