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 a650f417f83f5861e0001b25418e4a361927c6c6.

* weh

* weh

* undo appearance change of syndicate survival boxes

* indentation fix and missing label

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

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

Resources/Prototypes/Loadouts/Miscellaneous/survival.yml

@@ -0,0 +1,182 @@
+# Species
+- type: loadoutEffectGroup
+  id: NitrogenBreather
+  effects:
+  - !type:SpeciesLoadoutEffect
+    species:
+    - SlimePerson
+    - Vox
+
+- type: loadoutEffectGroup
+  id: OxygenBreather
+  effects:
+  - !type:SpeciesLoadoutEffect
+    species:
+    - Arachnid
+    - Diona
+    - Dwarf
+    - Human
+    - Moth
+    - Reptilian
+
+# Basic
+- type: loadout
+  id: EmergencyOxygen
+  equipment: EmergencyOxygen
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: OxygenBreather
+
+- type: startingGear
+  id: EmergencyOxygen
+  storage:
+    back:
+    - BoxSurvival
+
+- type: loadout
+  id: EmergencyNitrogen
+  equipment: EmergencyNitrogen
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: NitrogenBreather
+
+- type: startingGear
+  id: EmergencyNitrogen
+  storage:
+    back:
+    - BoxSurvivalNitrogen
+
+# Clown
+- type: loadout
+  id: EmergencyOxygenClown
+  equipment: EmergencyOxygenClown
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: OxygenBreather
+
+- type: startingGear
+  id: EmergencyOxygenClown
+  storage:
+    back:
+    - BoxHug
+
+- type: loadout
+  id: EmergencyNitrogenClown
+  equipment: EmergencyNitrogenClown
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: NitrogenBreather
+
+- type: startingGear
+  id: EmergencyNitrogenClown
+  storage:
+    back:
+    - BoxHugNitrogen
+
+# Engineering / Extended
+- type: loadout
+  id: EmergencyOxygenExtended
+  equipment: EmergencyOxygenExtended
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: OxygenBreather
+
+- type: startingGear
+  id: EmergencyOxygenExtended
+  storage:
+    back:
+    - BoxSurvivalEngineering
+
+- type: loadout
+  id: EmergencyNitrogenExtended
+  equipment: EmergencyNitrogenExtended
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: NitrogenBreather
+
+- type: startingGear
+  id: EmergencyNitrogenExtended
+  storage:
+    back:
+    - BoxSurvivalEngineeringNitrogen
+
+# Medical
+- type: loadout
+  id: EmergencyOxygenMedical
+  equipment: EmergencyOxygenMedical
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: OxygenBreather
+
+- type: startingGear
+  id: EmergencyOxygenMedical
+  storage:
+    back:
+    - BoxSurvivalMedical
+
+- type: loadout
+  id: EmergencyNitrogenMedical
+  equipment: EmergencyNitrogenMedical
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: NitrogenBreather
+
+- type: startingGear
+  id: EmergencyNitrogenMedical
+  storage:
+    back:
+    - BoxSurvivalMedicalNitrogen
+
+# Security
+- type: loadout
+  id: EmergencyOxygenSecurity
+  equipment: EmergencyOxygenSecurity
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: OxygenBreather
+
+- type: startingGear
+  id: EmergencyOxygenSecurity
+  storage:
+    back:
+    - BoxSurvivalSecurity
+
+- type: loadout
+  id: EmergencyNitrogenSecurity
+  equipment: EmergencyNitrogenSecurity
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: NitrogenBreather
+
+- type: startingGear
+  id: EmergencyNitrogenSecurity
+  storage:
+    back:
+    - BoxSurvivalSecurityNitrogen
+
+# Syndicate
+- type: loadout
+  id: EmergencyOxygenSyndicate
+  equipment: EmergencyOxygenSyndicate
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: OxygenBreather
+
+- type: startingGear
+  id: EmergencyOxygenSyndicate
+  storage:
+    back:
+    - BoxSurvivalSyndicate
+
+- type: loadout
+  id: EmergencyNitrogenSyndicate
+  equipment: EmergencyNitrogenSyndicate
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: NitrogenBreather
+
+- type: startingGear
+  id: EmergencyNitrogenSyndicate
+  storage:
+    back:
+    - BoxSurvivalSyndicateNitrogen

Resources/Prototypes/Loadouts/loadout_groups.yml

@@ -35,6 +35,16 @@
   - GlassesJamjar
   - GlassesJensen
 
+- type: loadoutGroup
+  id: Survival
+  name: loadout-group-survival-basic
+  minLimit: 2
+  maxLimit: 2
+  hidden: true
+  loadouts:
+  - EmergencyNitrogen
+  - EmergencyOxygen
+
 # Command
 - type: loadoutGroup
   id: CaptainHead
@@ -390,6 +400,16 @@
   - ClownShoes
   - JesterShoes
 
+- type: loadoutGroup
+  id: SurvivalClown
+  name: loadout-group-survival-clown
+  minLimit: 2
+  maxLimit: 2
+  hidden: true
+  loadouts:
+  - EmergencyNitrogenClown
+  - EmergencyOxygenClown
+
 - type: loadoutGroup
   id: MimeHead
   name: loadout-group-mime-head
@@ -703,6 +723,16 @@
   - WhiteShoes
   - EngineeringWinterBoots
 
+- type: loadoutGroup
+  id: SurvivalExtended
+  name: loadout-group-survival-extended
+  minLimit: 2
+  maxLimit: 2
+  hidden: true
+  loadouts:
+  - EmergencyNitrogenExtended
+  - EmergencyOxygenExtended
+
 # Science
 - type: loadoutGroup
   id: ResearchDirectorHead
@@ -973,6 +1003,16 @@
   - RedJumpsuit
   - RedJumpskirt
 
+- type: loadoutGroup
+  id: SurvivalSecurity
+  name: loadout-group-survival-security
+  minLimit: 2
+  maxLimit: 2
+  hidden: true
+  loadouts:
+  - EmergencyNitrogenSecurity
+  - EmergencyOxygenSecurity
+
 # Medical
 - type: loadoutGroup
   id: ChiefMedicalOfficerHead
@@ -1145,6 +1185,16 @@
   - BlueShoes
   - MedicalWinterBoots
 
+- type: loadoutGroup
+  id: SurvivalMedical
+  name: loadout-group-survival-medical
+  minLimit: 2
+  maxLimit: 2
+  hidden: true
+  loadouts:
+  - EmergencyNitrogenMedical
+  - EmergencyOxygenMedical
+
 # Wildcards
 - type: loadoutGroup
   id: ReporterJumpsuit
@@ -1168,3 +1218,14 @@
   - BlueBoxingGloves
   - GreenBoxingGloves
   - YellowBoxingGloves
+
+# Other
+- type: loadoutGroup
+  id: SurvivalSyndicate
+  name: loadout-group-survival-syndicate
+  minLimit: 2
+  maxLimit: 2
+  hidden: true
+  loadouts:
+  - EmergencyNitrogenSyndicate
+  - EmergencyOxygenSyndicate

Resources/Prototypes/Loadouts/role_loadouts.yml

@@ -8,6 +8,7 @@
   - CaptainBackpack
   - CaptainOuterClothing
   - Trinkets
+  - Survival
 
 - type: roleLoadout
   id: JobHeadOfPersonnel
@@ -19,6 +20,7 @@
   - HoPOuterClothing
   - Glasses
   - Trinkets
+  - Survival
 
 # Civilian
 - type: roleLoadout
@@ -32,6 +34,7 @@
   - PassengerShoes
   - Glasses
   - Trinkets
+  - Survival
 
 - type: roleLoadout
   id: JobBartender
@@ -42,6 +45,7 @@
   - BartenderOuterClothing
   - Glasses
   - Trinkets
+  - Survival
 
 - type: roleLoadout
   id: JobServiceWorker
@@ -50,6 +54,7 @@
   - CommonBackpack
   - Glasses
   - Trinkets
+  - Survival
 
 - type: roleLoadout
   id: JobChef
@@ -61,6 +66,7 @@
   - ChefOuterClothing
   - Glasses
   - Trinkets
+  - Survival
 
 - type: roleLoadout
   id: JobLibrarian
@@ -69,6 +75,7 @@
   - CommonBackpack
   - Glasses
   - Trinkets
+  - Survival
 
 - type: roleLoadout
   id: JobLawyer
@@ -78,6 +85,7 @@
   - CommonBackpack
   - Glasses
   - Trinkets
+  - Survival
 
 - type: roleLoadout
   id: JobChaplain
@@ -90,6 +98,7 @@
   - ChaplainOuterClothing
   - Glasses
   - Trinkets
+  - Survival
 
 - type: roleLoadout
   id: JobJanitor
@@ -101,6 +110,7 @@
   - JanitorOuterClothing
   - Glasses
   - Trinkets
+  - Survival
 
 - type: roleLoadout
   id: JobBotanist
@@ -111,6 +121,7 @@
   - BotanistOuterClothing
   - Glasses
   - Trinkets
+  - Survival
 
 - type: roleLoadout
   id: JobClown
@@ -122,6 +133,7 @@
   - ClownShoes
   - Glasses
   - Trinkets
+  - SurvivalClown
 
 - type: roleLoadout
   id: JobMime
@@ -133,6 +145,7 @@
   - MimeOuterClothing
   - Glasses
   - Trinkets
+  - Survival
 
 - type: roleLoadout
   id: JobMusician
@@ -143,6 +156,7 @@
   - Glasses
   - Trinkets
   - Instruments
+  - Survival
 
 # Cargo
 - type: roleLoadout
@@ -156,6 +170,7 @@
   - QuartermasterShoes
   - Glasses
   - Trinkets
+  - Survival
 
 - type: roleLoadout
   id: JobCargoTechnician
@@ -167,6 +182,7 @@
   - CargoTechnicianShoes
   - Glasses
   - Trinkets
+  - Survival
 
 - type: roleLoadout
   id: JobSalvageSpecialist
@@ -176,6 +192,7 @@
   - SalvageSpecialistShoes
   - Glasses
   - Trinkets
+  - Survival
 
 # Engineering
 - type: roleLoadout
@@ -188,6 +205,7 @@
   - ChiefEngineerOuterClothing
   - ChiefEngineerShoes
   - Trinkets
+  - SurvivalExtended
 
 - type: roleLoadout
   id: JobTechnicalAssistant
@@ -195,6 +213,7 @@
   - TechnicalAssistantJumpsuit
   - StationEngineerBackpack
   - Trinkets
+  - SurvivalExtended
 
 - type: roleLoadout
   id: JobStationEngineer
@@ -206,6 +225,7 @@
   - StationEngineerShoes
   - StationEngineerID
   - Trinkets
+  - SurvivalExtended
 
 - type: roleLoadout
   id: JobAtmosphericTechnician
@@ -215,6 +235,7 @@
   - AtmosphericTechnicianOuterClothing
   - AtmosphericTechnicianShoes
   - Trinkets
+  - SurvivalExtended
 
 # Science
 - type: roleLoadout
@@ -229,6 +250,7 @@
   - ResearchDirectorShoes
   - Glasses
   - Trinkets
+  - Survival
 
 - type: roleLoadout
   id: JobScientist
@@ -243,6 +265,7 @@
   - ScientistPDA
   - Glasses
   - Trinkets
+  - Survival
 
 - type: roleLoadout
   id: JobResearchAssistant
@@ -251,6 +274,7 @@
   - ScientistBackpack
   - Glasses
   - Trinkets
+  - Survival
 
 # Security
 - type: roleLoadout
@@ -264,6 +288,7 @@
   - HeadofSecurityOuterClothing
   - SecurityShoes
   - Trinkets
+  - SurvivalSecurity
 
 - type: roleLoadout
   id: JobWarden
@@ -275,6 +300,7 @@
   - WardenOuterClothing
   - SecurityShoes
   - Trinkets
+  - SurvivalSecurity
 
 - type: roleLoadout
   id: JobSecurityOfficer
@@ -287,6 +313,7 @@
   - SecurityPDA
   - SecurityBelt
   - Trinkets
+  - SurvivalSecurity
 
 - type: roleLoadout
   id: JobDetective
@@ -298,6 +325,7 @@
   - DetectiveOuterClothing
   - SecurityShoes
   - Trinkets
+  - SurvivalSecurity
 
 - type: roleLoadout
   id: JobSecurityCadet
@@ -305,6 +333,7 @@
   - SecurityCadetJumpsuit
   - SecurityBackpack
   - Trinkets
+  - SurvivalSecurity
 
 # Medical
 - type: roleLoadout
@@ -320,6 +349,7 @@
   - ChiefMedicalOfficerShoes
   - Glasses
   - Trinkets
+  - SurvivalMedical
 
 - type: roleLoadout
   id: JobMedicalDoctor
@@ -334,6 +364,7 @@
   - MedicalDoctorPDA
   - Glasses
   - Trinkets
+  - SurvivalMedical
 
 - type: roleLoadout
   id: JobMedicalIntern
@@ -342,6 +373,7 @@
   - MedicalBackpack
   - Glasses
   - Trinkets
+  - SurvivalMedical
 
 - type: roleLoadout
   id: JobChemist
@@ -353,6 +385,7 @@
   - ChemistOuterClothing
   - MedicalShoes
   - Trinkets
+  - SurvivalMedical
 
 - type: roleLoadout
   id: JobParamedic
@@ -366,6 +399,7 @@
   - ParamedicShoes
   - Glasses
   - Trinkets
+  - SurvivalMedical
 
 # Wildcards
 - type: roleLoadout
@@ -374,6 +408,7 @@
   - CommonBackpack
   - Glasses
   - Trinkets
+  - Survival
 
 - type: roleLoadout
   id: JobReporter
@@ -382,6 +417,7 @@
   - CommonBackpack
   - Glasses
   - Trinkets
+  - Survival
 
 - type: roleLoadout
   id: JobPsychologist
@@ -389,6 +425,7 @@
   - MedicalBackpack
   - Glasses
   - Trinkets
+  - Survival
 
 - type: roleLoadout
   id: JobBoxer
@@ -398,3 +435,36 @@
   - CommonBackpack
   - Glasses
   - Trinkets
+  - Survival
+
+# These loadouts will be used without player configuration, thus they must be designed to work without manual selection
+
+- type: roleLoadout
+  id: LoadoutSurvivalStandard
+  groups:
+  - Survival
+
+- type: roleLoadout
+  id: LoadoutSurvivalClown
+  groups:
+  - SurvivalClown
+
+- type: roleLoadout
+  id: LoadoutSurvivalExtended
+  groups:
+  - SurvivalExtended
+
+- type: roleLoadout
+  id: LoadoutSurvivalMedical
+  groups:
+  - SurvivalMedical
+
+- type: roleLoadout
+  id: LoadoutSurvivalSecurity
+  groups:
+  - SurvivalSecurity
+
+- type: roleLoadout
+  id: LoadoutSurvivalSyndicate
+  groups:
+  - SurvivalSyndicate

Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml

@@ -18,6 +18,6 @@
     id: CargoPDA
     ears: ClothingHeadsetCargo
     pocket1: AppraisalTool
-  storage:
-    back:
-    - BoxSurvival
+  #storage:
+    #back:
+    #- Stuff

Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml

@@ -44,5 +44,4 @@
     pocket1: AppraisalTool
   storage:
     back:
-    - BoxSurvival
-    - Flash
+    - Flash

Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml

@@ -24,6 +24,6 @@
     jumpsuit: ClothingUniformJumpsuitSalvageSpecialist
     id: SalvagePDA
     ears: ClothingHeadsetCargo
-  storage:
-    back:
-    - BoxSurvival
+  #storage:
+    #back:
+    #- Stuff

Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml

@@ -14,6 +14,6 @@
   equipment:
     id: PassengerPDA
     ears: ClothingHeadsetGrey
-  storage:
-    back:
-    - BoxSurvival
+  #storage:
+    #back:
+    #- Stuff

Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml

@@ -24,6 +24,6 @@
     shoes: ClothingShoesColorBlack
     id: BartenderPDA
     ears: ClothingHeadsetService
-  storage:
-    back:
-    - BoxSurvival
+  #storage:
+    #back:
+    #- Stuff

Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml

@@ -21,6 +21,6 @@
     id: BotanistPDA
     ears: ClothingHeadsetService
     belt: ClothingBeltPlantFilled
-  storage:
-    back:
-    - BoxSurvival
+  #storage:
+    #back:
+    #- Stuff

Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml

@@ -22,6 +22,5 @@
     ears: ClothingHeadsetService
   storage:
     back:
-    - BoxSurvival
     - Bible
     - RubberStampChaplain

Resources/Prototypes/Roles/Jobs/Civilian/chef.yml

@@ -25,6 +25,6 @@
     id: ChefPDA
     ears: ClothingHeadsetService
     belt: ClothingBeltChefFilled
-  storage:
-    back:
-    - BoxSurvival
+  #storage:
+    #back:
+    #- Stuff

Resources/Prototypes/Roles/Jobs/Civilian/clown.yml

@@ -35,6 +35,5 @@
     ears: ClothingHeadsetService
   storage:
     back:
-    - BoxHug
     - RubberStampClown
-    - CrayonRainbow
+    - CrayonRainbow

Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml

@@ -22,9 +22,9 @@
     id: JanitorPDA
     ears: ClothingHeadsetService
     belt: ClothingBeltJanitorFilled
-  storage:
-    back:
-    - BoxSurvival
+  #storage:
+    #back:
+    #- Stuff
 
 - type: startingGear
   id: JanitorMaidGear

Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml

@@ -26,5 +26,4 @@
     - BriefcaseBrownFilled
   storage:
     back:
-    - BoxSurvival
     - RubberStampLawyer

Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml

@@ -20,5 +20,4 @@
     pocket2: HandLabeler # for making named bestsellers
   storage:
     back:
-    - BoxSurvival
     - BookRandom

Resources/Prototypes/Roles/Jobs/Civilian/mime.yml

@@ -30,7 +30,6 @@
     ears: ClothingHeadsetService
   storage:
     back:
-    - BoxSurvival
     - RubberStampMime
 
 - type: entity

Resources/Prototypes/Roles/Jobs/Civilian/musician.yml

@@ -21,6 +21,6 @@
     shoes: ClothingShoesBootsLaceup
     id: MusicianPDA
     ears: ClothingHeadsetService
-  storage:
-    back:
-    - BoxSurvival
+  #storage:
+    #back:
+    #- Stuff

Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml

@@ -21,6 +21,6 @@
     shoes: ClothingShoesColorBlack
     id: ServiceWorkerPDA
     ears: ClothingHeadsetService
-  storage:
-    back:
-    - BoxSurvival
+  #storage:
+    #back:
+    #- Stuff

Resources/Prototypes/Roles/Jobs/Command/captain.yml

@@ -42,6 +42,5 @@
     ears: ClothingHeadsetAltCommand
   storage:
     back:
-    - BoxSurvival
     - Flash
-    # - StationCharter
+    # - StationCharter

Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml

@@ -66,5 +66,4 @@
     belt: BoxFolderClipboard
   storage:
     back:
-    - BoxSurvival
-    - Flash
+    - Flash

Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml

@@ -23,6 +23,6 @@
     id: AtmosPDA
     belt: ClothingBeltUtilityEngineering
     ears: ClothingHeadsetEngineering
-  storage:
-    back:
-    - BoxSurvivalEngineering
+  #storage:
+    #back:
+    #- Stuff

Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml

@@ -46,5 +46,4 @@
     belt: ClothingBeltUtilityEngineering
   storage:
     back:
-    - BoxSurvivalEngineering
-    - Flash
+    - Flash

Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml

@@ -23,6 +23,6 @@
     eyes: ClothingEyesGlassesMeson
     belt: ClothingBeltUtilityEngineering
     ears: ClothingHeadsetEngineering
-  storage:
-    back:
-    - BoxSurvivalEngineering
+  #storage:
+    #back:
+    #- Stuff

Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml

@@ -27,6 +27,6 @@
     belt: ClothingBeltUtilityEngineering
     ears: ClothingHeadsetEngineering
     pocket2: BookEngineersHandbook
-  storage:
-    back:
-    - BoxSurvivalEngineering
+  #storage:
+    #back:
+    #- Stuff

Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml

@@ -380,7 +380,7 @@
     pocket1: Flare
   storage:
     back:
-    - BoxSurvivalMedical
+    - BoxSurvivalMedical # Is this actually supposed to be Medical? All other ERT has Extended
     - Hypospray
     - MedkitAdvancedFilled
     - CrowbarRed
@@ -405,7 +405,7 @@
     pocket1: Flare
   storage:
     back:
-    - BoxSurvivalMedical
+    - BoxSurvivalMedical # Is this actually supposed to be Medical? All other ERT has Extended
     - Hypospray
     - MedkitAdvancedFilled
     - CrowbarRed
@@ -474,4 +474,4 @@
     - BoxLightMixed
     - Soap
     - CrowbarRed
-    - AdvMopItem
+    - AdvMopItem

Resources/Prototypes/Roles/Jobs/Fun/wizard_startinggear.yml

@@ -32,4 +32,4 @@
   id: WizardHardsuitGear
   parent: WizardVioletGear
   equipment:
-    outerClothing: ClothingOuterHardsuitWizard
+    outerClothing: ClothingOuterHardsuitWizard

Resources/Prototypes/Roles/Jobs/Medical/chemist.yml

@@ -23,6 +23,6 @@
     belt: ChemBag
     pocket1: HandLabeler
     eyes: ClothingEyesGlassesChemical
-  storage:
-    back:
-    - BoxSurvivalMedical
+  #storage:
+    #back:
+    #- Stuff

Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml

@@ -46,5 +46,4 @@
     belt: ClothingBeltMedicalFilled
   storage:
     back:
-    - BoxSurvivalMedical
     - Flash

Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml

@@ -21,6 +21,6 @@
   equipment:
     ears: ClothingHeadsetMedical
     belt: ClothingBeltMedicalFilled
-  storage:
-    back:
-    - BoxSurvivalMedical
+  #storage:
+    #back:
+    #- Stuff

Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml

@@ -24,6 +24,6 @@
     ears: ClothingHeadsetMedical
     belt: ClothingBeltMedicalFilled
     pocket2: BookMedicalReferenceBook
-  storage:
-    back:
-    - BoxSurvivalMedical
+  #storage:
+    #back:
+    #- Stuff

Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml

@@ -26,5 +26,4 @@
     belt: ClothingBeltMedicalEMTFilled
   storage:
     back:
-    - BoxSurvivalMedical
-    - EmergencyRollerBedSpawnFolded
+    - EmergencyRollerBedSpawnFolded

Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml

@@ -23,6 +23,6 @@
     id: ResearchAssistantPDA
     ears: ClothingHeadsetScience
     pocket2: BookScientistsGuidebook
-  storage:
-    back:
-    - BoxSurvival
+  #storage:
+    #back:
+    #- Stuff

Resources/Prototypes/Roles/Jobs/Science/research_director.yml

@@ -36,5 +36,4 @@
     ears: ClothingHeadsetRD
   storage:
     back:
-    - BoxSurvival
-    - Flash
+    - Flash

Resources/Prototypes/Roles/Jobs/Science/scientist.yml

@@ -18,6 +18,6 @@
   id: ScientistGear
   equipment:
     ears: ClothingHeadsetScience
-  storage:
-    back:
-    - BoxSurvival
+  #storage:
+    #back:
+    #- Stuff

Resources/Prototypes/Roles/Jobs/Security/detective.yml

@@ -30,7 +30,6 @@
     belt: ClothingBeltHolsterFilled
   storage:
     back:
-    - BoxSurvivalSecurity
     - Flash
     - ForensicPad
-    - ForensicScanner
+    - ForensicScanner

Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml

@@ -49,6 +49,5 @@
     pocket1: WeaponPistolMk58
   storage:
     back:
-    - BoxSurvivalSecurity
     - Flash
-    - MagazinePistol
+    - MagazinePistol

Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml

@@ -37,6 +37,5 @@
     pocket2: BookSecurity
   storage:
     back:
-    - BoxSurvivalSecurity
     - Flash
-    - MagazinePistol
+    - MagazinePistol

Resources/Prototypes/Roles/Jobs/Security/security_officer.yml

@@ -30,6 +30,5 @@
     pocket1: WeaponPistolMk58
   storage:
     back:
-    - BoxSurvivalSecurity
     - Flash
-    - MagazinePistol
+    - MagazinePistol

Resources/Prototypes/Roles/Jobs/Security/warden.yml

@@ -33,6 +33,5 @@
     pocket1: WeaponPistolMk58
   storage:
     back:
-    - BoxSurvivalSecurity
     - Flash
-    - MagazinePistol
+    - MagazinePistol

Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml

@@ -17,6 +17,6 @@
     ears: ClothingHeadsetService
     shoes: ClothingShoesColorRed
     belt: ClothingBeltChampion
-  storage:
-    back:
-    - BoxSurvival
+  #storage:
+    #back:
+    #- Stuff

Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml

@@ -19,6 +19,6 @@
     shoes: ClothingShoesLeather
     id: PsychologistPDA
     ears: ClothingHeadsetMedical
-  storage:
-    back:
-    - BoxSurvivalMedical
+  #storage:
+    #back:
+    #- Stuff

Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml

@@ -16,6 +16,6 @@
     shoes: ClothingShoesColorWhite
     id: ReporterPDA
     ears: ClothingHeadsetService
-  storage:
-    back:
-    - BoxSurvival
+  #storage:
+    #back:
+    #- Stuff

Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml

@@ -18,6 +18,6 @@
     shoes: ClothingShoesColorWhite
     id: ZookeeperPDA
     ears: ClothingHeadsetService
-  storage:
-    back:
-    - BoxSurvival
+  #storage:
+    #back:
+    #- Stuff

Resources/Textures/Objects/Storage/boxes.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/cc65477c04f7403ca8a457bd5bae69a01abadbf0, encryptokey was taken from Baystation12 at https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/radio.dmi and modified by lapatison. boxwidetoy, shelltoy, swab, flare, inflatable, trashbag, magazine, holo and forensic created by potato1234x (github) for ss14 based on toys.rsi, mouth_swab.rsi, flare.rsi, inflatable_wall.rsi, trashbag.rsi, caseless_pistol_mag.rsi, guardians.rsi and bureaucracy.rsi respectively, candle and darts created by TheShuEd for ss14, throwing_knives and vials was drawn by Ubaser, evidence_markers by moomoobeef.",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/cc65477c04f7403ca8a457bd5bae69a01abadbf0, encryptokey was taken from Baystation12 at https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/radio.dmi and modified by lapatison. boxwidetoy, shelltoy, swab, flare, inflatable, trashbag, magazine, holo and forensic created by potato1234x (github) for ss14 based on toys.rsi, mouth_swab.rsi, flare.rsi, inflatable_wall.rsi, trashbag.rsi, caseless_pistol_mag.rsi, guardians.rsi and bureaucracy.rsi respectively, candle and darts created by TheShuEd for ss14, throwing_knives and vials was drawn by Ubaser, evidence_markers by moomoobeef, nitrogentank modified from extendedtank by Errant",
   "size": {
     "x": 32,
     "y": 32
@@ -25,6 +25,9 @@
         {
             "name": "emergencytank"
         },
+        {
+            "name": "nitrogentank"
+        },
         {
             "name": "heart"
         },