Remove soapy water (#24301)

* localize shuttle timer eta etd

* remove soapy water for real

diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs
index f3489ba7c6b2bf5c0c7f84b2eb674892650d5ba1..2a80c33836075a4a2c2833d8991a57fbe3b1807d 100644 (file)
--- a/Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs
+++ b/Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs
@@ -13,10 +13,7 @@ public sealed partial class PuddleSystem
     [ValidatePrototypeId<ReagentPrototype>]
     private const string Water = "Water";
 
-    [ValidatePrototypeId<ReagentPrototype>]
-    private const string SoapyWater = "SoapyWater";
-
-    public static string[] EvaporationReagents = new[] { Water, SoapyWater };
+    public static string[] EvaporationReagents = new[] { Water };
 
     private void OnEvaporationMapInit(Entity<EvaporationComponent> entity, ref MapInitEvent args)
     {

diff --git a/Resources/Locale/en-US/reagents/meta/cleaning.ftl b/Resources/Locale/en-US/reagents/meta/cleaning.ftl
index e770594956ee631f7c53cf82e8a7341c54977cc9..8603711b6eb4507e50e27b3d12c13f16ec3fd57c 100644 (file)
--- a/Resources/Locale/en-US/reagents/meta/cleaning.ftl
+++ b/Resources/Locale/en-US/reagents/meta/cleaning.ftl
@@ -5,10 +5,7 @@ reagent-name-space-cleaner = space cleaner
 reagent-desc-space-cleaner = This is able to clean almost all surfaces of almost anything that may dirty them. The janitor is likely to appreciate refills.
 
 reagent-name-soap = soap
-reagent-desc-soap = Soap can be used to make soapy water.
-
-reagent-name-soapy-water = soapy water
-reagent-desc-soapy-water = It's just soap and water. Good for cleaning gunk off of surfaces and also slippier than regular water.
+reagent-desc-soap = I wouldn't clean my mouth out with this if I were you.
 
 reagent-name-space-lube = space lube
 reagent-desc-space-lube = Space Lube is a high performance lubricant intended for maintenance of extremely complex mechanical equipment (and certainly not used to make people slip).

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml
index f89b56ea878c7b3b5b4a58ce739b0db3f1a7181e..359e4262cd154cee9a82d3645fec3a8863fe09b9 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml
@@ -70,7 +70,7 @@
     solution: drink
 
 
-# Mopwata 
+# Mopwata
 - type: weightedRandomFillSolution
   id: RandomFillMopwata
   fills:
@@ -112,7 +112,6 @@
     - Mold
     - SpaceLube
     - SpaceGlue
-    - SoapyWater
     - SpaceCleaner
     - MilkSpoiled
     - FourteenLoko
@@ -136,4 +135,4 @@
     solution: drink
     weightedRandomId: RandomFillMopwata
   - type: Sprite
-    sprite: Objects/Consumable/Drinks/mopwata.rsi
\ No newline at end of file
+    sprite: Objects/Consumable/Drinks/mopwata.rsi

diff --git a/Resources/Prototypes/Reagents/cleaning.yml b/Resources/Prototypes/Reagents/cleaning.yml
index 24f0c033cf1eecb6b502dddde7a9af32cedb1a25..da02fc666d8abff9f77355190f6ac10491e9d3dd 100644 (file)
--- a/Resources/Prototypes/Reagents/cleaning.yml
+++ b/Resources/Prototypes/Reagents/cleaning.yml
@@ -64,36 +64,6 @@
           min: 6
         probability: 0.20
 
-- type: reagent
-  id: SoapyWater
-  parent: Water
-  name: reagent-name-soapy-water
-  desc: reagent-desc-soapy-water
-  physicalDesc: reagent-physical-desc-soapy
-  flavor: clean
-  color: "#9ec8dc"
-  recognizable: true
-  metabolisms:
-    Drink:
-      effects:
-      - !type:SatiateThirst
-        factor: 3
-      - !type:ChemVomit
-        conditions:
-        - !type:ReagentThreshold
-          min: 6
-        probability: 0.10
-        thirstAmount: -5.0
-        hungerAmount: -5.0
-  plantMetabolism:
-  - !type:PlantAdjustWater
-    amount: .8
-  tileReactions:
-    - !type:CleanDecalsReaction
-      cleanCost: 5
-    - !type:ExtinguishTileReaction { }
-    - !type:SpillIfPuddlePresentTileReaction { }
-
 - type: reagent
   id: SpaceLube
   name: reagent-name-space-lube

diff --git a/Resources/Prototypes/Recipes/Reactions/cleaning.yml b/Resources/Prototypes/Recipes/Reactions/cleaning.yml
index df6b8f4315483d3473457fe7a6d7705c7c081b4b..5c620ea9e79f7fb443baab71b050adfd00246aa7 100644 (file)
--- a/Resources/Prototypes/Recipes/Reactions/cleaning.yml
+++ b/Resources/Prototypes/Recipes/Reactions/cleaning.yml
@@ -20,16 +20,6 @@
   products:
     SpaceCleaner: 2
 
-- type: reaction
-  id: SoapyWater
-  reactants:
-    Water:
-      amount: 3
-    SoapReagent:
-      amount: 1
-  products:
-    SoapyWater: 4
-
 - type: reaction
   id: SpaceLube
   impact: Medium