From 502e41b80d13d7fd35b9d1248de720cdbf6961cf Mon Sep 17 00:00:00 2001 From: Crazylemon64 Date: Sun, 30 Apr 2017 12:53:42 -0700 Subject: [PATCH] Fixes the obvious thing --- code/__DEFINES/process_scheduler.dm | 2 +- code/controllers/Processes/air.dm | 5 ++--- code/controllers/Processes/mob.dm | 3 --- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/code/__DEFINES/process_scheduler.dm b/code/__DEFINES/process_scheduler.dm index b6777fd15c5..d3dbf1e085c 100644 --- a/code/__DEFINES/process_scheduler.dm +++ b/code/__DEFINES/process_scheduler.dm @@ -23,7 +23,7 @@ #define DECLARE_GLOBAL_CONTROLLER(PROCESS,VARNAME) \ /datum/controller/process/##PROCESS/assertGlobality(){\ if(##VARNAME){\ - message_admins("Controller '[name]' tried to become global but found another controller there already. Deleting the old controller, '[##VARNAME]'.");\ + message_admins("Controller '[name]' tried to become global but found another controller there already. Deleting the old controller.");\ qdel(##VARNAME);}\ ##VARNAME = src;}\ \ diff --git a/code/controllers/Processes/air.dm b/code/controllers/Processes/air.dm index cd86c85e864..36ce3b49fd9 100644 --- a/code/controllers/Processes/air.dm +++ b/code/controllers/Processes/air.dm @@ -50,9 +50,6 @@ var/global/datum/controller/process/air_system/air_master stat(null, "[last_active] active") stat(null, "[last_excited] EG | [last_hpd] HPD | [last_asc] ASC | [last_hotspots] Hot") -/datum/controller/process/air_system/copyStateFrom() - air_master = src - DECLARE_GLOBAL_CONTROLLER(air_system, air_master) /datum/controller/process/air_system/proc/process_hotspots() @@ -152,3 +149,5 @@ DECLARE_GLOBAL_CONTROLLER(air_system, air_master) icemaster.icon_state = "snowfloor" icemaster.layer = TURF_LAYER+0.1 icemaster.mouse_opacity = 0 + +DECLARE_GLOBAL_CONTROLLER(air_system, air_master) diff --git a/code/controllers/Processes/mob.dm b/code/controllers/Processes/mob.dm index 01f48d8b761..5c944bb101b 100644 --- a/code/controllers/Processes/mob.dm +++ b/code/controllers/Processes/mob.dm @@ -8,8 +8,6 @@ var/global/datum/controller/process/mob/mob_master schedule_interval = 20 // every 2 seconds start_delay = 16 log_startup_progress("Mob ticker starting up.") - if(mob_master) - qdel(mob_master) //only one mob master mob_master = src /datum/controller/process/mob/started() @@ -35,5 +33,4 @@ var/global/datum/controller/process/mob/mob_master mob_list -= M current_cycle++ - DECLARE_GLOBAL_CONTROLLER(mob, mob_master)