mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-23 13:05:44 +01:00
Refactored fire_act (#19158)
Refactored fire_act() to be in line with TG version, removed useless parameter, added signal, made non sleepable and forced to call parent. Added atom_act.dm file for the various *_act procs.
This commit is contained in:
@@ -335,7 +335,7 @@
|
||||
|
||||
// ++++ROCKDTBEN++++ MOB PROCS //END
|
||||
|
||||
/mob/living/carbon/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
|
||||
/mob/living/carbon/fire_act(exposed_temperature, exposed_volume)
|
||||
..()
|
||||
var/temp_inc = max(min(BODYTEMP_HEATING_MAX*(1-get_heat_protection()), exposed_temperature - bodytemperature), 0)
|
||||
bodytemperature += temp_inc
|
||||
|
||||
@@ -337,7 +337,9 @@
|
||||
var/turf/location = get_turf(src)
|
||||
location.hotspot_expose(fire_burn_temperature(), 50, 1)
|
||||
|
||||
/mob/living/fire_act()
|
||||
/mob/living/fire_act(exposed_temperature, exposed_volume)
|
||||
. = ..()
|
||||
|
||||
IgniteMob(2)
|
||||
|
||||
/mob/living/proc/get_cold_protection()
|
||||
|
||||
@@ -329,6 +329,8 @@
|
||||
AddOverlays(image("icon" = 'icons/mob/burning/burning_generic.dmi', "icon_state" = "upper"))
|
||||
AddOverlays(image("icon" = 'icons/mob/burning/burning_generic.dmi', "icon_state" = "lower"))
|
||||
|
||||
/mob/living/silicon/robot/fire_act()
|
||||
/mob/living/silicon/robot/fire_act(exposed_temperature, exposed_volume)
|
||||
. = ..()
|
||||
|
||||
if(!on_fire) // Silicons don't gain stacks from hotspots, but hotspots can ignite them.
|
||||
IgniteMob()
|
||||
|
||||
Reference in New Issue
Block a user