Survival Box Loadouts, Nitrogen Emergency tanks (#29131)

* Nitrogen survival boxes * Zero-setup workaround * clown box * cleanup and universal tanks * cleanup * more cleanup * hide loadoutgroups * remaining survival boxes * space ninja * Revert "space ninja" This reverts commit a650f41. * weh * weh * undo appearance change of syndicate survival boxes * indentation fix and missing label
space-wizards · Jun 20, 2024 · d15eafe · d15eafe
1 parent 7994175
commit d15eafe
Show file tree

Hide file tree

Showing 47 changed files with 560 additions and 152 deletions.
diff --git a/Resources/Locale/en-US/preferences/loadout-groups.ftl b/Resources/Locale/en-US/preferences/loadout-groups.ftl
@@ -3,6 +3,12 @@ loadout-group-trinkets = Trinkets
 loadout-group-glasses = Glasses
 loadout-group-backpack = Backpack
 loadout-group-instruments = Instruments
+loadout-group-survival-basic = Survival Box
+loadout-group-survival-extended = Extended Survival Box
+loadout-group-survival-clown = Clown Survival Box
+loadout-group-survival-medical = Medical Survival Box
+loadout-group-survival-security = Security Survival Box
+loadout-group-survival-syndicate = Github is forcing me to write text that is literally twice-impossible for the player to ever see, send help
 
 # Command
 loadout-group-captain-head = Captain head

diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
@@ -1,122 +1,225 @@
 - type: entity
-  name: survival box
   parent: BoxCardboard
   id: BoxSurvival
+  name: survival box
   description: It's a box with basic internals inside.
+  suffix: Standard
   components:
   - type: StorageFill
     contents:
-      - id: ClothingMaskBreath
-      - id: EmergencyOxygenTankFilled
-      - id: EmergencyMedipen
-      - id: Flare
-      - id: FoodSnackNutribrick
-      - id: DrinkWaterBottleFull
+    - id: ClothingMaskBreath
+    - id: EmergencyOxygenTankFilled
+    - id: EmergencyMedipen
+    - id: Flare
+    - id: FoodSnackNutribrick
+    - id: DrinkWaterBottleFull
   - type: Sprite
     layers:
-      - state: internals
-      - state: emergencytank
+    - state: internals
+    - state: emergencytank
+
+- type: entity
+  parent: BoxSurvival
+  id: BoxSurvivalNitrogen
+  suffix: Standard N2
+  components:
+  - type: StorageFill
+    contents:
+    - id: ClothingMaskBreath
+    - id: EmergencyNitrogenTankFilled
+    - id: EmergencyMedipen
+    - id: Flare
+    - id: FoodSnackNutribrick
+    - id: DrinkWaterBottleFull
+  # Intentionally wrong picture on the box. NT did not care enough to change it.
+  - type: Label
+    currentLabel: reagent-name-nitrogen
 
 - type: entity
-  name: extended-capacity survival box
   parent: BoxCardboard
   id: BoxSurvivalEngineering
+  name: extended-capacity survival box
   description: It's a box with basic internals inside. This one is labelled to contain an extended-capacity tank.
-  suffix: Engineering
+  suffix: Extended
   components:
   - type: StorageFill
     contents:
-      - id: ClothingMaskBreath
-      - id: ExtendedEmergencyOxygenTankFilled
-      - id: EmergencyMedipen
-      - id: Flare
-      - id: FoodSnackNutribrick
-      - id: DrinkWaterBottleFull
+    - id: ClothingMaskBreath
+    - id: ExtendedEmergencyOxygenTankFilled
+    - id: EmergencyMedipen
+    - id: Flare
+    - id: FoodSnackNutribrick
+    - id: DrinkWaterBottleFull
   - type: Sprite
     layers:
-      - state: internals
-      - state: extendedtank
+    - state: internals
+    - state: extendedtank
 
 - type: entity
-  name: survival box
+  parent: BoxSurvivalEngineering
+  id: BoxSurvivalEngineeringNitrogen
+  suffix: Extended N2
+  components:
+  - type: StorageFill
+    contents:
+    - id: ClothingMaskBreath
+    - id: ExtendedEmergencyNitrogenTankFilled
+    - id: EmergencyMedipen
+    - id: Flare
+    - id: FoodSnackNutribrick
+    - id: DrinkWaterBottleFull
+  # Intentionally wrong picture on the box. NT did not care enough to change it.
+  - type: Label
+    currentLabel: reagent-name-nitrogen
+
+- type: entity
+
   parent: BoxCardboard
   id: BoxSurvivalSecurity
+  name: survival box
   description: It's a box with basic internals inside.
   suffix: Security
   components:
   - type: StorageFill
     contents:
-      - id: ClothingMaskGasSecurity
-      - id: EmergencyOxygenTankFilled
-      - id: EmergencyMedipen
-      - id: Flare
-      - id: FoodSnackNutribrick
-      - id: DrinkWaterBottleFull
+    - id: ClothingMaskGasSecurity
+    - id: EmergencyOxygenTankFilled
+    - id: EmergencyMedipen
+    - id: Flare
+    - id: FoodSnackNutribrick
+    - id: DrinkWaterBottleFull
   - type: Sprite
     layers:
-      - state: internals
-      - state: emergencytank
+    - state: internals
+    - state: emergencytank
 
 - type: entity
-  name: survival box
+  parent: BoxSurvivalSecurity
+  id: BoxSurvivalSecurityNitrogen
+  suffix: Security N2
+  components:
+  - type: StorageFill
+    contents:
+    - id: ClothingMaskGasSecurity
+    - id: EmergencyNitrogenTankFilled
+    - id: EmergencyMedipen
+    - id: Flare
+    - id: FoodSnackNutribrick
+    - id: DrinkWaterBottleFull
+  # Intentionally wrong picture on the box. NT did not care enough to change it.
+  - type: Label
+    currentLabel: reagent-name-nitrogen
+
+- type: entity
+
   parent: BoxCardboard
   id: BoxSurvivalMedical
+  name: survival box
   description: It's a box with basic internals inside.
   suffix: Medical
   components:
   - type: StorageFill
     contents:
-      - id: ClothingMaskBreathMedical
-      - id: EmergencyOxygenTankFilled
-      - id: EmergencyMedipen
-      - id: Flare
-      - id: FoodSnackNutribrick
-      - id: DrinkWaterBottleFull
+    - id: ClothingMaskBreathMedical
+    - id: EmergencyOxygenTankFilled
+    - id: EmergencyMedipen
+    - id: Flare
+    - id: FoodSnackNutribrick
+    - id: DrinkWaterBottleFull
   - type: Sprite
     layers:
-      - state: internals
-      - state: emergencytank
+    - state: internals
+    - state: emergencytank
+
+- type: entity
+  parent: BoxSurvivalMedical
+  id: BoxSurvivalMedicalNitrogen
+  suffix: Medical N2
+  components:
+  - type: StorageFill
+    contents:
+    - id: ClothingMaskBreathMedical
+    - id: EmergencyNitrogenTankFilled
+    - id: EmergencyMedipen
+    - id: Flare
+    - id: FoodSnackNutribrick
+    - id: DrinkWaterBottleFull
+  # Intentionally wrong picture on the box. NT did not care enough to change it.
+  - type: Label
+    currentLabel: reagent-name-nitrogen
 
 - type: entity
-  name: box of hugs
   parent: BoxCardboard
   id: BoxHug
+  name: box of hugs
   description: A special box for sensitive people.
   suffix: Emergency
   components:
   - type: Sprite
     layers:
-      - state: box_hug
-      - state: heart
+    - state: box_hug
+    - state: heart
   - type: Item
     heldPrefix: hug
   - type: StorageFill
     contents:
-      - id: ClothingMaskBreath
-      - id: EmergencyFunnyOxygenTankFilled
-      - id: EmergencyMedipen
-      - id: Flare
-      - id: FoodSnackNutribrick
-      - id: DrinkWaterBottleFull
+    - id: ClothingMaskBreath
+    - id: EmergencyFunnyOxygenTankFilled
+    - id: EmergencyMedipen
+    - id: Flare
+    - id: FoodSnackNutribrick
+    - id: DrinkWaterBottleFull
   - type: Tag
     tags:
-      - BoxHug
+    - BoxHug
+
+- type: entity
+  parent: BoxHug
+  id: BoxHugNitrogen
+  suffix: Emergency N2
+  components:
+  - type: StorageFill
+    contents:
+    - id: ClothingMaskBreath
+    - id: EmergencyNitrogenTankFilled
+    - id: EmergencyMedipen
+    - id: Flare
+    - id: FoodSnackNutribrick
+    - id: DrinkWaterBottleFull
+  - type: Label
+    currentLabel: reagent-name-nitrogen
 
 - type: entity
-  name: extended-capacity survival box
   parent: BoxCardboard
   id: BoxSurvivalSyndicate
+  name: extended-capacity survival box
   description: It's a box with basic internals inside. This one is labelled to contain an extended-capacity tank.
   suffix: Syndicate
   components:
   - type: StorageFill
     contents:
-      - id: ClothingMaskGasSyndicate
-      - id: ExtendedEmergencyOxygenTankFilled
-      - id: EmergencyMedipen
-      - id: Flare
-      - id: FoodSnackNutribrick
+    - id: ClothingMaskGasSyndicate
+    - id: ExtendedEmergencyOxygenTankFilled
+    - id: EmergencyMedipen
+    - id: Flare
+    - id: FoodSnackNutribrick
   - type: Sprite
     layers:
-      - state: internals
-      - state: extendedtank
+    - state: internals
+    - state: extendedtank
+
+- type: entity
+  parent: BoxSurvivalSyndicate
+  id: BoxSurvivalSyndicateNitrogen
+  suffix: Syndicate N2
+  components:
+  - type: StorageFill
+    contents:
+    - id: ClothingMaskGasSyndicate
+    - id: ExtendedEmergencyNitrogenTankFilled
+    - id: EmergencyMedipen
+    - id: Flare
+    - id: FoodSnackNutribrick
+    # Intentionally wrong picture on the box to mimic the NT one
+  - type: Label
+    currentLabel: reagent-name-nitrogen