From adb54f4a06f8307d652ea44d58163aa675ba6b3f Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Wed, 11 Mar 2015 18:08:01 -0400 Subject: [PATCH] Cryopod fixes --- code/game/machinery/cryopod.dm | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index dec81660ef4..3daa3edfb86 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -523,17 +523,17 @@ else icon_state = occupied_icon_state - L << "[on_enter_occupant_message]" - L << "If you ghost, log out or close your client now, your character will shortly be permanently removed from the round." - occupant = L - time_entered = world.time + L << "[on_enter_occupant_message]" + L << "If you ghost, log out or close your client now, your character will shortly be permanently removed from the round." + occupant = L + time_entered = world.time - // Book keeping! - log_admin("[key_name_admin(L)] has entered a stasis pod. (JMP)") - message_admins("[key_name_admin(L)] has entered a stasis pod.") + // Book keeping! + log_admin("[key_name_admin(L)] has entered a stasis pod. (JMP)") + message_admins("[key_name_admin(L)] has entered a stasis pod.") - //Despawning occurs when process() is called with an occupant without a client. - src.add_fingerprint(L) + //Despawning occurs when process() is called with an occupant without a client. + src.add_fingerprint(L) return @@ -544,6 +544,9 @@ if(usr.stat != 0) return + if(usr != src) + usr << "The cryopod is in use and locked!" + return if(orient_right) icon_state = "[base_icon_state]-r" else