Fixes two runtime from clonepod.

Moves countdown effects into the effect folder instead of being in their own module.
This commit is contained in:
phil235
2016-10-31 14:34:25 +01:00
parent d169779424
commit e2c5cbb334
3 changed files with 6 additions and 3 deletions
+2 -2
View File
@@ -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)
@@ -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"
+1 -1
View File
@@ -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"