From 04ef96153134bbe24307a807cdbff4a47980cffa Mon Sep 17 00:00:00 2001
From: Tad Hardesty <tad@platymuus.com>
Date: Mon, 20 Aug 2018 03:07:46 -0700
Subject: [PATCH] Disable CTF emitters until CTF occurs

---
 _maps/map_files/generic/CentCom.dmm                 | 5 ++++-
 code/modules/awaymissions/capture_the_flag.dm       | 4 ++++
 code/modules/awaymissions/mission_code/challenge.dm | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
index 8266ae70fe9..c55e451598e 100644
--- a/_maps/map_files/generic/CentCom.dmm
+++ b/_maps/map_files/generic/CentCom.dmm
@@ -2218,7 +2218,9 @@
 /turf/open/floor/plasteel/dark,
 /area/ctf)
 "gI" = (
-/obj/machinery/power/emitter/energycannon,
+/obj/machinery/power/emitter/energycannon{
+	active = 0
+	},
 /turf/open/floor/plating,
 /area/ctf)
 "gJ" = (
@@ -2320,6 +2322,7 @@
 /area/ctf)
 "ha" = (
 /obj/machinery/power/emitter/energycannon{
+	active = 0;
 	dir = 1
 	},
 /turf/open/floor/plating,
diff --git a/code/modules/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm
index c1d3403c08b..bb44da2091f 100644
--- a/code/modules/awaymissions/capture_the_flag.dm
+++ b/code/modules/awaymissions/capture_the_flag.dm
@@ -125,8 +125,12 @@
 
 /proc/toggle_all_ctf(mob/user)
 	var/ctf_enabled = FALSE
+	var/area/A
 	for(var/obj/machinery/capture_the_flag/CTF in GLOB.machines)
 		ctf_enabled = CTF.toggle_ctf()
+		A = get_area(CTF)
+	for(var/obj/machinery/power/emitter/E in A)
+		E.active = ctf_enabled
 	message_admins("[key_name_admin(user)] has [ctf_enabled? "enabled" : "disabled"] CTF!")
 	notify_ghosts("CTF has been [ctf_enabled? "enabled" : "disabled"]!",'sound/effects/ghost2.ogg')
 
diff --git a/code/modules/awaymissions/mission_code/challenge.dm b/code/modules/awaymissions/mission_code/challenge.dm
index 0f28f6b3e0a..673f13c067e 100644
--- a/code/modules/awaymissions/mission_code/challenge.dm
+++ b/code/modules/awaymissions/mission_code/challenge.dm
@@ -28,7 +28,7 @@
 	idle_power_usage = 0
 	active_power_usage = 0
 
-	active = 1
+	active = TRUE
 	locked = TRUE
 	state = 2