cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15944 from PidgeyThePirate/Issue_15662_Welderbombs_Ignore_Suits_Fix

Browse Source 
#15662 Fix - Makes welder bombs resistable by heat resistance
This commit is contained in:
variableundefined
2021-07-26 20:05:15 -04:00
committed by GitHub
parent 1e9561a331 8a64f1bec1
commit 8dd75c4876
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/atmospherics/environmental/LINDA_fire.dm
+12 -2
View File
@@ -228,7 +228,12 @@
for(var/mob/living/L in T)
L.adjust_fire_stacks(3)
L.IgniteMob()
L.bodytemperature = max(temp / 3, L.bodytemperature)
if(ishuman(L))
var/mob/living/carbon/human/M = L
var/heatBlockPercent = 1 - M.get_heat_protection(temp)
M.bodytemperature += (temp - M.bodytemperature) * heatBlockPercent / 3
else
L.bodytemperature = (2 * L.bodytemperature + temp) / 3
/proc/fireflash_s(atom/center, radius, temp, falloff)
if(temp < T0C + 60)
@@ -291,7 +296,12 @@
for(var/mob/living/L in T)
L.adjust_fire_stacks(3)
L.IgniteMob()
L.bodytemperature = (2 * L.bodytemperature + temp) / 3
if(ishuman(L))
var/mob/living/carbon/human/M = L
var/heatBlockPercent = 1 - M.get_heat_protection(temp)
M.bodytemperature += (temp - M.bodytemperature) * heatBlockPercent / 3
else
L.bodytemperature = (2 * L.bodytemperature + temp) / 3
if(T.density)
continue