Revert "Shark PSB 1984, replace with tinned meat" (#3204)

Resources/Prototypes/Loadouts/loadout_groups.yml

@@ -88,7 +88,7 @@
   - EmergencyOxygen
   - LoadoutSpeciesVoxNitrogen
   - EmergencyIPCBox # DeltaV
-  - EmergencyWaterBreatherCarnivore # DeltaV
+  - EmergencyWaterVapor # DeltaV
 
 - type: loadoutGroup
   id: GroupEVATank
@@ -97,7 +97,7 @@
   loadouts:
   - LoadoutSpeciesEVANitrogen
   - LoadoutSpeciesEVAOxygen
-  - LoadoutSpeciesPocketDoubleWaterBreatherCarnivore # DeltaV
+  - LoadoutSpeciesEVAWaterVapor # DeltaV
 
 - type: loadoutGroup
   id: GroupPocketTankDouble
@@ -106,7 +106,7 @@
   loadouts:
   - LoadoutSpeciesPocketDoubleNitrogen
   - LoadoutSpeciesPocketDoubleOxygen
-  - LoadoutSpeciesPocketDoubleWaterBreatherCarnivore # DeltaV
+  - LoadoutSpeciesPocketDoubleWaterVapor # DeltaV
 
 # Command
 - type: loadoutGroup
@@ -189,9 +189,9 @@
   # - CommonBackpack
   # - CommonSatchel
   # - CommonDuffel
-  - BackpackHoP
-  - SatchelHoP
-  - HopDuffel
+  - BackpackHoP 
+  - SatchelHoP 
+  - HopDuffel 
   # End of DeltaV changes
   - HoPBackpackIan
 
@@ -543,7 +543,7 @@
   - EmergencyOxygenClown
   - LoadoutSpeciesVoxNitrogen
   - EmergencyIPCBox # DeltaV
-  - EmergencyWaterBreatherCarnivoreClown # DeltaV
+  - EmergencyWaterVaporClown # DeltaV
 
 - type: loadoutGroup
   id: MimeHead
@@ -603,7 +603,7 @@
   - EmergencyOxygenMime
   - LoadoutSpeciesVoxNitrogen
   - EmergencyIPCBox # DeltaV
-  - EmergencyWaterBreatherCarnivoreMime # DeltaV
+  - EmergencyWaterVaporMime # DeltaV
 
 - type: loadoutGroup
   id: MusicianJumpsuit
@@ -910,7 +910,7 @@
   - EmergencyOxygenExtended
   - LoadoutSpeciesVoxNitrogen
   - EmergencyIPCBox # DeltaV
-  - EmergencyWaterBreatherCarnivoreExtended # DeltaV
+  - EmergencyWaterVaporExtended # DeltaV
 
 # Science
 - type: loadoutGroup
@@ -1243,7 +1243,7 @@
   - EmergencyOxygenSecurity
   - LoadoutSpeciesVoxNitrogen
   - EmergencyIPCBox # DeltaV
-  - EmergencyWaterBreatherCarnivoreSecurity # DeltaV
+  - EmergencyWaterVaporSecurity # DeltaV
 
 - type: loadoutGroup
   id: SecurityStar
@@ -1443,7 +1443,7 @@
   - EmergencyOxygenMedical
   - LoadoutSpeciesVoxNitrogen
   - EmergencyIPCBox # DeltaV
-  - EmergencyWaterBreatherCarnivoreMedical # DeltaV
+  - EmergencyWaterVaporMedical # DeltaV
 
 # Wildcards
 - type: loadoutGroup
@@ -1489,7 +1489,7 @@
   - EmergencyOxygenSyndicate
   - LoadoutSpeciesVoxNitrogen
   - EmergencyIPCBox # DeltaV
-  - EmergencyWaterBreatherCarnivoreSyndicate # DeltaV
+  - EmergencyWaterVaporSyndicate # DeltaV
 
 - type: loadoutGroup
   id: GroupSpeciesBreathTool

Resources/Prototypes/_DV/Catalog/Fills/Boxes/emergency.yml

@@ -45,8 +45,8 @@
 
 - type: entity
   parent: BoxSurvivalBrigmedic
-  id: BoxSurvivalBrigmedicWaterBreatherCarnivore
-  suffix: MedSec H2O Carni
+  id: BoxSurvivalBrigmedicWaterVapor
+  suffix: MedSec H2O
   components:
   - type: StorageFill
     contents:
@@ -55,7 +55,7 @@
     - id: EmergencyMedipen
     - id: SpaceMedipen
     - id: Flare
-    - id: FoodTinMRE
+    - id: FoodPSB
     - id: DrinkWaterBottleFull
   # Intentionally wrong picture on the box. NT did not care enough to change it.
   - type: Label
@@ -63,8 +63,8 @@
 
 - type: entity
   parent: BoxSurvival
-  id: BoxSurvivalWaterBreatherCarnivore
-  suffix: Standard H2O Carni
+  id: BoxSurvivalWaterVapor
+  suffix: Standard H2O
   components:
   - type: StorageFill
     contents:
@@ -73,15 +73,15 @@
     - id: EmergencyMedipen
     - id: SpaceMedipen
     - id: Flare
-    - id: FoodTinMRE
+    - id: FoodPSB
     - id: DrinkWaterBottleFull
   - type: Label
     currentLabel: reagent-name-water
 
 - type: entity
   parent: BoxSurvivalEngineering
-  id: BoxSurvivalEngineeringWaterBreatherCarnivore
-  suffix: Extended H2O Carni
+  id: BoxSurvivalEngineeringWaterVapor
+  suffix: Extended H2O
   components:
   - type: StorageFill
     contents:
@@ -90,15 +90,15 @@
     - id: EmergencyMedipen
     - id: SpaceMedipen
     - id: Flare
-    - id: FoodTinMRE
+    - id: FoodPSB
     - id: DrinkWaterBottleFull
   - type: Label
     currentLabel: reagent-name-water
 
 - type: entity
   parent: BoxSurvivalSecurity
-  id: BoxSurvivalSecurityWaterBreatherCarnivore
-  suffix: Security H2O Carni
+  id: BoxSurvivalSecurityWaterVapor
+  suffix: Security H2O
   components:
   - type: StorageFill
     contents:
@@ -107,15 +107,15 @@
     - id: EmergencyMedipen
     - id: SpaceMedipen
     - id: Flare
-    - id: FoodTinMRE
+    - id: FoodPSB
     - id: DrinkWaterBottleFull
   - type: Label
     currentLabel: reagent-name-water
 
 - type: entity
   parent: BoxSurvivalMedical
-  id: BoxSurvivalMedicalWaterBreatherCarnivore
-  suffix: Medical H2O Carni
+  id: BoxSurvivalMedicalWaterVapor
+  suffix: Medical H2O
   components:
   - type: StorageFill
     contents:
@@ -124,15 +124,15 @@
     - id: EmergencyMedipen
     - id: SpaceMedipen
     - id: Flare
-    - id: FoodTinMRE
+    - id: FoodPSB
     - id: DrinkWaterBottleFull
   - type: Label
     currentLabel: reagent-name-water
 
 - type: entity
   parent: BoxHug
-  id: BoxHugWaterBreatherCarnivore
-  suffix: Emergency H2O Carni
+  id: BoxHugWaterVapor
+  suffix: Emergency H2O
   components:
   - type: StorageFill
     contents:
@@ -141,15 +141,15 @@
     - id: EmergencyMedipen
     - id: SpaceMedipen
     - id: Flare
-    - id: FoodTinMRE
+    - id: FoodPSB
     - id: DrinkWaterBottleFull
   - type: Label
     currentLabel: reagent-name-water
 
 - type: entity
-  parent: BoxSurvivalWaterBreatherCarnivore
-  id: BoxMimeWaterBreatherCarnivore
-  suffix: Mime, Emergency H2O Carni
+  parent: BoxSurvivalWaterVapor
+  id: BoxMimeWaterVapor
+  suffix: Mime, Emergency H2O
   components:
   - type: StorageFill
     contents:
@@ -164,8 +164,8 @@
 
 - type: entity
   parent: BoxSurvivalSyndicate
-  id: BoxSurvivalSyndicateWaterBreatherCarnivore
-  suffix: Syndicate H2O Carni
+  id: BoxSurvivalSyndicateWaterVapor
+  suffix: Syndicate H2O
   components:
   - type: StorageFill
     contents:
@@ -173,7 +173,7 @@
     - id: ExtendedEmergencyWaterVaporTankFilled
     - id: EmergencyMedipen
     - id: SpaceMedipen
-    - id: FoodTinMRE
+    - id: FoodPSB
     - id: DrinkWaterBottleFull
   - type: Label
     currentLabel: reagent-name-water

Resources/Prototypes/_DV/Loadouts/Miscellaneous/survival.yml

@@ -1,6 +1,6 @@
 # Species
 - type: loadoutEffectGroup
-  id: WaterBreatherCarnivore
+  id: WaterBreather
   effects:
   - !type:SpeciesLoadoutEffect
     species:
@@ -8,89 +8,89 @@
 
 # Basic
 - type: loadout
-  id: EmergencyWaterBreatherCarnivore
+  id: EmergencyWaterVapor
   effects:
   - !type:GroupLoadoutEffect
-    proto: WaterBreatherCarnivore
+    proto: WaterBreather
   storage:
     back:
-    - BoxSurvivalWaterBreatherCarnivore
+    - BoxSurvivalWaterVapor
 
 # Clown
 - type: loadout
-  id: EmergencyWaterBreatherCarnivoreClown
+  id: EmergencyWaterVaporClown
   effects:
   - !type:GroupLoadoutEffect
-    proto: WaterBreatherCarnivore
+    proto: WaterBreather
   storage:
     back:
-    - BoxHugWaterBreatherCarnivore
+    - BoxHugWaterVapor
 
 # Mime
 - type: loadout
-  id: EmergencyWaterBreatherCarnivoreMime
+  id: EmergencyWaterVaporMime
   effects:
   - !type:GroupLoadoutEffect
-    proto: WaterBreatherCarnivore
+    proto: WaterBreather
   storage:
     back:
-    - BoxMimeWaterBreatherCarnivore
+    - BoxMimeWaterVapor
 
 # Engineering / Extended
 - type: loadout
-  id: EmergencyWaterBreatherCarnivoreExtended
+  id: EmergencyWaterVaporExtended
   effects:
   - !type:GroupLoadoutEffect
-    proto: WaterBreatherCarnivore
+    proto: WaterBreather
   storage:
     back:
-    - BoxSurvivalEngineeringWaterBreatherCarnivore
+    - BoxSurvivalEngineeringWaterVapor
 
 # Medical
 - type: loadout
-  id: EmergencyWaterBreatherCarnivoreMedical
+  id: EmergencyWaterVaporMedical
   effects:
   - !type:GroupLoadoutEffect
-    proto: WaterBreatherCarnivore
+    proto: WaterBreather
   storage:
     back:
-    - BoxSurvivalMedicalWaterBreatherCarnivore
+    - BoxSurvivalMedicalWaterVapor
 
 # Security
 - type: loadout
-  id: EmergencyWaterBreatherCarnivoreSecurity
+  id: EmergencyWaterVaporSecurity
   effects:
   - !type:GroupLoadoutEffect
-    proto: WaterBreatherCarnivore
+    proto: WaterBreather
   storage:
     back:
-    - BoxSurvivalSecurityWaterBreatherCarnivore
+    - BoxSurvivalSecurityWaterVapor
 
 # Syndicate
 - type: loadout
-  id: EmergencyWaterBreatherCarnivoreSyndicate
+  id: EmergencyWaterVaporSyndicate
   effects:
   - !type:GroupLoadoutEffect
-    proto: WaterBreatherCarnivore
+    proto: WaterBreather
   storage:
     back:
-    - BoxSurvivalWaterBreatherCarnivore
+    - BoxSurvivalWaterVapor
 
 # Full EVA Tank, Any Species
 - type: loadout
-  id: LoadoutSpeciesEVAWaterBreatherCarnivore
+  id: LoadoutSpeciesEVAWaterVapor
   effects:
   - !type:GroupLoadoutEffect
-    proto: WaterBreatherCarnivore
+    proto: WaterBreather
   equipment:
     suitstorage: WaterVaporTankFilled
 
 # Species-appropriate Double Emergency Tank in Pocket 1
 - type: loadout
-  id: LoadoutSpeciesPocketDoubleWaterBreatherCarnivore
+  id: LoadoutSpeciesPocketDoubleWaterVapor
   effects:
   - !type:GroupLoadoutEffect
-    proto: WaterBreatherCarnivore
+    proto: WaterBreather
   equipment:
     pocket1: DoubleEmergencyWaterVaporTankFilled
 
@@ -114,12 +114,12 @@
     - BoxSurvivalBrigmedicNitrogen
 
 - type: loadout
-  id: EmergencyWaterBreatherCarnivoreCorpsman
+  id: EmergencyWaterVaporCorpsman
   effects:
   - !type:GroupLoadoutEffect
-    proto: WaterBreatherCarnivore
+    proto: WaterBreather
   equipment:
-    mask: BoxSurvivalBrigmedicWaterBreatherCarnivore
+    mask: BoxSurvivalBrigmedicWaterVapor
 
 - type: loadout
   id: LoadoutSpeciesBreathToolCorpsman