Skip to content

Commit

Permalink
Adds Lunchboxes to Lockers (Simple-Station#68)
Browse files Browse the repository at this point in the history
## Mirror of PR #989: [Adds Lunchboxes to
Lockers](DeltaV-Station/Delta-v#989) from <img
src="https://avatars.githubusercontent.com/u/131613340?v=4"
alt="DeltaV-Station" width="22"/>
[DeltaV-Station](https://github.com/DeltaV-Station)/[Delta-v](https://github.com/DeltaV-Station/Delta-v)

<aside>PR opened by <img
src="https://avatars.githubusercontent.com/u/142105406?v=4"
width="16"/><a href="https://github.com/DangerRevolution">
DangerRevolution</a> at 2024-03-21 17:52:42 UTC</aside>
<aside>PR merged by <img
src="https://avatars.githubusercontent.com/u/142105406?v=4"
width="16"/><a href="https://github.com/DangerRevolution">
DangerRevolution</a> at 2024-03-21 18:46:44 UTC</aside>
<sup>

`d07fa88e1dfba6107602c9cf0d58733ed6074274`

</sup>

---

PR changed 0 files with 0 additions and 0 deletions.

The PR had the following labels:
- Changes: YML


---

<details open="true"><summary><h1>Original Body</h1></summary>

> ## About the PR
> 
> Title.
> 
> **Changelog**
> :cl: DangerRevolution
> - add: Added lunchboxes to various staff lockers
> 


</details>

Co-authored-by: Danger Revolution! <[email protected]>
  • Loading branch information
SimpleStation14 and DangerRevolution committed Apr 8, 2024
1 parent 6653885 commit 6c4c179
Show file tree
Hide file tree
Showing 7 changed files with 69 additions and 1 deletion.
4 changes: 4 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -54,3 +56,5 @@
prob: 0.3
- id: ClothingNeckSalvager # DeltaV - salvage cloak
prob: 0.2
- id: LunchboxLogisticsFilledRandom # DeltaV - Lunchboxes!
prob: 0.3
8 changes: 8 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,8 @@
- id: DoorRemoteFirefight
- id: RCD
- id: RCDAmmo
- id: LunchboxEngineeringFilledRandom # Delta-V Lunchboxes!
prob: 0.3

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

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

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

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

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

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

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

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

# DeltaV - end addition

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

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

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

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

- type: entity
id: ClosetLegalFilled
Expand Down Expand Up @@ -111,6 +117,8 @@
- 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 6c4c179

Please sign in to comment.