Skip to content

Commit

Permalink
Revert "Adds Lunchboxes to Lockers (Simple-Station#68)"
Browse files Browse the repository at this point in the history
This reverts commit 6c4c179.
  • Loading branch information
VMSolidus committed Apr 12, 2024
1 parent 3cd911f commit 13056bb
Show file tree
Hide file tree
Showing 7 changed files with 1 addition and 69 deletions.
4 changes: 0 additions & 4 deletions Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -56,5 +54,3 @@
prob: 0.3
- id: ClothingNeckSalvager # DeltaV - salvage cloak
prob: 0.2
- id: LunchboxLogisticsFilledRandom # DeltaV - Lunchboxes!
prob: 0.3
8 changes: 0 additions & 8 deletions Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,6 @@
- id: DoorRemoteFirefight
- id: RCD
- id: RCDAmmo
- id: LunchboxEngineeringFilledRandom # Delta-V Lunchboxes!
prob: 0.3

- type: entity
id: LockerAtmosphericsFilled
Expand All @@ -109,8 +107,6 @@
- id: DoorRemoteFirefight
- id: RCD
- id: RCDAmmo
- id: LunchboxEngineeringFilledRandom # Delta-V Lunchboxes!
prob: 0.3

- type: entity
id: LockerEngineerFilledHardsuit
Expand All @@ -125,8 +121,6 @@
- id: ClothingShoesBootsMag
- id: RCD
- id: RCDAmmo
- id: LunchboxEngineeringFilledRandom # Delta-V Lunchboxes!
prob: 0.3

- type: entity
id: LockerEngineerFilled
Expand All @@ -140,8 +134,6 @@
- id: trayScanner
- id: RCD
- id: RCDAmmo
- id: LunchboxEngineeringFilledRandom # Delta-V Lunchboxes!
prob: 0.3

- type: entity
id: ClosetRadiationSuitFilled
Expand Down
26 changes: 0 additions & 26 deletions Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
8 changes: 0 additions & 8 deletions Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,6 @@
- id: NitrousOxideTankFilled
prob: 0.3
- id: ClothingMaskSterile
- id: LunchboxMedicalFilledRandom # Delta-V Lunchboxes!
prob: 0.3

- type: entity
parent: LockerWallMedical
Expand Down Expand Up @@ -144,8 +142,6 @@
prob: 0.05
orGroup: Surgshrubs
- id: ClothingMaskSterile
- id: LunchboxMedicalFilledRandom # Delta-V Lunchboxes!
prob: 0.3

- type: entity
id: LockerChemistryFilled
Expand Down Expand Up @@ -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
Expand All @@ -210,5 +204,3 @@
- id: HandheldGPSBasic
- id: MedkitFilled
prob: 0.3
- id: LunchboxMedicalFilledRandom # Delta-V Lunchboxes!
prob: 0.3
2 changes: 0 additions & 2 deletions Resources/Prototypes/Catalog/Fills/Lockers/science.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,3 @@
- id: NodeScanner
- id: NetworkConfigurator
prob: 0.5
- id: LunchboxEpistemicsFilledRandom # Delta-V Lunchboxes!
prob: 0.3
14 changes: 1 addition & 13 deletions Resources/Prototypes/Catalog/Fills/Lockers/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -97,8 +93,6 @@
- id: ClothingEyesHudSecurity
- id: HoloprojectorSecurity
prob: 0.6
- id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes!
prob: 0.3

- type: entity
id: LockerBrigmedicFilled
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -168,8 +160,6 @@
prob: 0.3
- id: MedkitBurnFilled
prob: 0.7
- id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes!
prob: 0.3

# DeltaV - end addition

Expand All @@ -195,8 +185,6 @@
- id: RubberStampDetective
- id: HoloprojectorSecurity
- id: BoxEvidenceMarkers
- id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes!
prob: 0.3

- type: entity
id: ClosetBombFilled
Expand Down
8 changes: 0 additions & 8 deletions Resources/Prototypes/Catalog/Fills/Lockers/service.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
amount: 2
- id: RagItem
amount: 2
- id: LunchboxServiceFilledRandom # Delta-V Lunchboxes!
prob: 0.3

#- type: entity
# id: LockerFormalFilled
Expand Down Expand Up @@ -54,8 +52,6 @@
- id: DrinkMilkCarton
amount: 2
- id: DrinkSoyMilkCarton
- id: LunchboxServiceFilledRandom # Delta-V Lunchboxes!
prob: 0.3

- type: entity
id: ClosetJanitorFilled
Expand All @@ -81,8 +77,6 @@
amount: 2
- id: Plunger
amount: 2
- id: LunchboxServiceFilledRandom # Delta-V Lunchboxes!
prob: 0.3

- type: entity
id: ClosetLegalFilled
Expand Down Expand Up @@ -117,8 +111,6 @@
- id: ClothingUniformOveralls
- id: ClothingHeadHatTrucker
prob: 0.1
- id: LunchboxServiceFilledRandom # Delta-V Lunchboxes!
prob: 0.3

- type: entity
id: LockerBotanistLoot
Expand Down

0 comments on commit 13056bb

Please sign in to comment.