cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-22 19:47:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update Chemistry-Reagents-Core.dm

Browse Source
This commit is contained in:
Novacat
2020-08-06 02:41:05 -04:00
committed by GitHub
parent 8f1ebd0772
commit acbd596f0b
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
+1 -5
View File
@@ -180,10 +180,6 @@
L.ExtinguishMob()
L.water_act(amount / 25) // Div by 25, as water_act multiplies it by 5 in order to calculate firestack modification.
remove_self(needed)
<<<<<<< HEAD
/* //VOREStation Edit Start. Stops slimes from dying from water. Fixes fuel affect_ingest, too.
=======
// Put out cigarettes if splashed.
if(istype(L, /mob/living/carbon/human))
var/mob/living/carbon/human/H = L
@@ -194,7 +190,7 @@
S.quench()
H.visible_message("<span class='notice'>[H]\'s [S.name] is put out.</span>")
>>>>>>> c820021... Merge pull request #7361 from ExabyteDiscord/Upstream-Dog-ChemistryThing
/* //VOREStation Edit Start. Stops slimes from dying from water. Fixes fuel affect_ingest, too.
/datum/reagent/water/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
if(alien == IS_SLIME)
M.adjustToxLoss(6 * removed)