cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-21 19:17:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Toilet water changes (#23080)

Browse Source 
* hgcvhgfcjtfckhc

* Update code/modules/reagents/chemistry/reagents/water.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* never make me balance team please

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
This commit is contained in:
JimKil3
2023-10-31 18:37:43 +00:00
committed by GitHub
co-authored by Henri215
parent a5812e0245
commit 233cc473fe
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/reagents/water.dm
+4 -1
View File
@@ -215,18 +215,21 @@
reagent_state = LIQUID
color = "#757547"
taste_description = "puke"
harmless = FALSE
/datum/reagent/fishwater/reaction_mob(mob/living/M, method=REAGENT_TOUCH, volume)
if(method == REAGENT_INGEST)
to_chat(M, "Oh god, why did you drink that?")
/datum/reagent/fishwater/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
if(prob(30)) // Nasty, you drank this stuff? 30% chance of the fakevomit (non-stunning version)
if(prob(50)) // 50/50 chance of green vomit vs normal vomit
M.fakevomit(1)
else
M.fakevomit(0)
return ..()
update_flags |= M.adjustToxLoss(1 * REAGENTS_EFFECT_MULTIPLIER, FALSE)
return ..() | update_flags
/datum/reagent/fishwater/toiletwater
name = "Toilet Water"
code/modules/reagents/chemistry/recipes/pyrotechnics.dm
+1 -1
View File
@@ -259,7 +259,7 @@
required_reagents = list("potassium" = 1, "sugar" = 1, "phosphorus" = 1)
result_amount = 1
mix_message = "The mixture quickly turns into a pall of smoke!"
var/forbidden_reagents = list("sugar", "phosphorus", "potassium", "stimulants", "smoke_powder") //Do not transfer this stuff through smoke.
var/forbidden_reagents = list("sugar", "phosphorus", "potassium", "stimulants", "smoke_powder", "fishwater", "toiletwater") //Do not transfer this stuff through smoke.
/datum/chemical_reaction/smoke/on_reaction(datum/reagents/holder, created_volume)
for(var/f_reagent in forbidden_reagents)