This commit is contained in:
Fox McCloud
2018-03-25 18:52:06 -04:00
parent ae53aa1d21
commit 7a548473d4
4 changed files with 9 additions and 9 deletions
@@ -1,5 +1,5 @@
SUBSYSTEM_DEF(fire_burning)
name = "Fire Burning"
SUBSYSTEM_DEF(fires)
name = "Fires"
priority = FIRE_PRIOTITY_BURNING
flags = SS_NO_INIT|SS_BACKGROUND
runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
@@ -7,11 +7,11 @@ SUBSYSTEM_DEF(fire_burning)
var/list/currentrun = list()
var/list/processing = list()
/datum/controller/subsystem/fire_burning/stat_entry()
/datum/controller/subsystem/fires/stat_entry()
..("P:[processing.len]")
/datum/controller/subsystem/fire_burning/fire(resumed = 0)
/datum/controller/subsystem/fires/fire(resumed = 0)
if(!resumed)
src.currentrun = processing.Copy()
+1 -1
View File
@@ -79,7 +79,7 @@
debug_variables(vote)
feedback_add_details("admin_verb","DVote")
if("Fires")
debug_variables(SSfire_burning)
debug_variables(SSfires)
feedback_add_details("admin_verb","DFires")
if("Mob")
debug_variables(mob_master)
+3 -3
View File
@@ -139,7 +139,7 @@
/obj/fire_act(global_overlay=1)
if(!burn_state)
burn_state = ON_FIRE
SSfire_burning.processing[src] = src
SSfires.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."
SSfire_burning.processing -= src
SSfires.processing -= src
qdel(src)
/obj/proc/extinguish()
if(burn_state == ON_FIRE)
burn_state = FLAMMABLE
overlays -= fire_overlay
SSfire_burning.processing -= src
SSfires.processing -= src
/obj/proc/tesla_act(power)
being_shocked = TRUE
+1 -1
View File
@@ -208,7 +208,7 @@
#include "code\controllers\ProcessScheduler\core\process.dm"
#include "code\controllers\ProcessScheduler\core\processScheduler.dm"
#include "code\controllers\subsystem\air.dm"
#include "code\controllers\subsystem\fire_burning.dm"
#include "code\controllers\subsystem\fires.dm"
#include "code\controllers\subsystem\spacedrift.dm"
#include "code\controllers\subsystem\throwing.dm"
#include "code\datums\action.dm"