From e2c5cbb334f37d8e600eda5b36a08b51aceb4787 Mon Sep 17 00:00:00 2001
From: phil235 <antoine_hernandez62@hotmail.fr>
Date: Mon, 31 Oct 2016 14:34:25 +0100
Subject: [PATCH] Fixes two runtime from clonepod. Moves countdown effects into
 the effect folder instead of being in their own module.

---
 code/game/machinery/cloning.dm                                | 4 ++--
 code/{modules/countdown => game/objects/effects}/countdown.dm | 3 +++
 tgstation.dme                                                 | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
 rename code/{modules/countdown => game/objects/effects}/countdown.dm (97%)

diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm
index 8e34e987413..31cc15284b6 100644
--- a/code/game/machinery/cloning.dm
+++ b/code/game/machinery/cloning.dm
@@ -208,11 +208,11 @@
 
 	else if((occupant) && (occupant.loc == src))
 		if((occupant.stat == DEAD) || (occupant.suiciding) || occupant.hellbound)  //Autoeject corpses and suiciding dudes.
-			locked = FALSE
-			go_out()
 			connected_message("Clone Rejected: Deceased.")
 			SPEAK("The cloning of <b>[occupant.real_name]</b> has been \
 				aborted due to unrecoverable tissue failure.")
+			locked = FALSE
+			go_out()
 
 		else if(occupant.cloneloss > (100 - heal_level))
 			occupant.Paralyse(4)
diff --git a/code/modules/countdown/countdown.dm b/code/game/objects/effects/countdown.dm
similarity index 97%
rename from code/modules/countdown/countdown.dm
rename to code/game/objects/effects/countdown.dm
index 6f7a73355fa..219c9de6461 100644
--- a/code/modules/countdown/countdown.dm
+++ b/code/game/objects/effects/countdown.dm
@@ -56,6 +56,9 @@
 	STOP_PROCESSING(SSfastprocess, src)
 	. = ..()
 
+/obj/effect/countdown/ex_act(severity, target) //immune to explosions
+	return
+
 /obj/effect/countdown/syndicatebomb
 	name = "syndicate bomb countdown"
 
diff --git a/tgstation.dme b/tgstation.dme
index 69fe09b3c10..7c965465a1f 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -598,6 +598,7 @@
 #include "code\game\objects\effects\anomalies.dm"
 #include "code\game\objects\effects\bump_teleporter.dm"
 #include "code\game\objects\effects\contraband.dm"
+#include "code\game\objects\effects\countdown.dm"
 #include "code\game\objects\effects\effects.dm"
 #include "code\game\objects\effects\forcefields.dm"
 #include "code\game\objects\effects\glowshroom.dm"
@@ -1117,7 +1118,6 @@
 #include "code\modules\clothing\under\jobs\engineering.dm"
 #include "code\modules\clothing\under\jobs\medsci.dm"
 #include "code\modules\clothing\under\jobs\security.dm"
-#include "code\modules\countdown\countdown.dm"
 #include "code\modules\crafting\craft.dm"
 #include "code\modules\crafting\guncrafting.dm"
 #include "code\modules\crafting\recipes.dm"