From f7fe20887acdf1335dcfd816d7dd2a256d7d9c0c Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Tue, 2 May 2017 08:40:10 -0500
Subject: [PATCH] manual merge

---
 code/controllers/subsystem/ticker.dm      |  6 ++++++
 code/modules/power/singularity/emitter.dm | 10 +++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
index 305dbc0678..5a180527bb 100644
--- a/code/controllers/subsystem/ticker.dm
+++ b/code/controllers/subsystem/ticker.dm
@@ -672,6 +672,12 @@ SUBSYSTEM_DEF(ticker)
 		return
 	INVOKE_ASYNC(SSmapping, /datum/controller/subsystem/mapping/.proc/maprotate)
 
+/datum/controller/subsystem/ticker/proc/HasRoundStarted()
+	return current_state >= GAME_STATE_PLAYING
+
+/datum/controller/subsystem/ticker/proc/IsRoundInProgress()
+	return current_state == GAME_STATE_PLAYING
+
 /proc/send_gamemode_vote()
 	SSticker.modevoted = TRUE
 	SSvote.initiate_vote("roundtype","server")
diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm
index 39085ab8e3..4316d852d8 100644
--- a/code/modules/power/singularity/emitter.dm
+++ b/code/modules/power/singularity/emitter.dm
@@ -7,7 +7,7 @@
 	anchored = 0
 	density = 1
 	req_access = list(GLOB.access_engine_equip)
-
+
 	// The following 3 vars are mostly for the prototype
 	var/manual = FALSE
 	var/charge = 0
@@ -88,7 +88,7 @@
 		rotate()
 
 /obj/machinery/power/emitter/Initialize()
-	. = ..()
+	. = ..()
 	if(state == 2 && anchored)
 		connect_to_network()
 
@@ -96,7 +96,7 @@
 	sparks.set_up(5, TRUE, src)
 
 /obj/machinery/power/emitter/Destroy()
-	if(SSticker && SSticker.current_state == GAME_STATE_PLAYING)
+	if(SSticker && SSticker.IsRoundInProgress())
 		message_admins("Emitter deleted at ([x],[y],[z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)",0,1)
 		log_game("Emitter deleted at ([x],[y],[z])")
 		investigate_log("<font color='red'>deleted</font> at ([x],[y],[z]) at [get_area(src)]","singulo")
@@ -199,8 +199,8 @@
 
 /obj/machinery/power/emitter/proc/fire_beam(atom/targeted_atom, mob/user)
 	var/turf/targets_from = get_turf(src)
-	if(targeted_atom && (targeted_atom == user || targeted_atom == targets_from || targeted_atom == src))
-		return
+	if(targeted_atom && (targeted_atom == user || targeted_atom == targets_from || targeted_atom == src))
+		return
 	var/obj/item/projectile/P = new projectile_type(targets_from)
 	playsound(src.loc, projectile_sound, 50, 1)
 	if(prob(35))