From 13056bbefbcedff740b23b9229deb7cfb0895f42 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Fri, 12 Apr 2024 15:19:14 -0400 Subject: [PATCH] Revert "Adds Lunchboxes to Lockers (#68)" This reverts commit 6c4c1797396294213ea66715eb8de98dd55598ca. --- .../Catalog/Fills/Lockers/cargo.yml | 4 --- .../Catalog/Fills/Lockers/engineer.yml | 8 ------ .../Catalog/Fills/Lockers/heads.yml | 26 ------------------- .../Catalog/Fills/Lockers/medical.yml | 8 ------ .../Catalog/Fills/Lockers/science.yml | 2 -- .../Catalog/Fills/Lockers/security.yml | 14 +--------- .../Catalog/Fills/Lockers/service.yml | 8 ------ 7 files changed, 1 insertion(+), 69 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml index 4ca95adff84..e0b40689c9b 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml @@ -26,8 +26,6 @@ prob: 0.3 - id: ClothingNeckSalvager # DeltaV - salvage cloak prob: 0.2 - - id: LunchboxLogisticsFilledRandom # DeltaV - Lunchboxes! - prob: 0.3 - type: entity id: LockerSalvageSpecialistFilled @@ -56,5 +54,3 @@ prob: 0.3 - id: ClothingNeckSalvager # DeltaV - salvage cloak prob: 0.2 - - id: LunchboxLogisticsFilledRandom # DeltaV - Lunchboxes! - prob: 0.3 \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml index e4d995e52ee..384c27b0df5 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml @@ -90,8 +90,6 @@ - id: DoorRemoteFirefight - id: RCD - id: RCDAmmo - - id: LunchboxEngineeringFilledRandom # Delta-V Lunchboxes! - prob: 0.3 - type: entity id: LockerAtmosphericsFilled @@ -109,8 +107,6 @@ - id: DoorRemoteFirefight - id: RCD - id: RCDAmmo - - id: LunchboxEngineeringFilledRandom # Delta-V Lunchboxes! - prob: 0.3 - type: entity id: LockerEngineerFilledHardsuit @@ -125,8 +121,6 @@ - id: ClothingShoesBootsMag - id: RCD - id: RCDAmmo - - id: LunchboxEngineeringFilledRandom # Delta-V Lunchboxes! - prob: 0.3 - type: entity id: LockerEngineerFilled @@ -140,8 +134,6 @@ - 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 index 4cf1ac4f765..aecb2f77159 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -21,8 +21,6 @@ - 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 @@ -55,8 +53,6 @@ - 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 @@ -87,8 +83,6 @@ - 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 @@ -118,8 +112,6 @@ - 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 @@ -158,8 +150,6 @@ - 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 @@ -187,8 +177,6 @@ - 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 @@ -212,8 +200,6 @@ - id: ClothingShoesBootsWinterChiefEngineer #Delta V: Add departmental winter boots - id: RCD - id: RCDAmmo - - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! - prob: 0.3 - type: entity id: LockerChiefMedicalOfficerFilledHardsuit @@ -242,8 +228,6 @@ - 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 @@ -268,8 +252,6 @@ - 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 @@ -292,8 +274,6 @@ - id: ClothingShoesBootsWinterMystagogue #Delta V: Add departmental winter boots - id: ClothingHeadsetAltScience - id: EncryptionKeyBinary - - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! - prob: 0.3 - type: entity id: LockerResearchDirectorFilled @@ -315,8 +295,6 @@ - id: ClothingShoesBootsWinterMystagogue #Delta V: Add departmental winter boots - id: ClothingHeadsetAltScience - id: EncryptionKeyBinary - - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! - prob: 0.3 - type: entity id: LockerHeadOfSecurityFilledHardsuit @@ -348,8 +326,6 @@ - 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 @@ -378,8 +354,6 @@ - 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 index f2177916830..3dff55b9682 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml @@ -108,8 +108,6 @@ - id: NitrousOxideTankFilled prob: 0.3 - id: ClothingMaskSterile - - id: LunchboxMedicalFilledRandom # Delta-V Lunchboxes! - prob: 0.3 - type: entity parent: LockerWallMedical @@ -144,8 +142,6 @@ prob: 0.05 orGroup: Surgshrubs - id: ClothingMaskSterile - - id: LunchboxMedicalFilledRandom # Delta-V Lunchboxes! - prob: 0.3 - type: entity id: LockerChemistryFilled @@ -186,8 +182,6 @@ - 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 @@ -210,5 +204,3 @@ - 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 index 215ae02a76f..4f09061f9a6 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/science.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/science.yml @@ -13,5 +13,3 @@ - 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 index 4ff2deadf24..89376ed4ccf 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -24,9 +24,7 @@ - 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 @@ -52,8 +50,6 @@ - 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 @@ -97,8 +93,6 @@ - id: ClothingEyesHudSecurity - id: HoloprojectorSecurity prob: 0.6 - - id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes! - prob: 0.3 - type: entity id: LockerBrigmedicFilled @@ -135,8 +129,6 @@ 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 @@ -168,8 +160,6 @@ prob: 0.3 - id: MedkitBurnFilled prob: 0.7 - - id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes! - prob: 0.3 # DeltaV - end addition @@ -195,8 +185,6 @@ - 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 index 110d62f62aa..b755c6c924a 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml @@ -21,8 +21,6 @@ amount: 2 - id: RagItem amount: 2 - - id: LunchboxServiceFilledRandom # Delta-V Lunchboxes! - prob: 0.3 #- type: entity # id: LockerFormalFilled @@ -54,8 +52,6 @@ - id: DrinkMilkCarton amount: 2 - id: DrinkSoyMilkCarton - - id: LunchboxServiceFilledRandom # Delta-V Lunchboxes! - prob: 0.3 - type: entity id: ClosetJanitorFilled @@ -81,8 +77,6 @@ amount: 2 - id: Plunger amount: 2 - - id: LunchboxServiceFilledRandom # Delta-V Lunchboxes! - prob: 0.3 - type: entity id: ClosetLegalFilled @@ -117,8 +111,6 @@ - id: ClothingUniformOveralls - id: ClothingHeadHatTrucker prob: 0.1 - - id: LunchboxServiceFilledRandom # Delta-V Lunchboxes! - prob: 0.3 - type: entity id: LockerBotanistLoot