cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 04:27:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

nerf that water (#30209)

Browse Source
This commit is contained in:
kyunkyunkyun
2025-09-02 05:53:52 +00:00
committed by GitHub
parent f0ddf0a4ba
commit ca8e5a6a7d
7 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/reagents/pyrotechnic.dm
+1 -2
View File
@@ -427,7 +427,6 @@
description = "Carbon Tetrachloride is a foam used for fire suppression."
reagent_state = LIQUID
color = "#A0A090"
var/cooling_temperature = 3 // more effective than water
taste_description = "the inside of a fire extinguisher"
/datum/reagent/firefighting_foam/reaction_mob(mob/living/M, method=REAGENT_TOUCH, volume)
@@ -442,7 +441,7 @@
if(!istype(T))
return
new /obj/effect/decal/cleanable/flour/foam(T) //foam mess; clears up quickly.
T.quench(1000, cooling_temperature)
T.quench(1000, 3) // more effective than water
/datum/reagent/plasma_dust
name = "Plasma Dust"
code/modules/reagents/chemistry/reagents/water.dm
+4 -7
View File
@@ -14,24 +14,21 @@
reagent_state = LIQUID
color = "#0064C8" // rgb: 0, 100, 200
taste_description = "water"
var/cooling_temperature = 2
process_flags = ORGANIC | SYNTHETIC
drink_icon = "glass_clear"
drink_name = "Glass of Water"
drink_desc = "The father of all refreshments."
var/water_temperature = 283.15 // As reagents don't have a temperature value, we'll just use 10 celsius.
/datum/reagent/water/reaction_mob(mob/living/M, method = REAGENT_TOUCH, volume)
M.water_act(volume, water_temperature, src, method)
M.water_act(volume, COLD_WATER_TEMPERATURE, src, method)
/datum/reagent/water/reaction_turf(turf/T, volume)
T.water_act(volume, water_temperature, src)
T.water_act(volume, COLD_WATER_TEMPERATURE, src)
var/obj/effect/acid/A = (locate(/obj/effect/acid) in T)
if(A)
A.acid_level = max(A.acid_level - volume* 50, 0)
A?.acid_level = max(A.acid_level - volume * 50, 0)
/datum/reagent/water/reaction_obj(obj/O, volume)
O.water_act(volume, water_temperature, src)
O.water_act(volume, COLD_WATER_TEMPERATURE, src)
/datum/reagent/lube
name = "Space Lube"