From 16ffd5f8dd920461cf158603ddb7386a37006bc8 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Wed, 26 Apr 2017 17:15:51 -0500 Subject: [PATCH] Ghosts fresh clones instantly instead of waiting --- code/game/machinery/cloning.dm | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index 5773db04be..eeef80ca5b 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -204,11 +204,13 @@ clonemind.transfer_to(H) - H.grab_ghost() - to_chat(H, "Consciousness slowly creeps over you as your body regenerates.
So this is what cloning feels like?
") + if(grab_ghost_when == CLONER_FRESH_CLONE) + H.grab_ghost() + to_chat(H, "Consciousness slowly creeps over you as your body regenerates.
So this is what cloning feels like?
") if(grab_ghost_when == CLONER_MATURE_CLONE) - addtimer(CALLBACK(src, .proc/occupant_dreams), 100) + H.ghostize(TRUE) //Only does anything if they were still in their old body and not already a ghost + to_chat(H.get_ghost(TRUE), "Your body is beginning to regenerate in a cloning pod. You will become conscious when it is complete.") if(H) H.faction |= factions @@ -219,11 +221,6 @@ attempting = FALSE return TRUE -/obj/machinery/clonepod/proc/occupant_dreams() - if(occupant) - to_chat(occupant, "While your body grows, you have the strangest dream, like you can see yourself from the outside.") - occupant.ghostize(TRUE) - //Grow clones to maturity then kick them out. FREELOADERS /obj/machinery/clonepod/process()