mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-24 13:30:42 +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:
@@ -132,7 +132,9 @@
|
||||
health -= maxHealth / 5
|
||||
healthcheck()
|
||||
|
||||
/obj/structure/gore/tendrils/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
|
||||
/obj/structure/gore/tendrils/fire_act(exposed_temperature, exposed_volume)
|
||||
. = ..()
|
||||
|
||||
if(exposed_temperature > 300 + T0C)
|
||||
health -= 5
|
||||
healthcheck()
|
||||
|
||||
@@ -274,7 +274,7 @@
|
||||
return 0
|
||||
return 0
|
||||
|
||||
/obj/structure/grille/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
|
||||
/obj/structure/grille/fire_act(exposed_temperature, exposed_volume)
|
||||
if(!destroyed)
|
||||
if(exposed_temperature > T0C + 1500)
|
||||
health -= 1
|
||||
|
||||
@@ -15,7 +15,9 @@
|
||||
var/health = 100
|
||||
var/maxhealth = 100
|
||||
|
||||
/obj/structure/simple_door/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
|
||||
/obj/structure/simple_door/fire_act(exposed_temperature, exposed_volume)
|
||||
. = ..()
|
||||
|
||||
TemperatureAct(exposed_temperature)
|
||||
|
||||
/obj/structure/simple_door/proc/TemperatureAct(temperature)
|
||||
|
||||
@@ -323,7 +323,9 @@
|
||||
anchored = FALSE
|
||||
density = FALSE
|
||||
|
||||
/obj/structure/flora/log_bench/fire_act()
|
||||
/obj/structure/flora/log_bench/fire_act(exposed_temperature, exposed_volume)
|
||||
. = ..()
|
||||
|
||||
for(var/obj/structure/bonfire/B in get_turf(src))
|
||||
if(B.on_fire)
|
||||
B.fuel = min(B.max_fuel, B.fuel + 300)
|
||||
|
||||
@@ -409,7 +409,7 @@
|
||||
return 1
|
||||
return 0
|
||||
|
||||
/obj/structure/window/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
|
||||
/obj/structure/window/fire_act(exposed_temperature, exposed_volume)
|
||||
if(exposed_temperature > maximal_heat)
|
||||
hit(damage_per_fire_tick, 0)
|
||||
..()
|
||||
|
||||
Reference in New Issue
Block a user