From 5ba67e0cf1a0e3b83aa36f00b6ef540d87879bf7 Mon Sep 17 00:00:00 2001 From: Crazylemon64 Date: Sat, 13 May 2017 16:09:44 -0700 Subject: [PATCH] Fixes duplicate vars --- code/controllers/Processes/air.dm | 2 -- code/controllers/Processes/mob.dm | 1 - code/controllers/Processes/shuttles.dm | 2 -- 3 files changed, 5 deletions(-) diff --git a/code/controllers/Processes/air.dm b/code/controllers/Processes/air.dm index 36ce3b49fd9..311699bb720 100644 --- a/code/controllers/Processes/air.dm +++ b/code/controllers/Processes/air.dm @@ -149,5 +149,3 @@ 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 5c944bb101b..86c76604606 100644 --- a/code/controllers/Processes/mob.dm +++ b/code/controllers/Processes/mob.dm @@ -8,7 +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.") - mob_master = src /datum/controller/process/mob/started() ..() diff --git a/code/controllers/Processes/shuttles.dm b/code/controllers/Processes/shuttles.dm index 84d7c279d11..21f2e8c390e 100644 --- a/code/controllers/Processes/shuttles.dm +++ b/code/controllers/Processes/shuttles.dm @@ -40,8 +40,6 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 name = "shuttle" schedule_interval = 20 - shuttle_master = src - var/watch = start_watch() log_startup_progress("Initializing shuttle docks...") initialize_docks()