cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 02:54:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ports over Fires to Subsystems

Browse Source
This commit is contained in:
Fox McCloud
2018-03-23 18:03:27 -04:00
parent bc7d9aa02d
commit ae53aa1d21
5 changed files with 42 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/obj_defense.dm
+3 -3
View File
@@ -139,7 +139,7 @@
/obj/fire_act(global_overlay=1)
if(!burn_state)
burn_state = ON_FIRE
fire_master.burning += src
SSfire_burning.processing[src] = src
burn_world_time = world.time + burntime*rand(10,20)
if(global_overlay)
overlays += fire_overlay
@@ -149,14 +149,14 @@
empty_object_contents(1, loc)
var/obj/effect/decal/cleanable/ash/A = new(loc)
A.desc = "Looks like this used to be a [name] some time ago."
fire_master.burning -= src
SSfire_burning.processing -= src
qdel(src)
/obj/proc/extinguish()
if(burn_state == ON_FIRE)
burn_state = FLAMMABLE
overlays -= fire_overlay
fire_master.burning -= src
SSfire_burning.processing -= src
/obj/proc/tesla_act(power)
being_shocked = TRUE