shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #13214 from DeltaFire15/cooking-oil-fix

Browse Source 
[s] Min and max are two very distinct procs...
This commit is contained in:
silicons
2020-08-19 08:36:02 -07:00
committed by GitHub
parent 1982ad5ed1 7a9796e782
commit 69d2d697e5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/reagents/chemistry/reagents/food_reagents.dm
View File

@@ -132,8 +132,8 @@
"<span class='userdanger'>You're covered in boiling oil!</span>")
M.emote("scream")
playsound(M, 'sound/machines/fryer/deep_fryer_emerge.ogg', 25, TRUE)
var/oil_damage = max((holder.chem_temp / fry_temperature) * 0.33,1) //Damage taken per unit
M.adjustFireLoss(oil_damage * max(reac_volume,20)) //Damage caps at 20
var/oil_damage = min((holder.chem_temp / fry_temperature) * 0.33,1) //Damage taken per unit
M.adjustFireLoss(oil_damage * min(reac_volume,20)) //Damage caps at 20
else
..()
return TRUE