mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-25 06:00:16 +01:00
Fixes two runtime from clonepod.
Moves countdown effects into the effect folder instead of being in their own module.
This commit is contained in:
@@ -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
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user