From 7a548473d4d608c71fec89cacfb8bedb4c8024e4 Mon Sep 17 00:00:00 2001 From: Fox McCloud Date: Sun, 25 Mar 2018 18:52:06 -0400 Subject: [PATCH] name --- code/controllers/subsystem/{fire_burning.dm => fires.dm} | 8 ++++---- code/controllers/verbs.dm | 2 +- code/game/objects/obj_defense.dm | 6 +++--- paradise.dme | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) rename code/controllers/subsystem/{fire_burning.dm => fires.dm} (80%) diff --git a/code/controllers/subsystem/fire_burning.dm b/code/controllers/subsystem/fires.dm similarity index 80% rename from code/controllers/subsystem/fire_burning.dm rename to code/controllers/subsystem/fires.dm index 2f3d752c17b..50624aa8db0 100644 --- a/code/controllers/subsystem/fire_burning.dm +++ b/code/controllers/subsystem/fires.dm @@ -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() diff --git a/code/controllers/verbs.dm b/code/controllers/verbs.dm index 560d4f7c88d..bad73292c82 100644 --- a/code/controllers/verbs.dm +++ b/code/controllers/verbs.dm @@ -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) diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm index 86790b5bcf5..d5ef8fce545 100644 --- a/code/game/objects/obj_defense.dm +++ b/code/game/objects/obj_defense.dm @@ -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 diff --git a/paradise.dme b/paradise.dme index 6f136b5c875..75274b9ee46 100644 --- a/paradise.dme +++ b/paradise.dme @@ -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"