]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Ice (the reagent) now actually does stuff (#40149)
authorHitlinemoss <209321380+Hitlinemoss@users.noreply.github.com>
Sat, 11 Oct 2025 00:08:47 +0000 (20:08 -0400)
committerGitHub <noreply@github.com>
Sat, 11 Oct 2025 00:08:47 +0000 (00:08 +0000)
* ice now evaporates and quenches thirst

* Ice uses BaseDrink as parent instead of Water

* Misc ice cleanup

* Ice no longer inherits Extinguish reactiveEffect

* Test fixes

* Deparented Ice from BaseDrink (was causing test fails)

* Whoops, forgot to remove the part actually causing the test fails

* Added code comments

Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml

index f49e9f96719c0dc34a7afe69978df884a4b0fcee..464aa93dbbb2ef4a9c00f79eb61dc11f0f08aaa7 100644 (file)
   desc: reagent-desc-ice
   slipData:
     requiredSlipSpeed: 3.5
+  evaporationSpeed: 0.15 # TODO: Ideally Ice should just turn into Water if the room is warm enough (and vis versa), rather than Ice directly evaporating
   physicalDesc: reagent-physical-desc-frosty
   flavor: cold
   color: "#bed8e6"
   recognizable: true
   meltingPoint: 0.0
   boilingPoint: 100.0
-  friction: 0.05 #Copied from Ice Crust
+  friction: 0.05 # Copied from Ice Crust
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 3 # Slightly worse for quenching thirst than just straight water
   plantMetabolism:
   - !type:PlantAdjustWater
-    amount: 1
+    amount: 1 # The internet tells me I should avoid watering plants with ice, but mostly because of temperature, so this value being the same as water should probably be fine?
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/iceglass.rsi
     state: icon_empty