From 82beb38cd58f2d270c232d5742f8fae9470a625e Mon Sep 17 00:00:00 2001 From: Crazylemon Date: Sun, 13 Dec 2015 06:52:06 -0800 Subject: [PATCH 1/2] die bugs die Fixes #2403 --- code/game/machinery/cryopod.dm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 87f008bc453..254b4102c68 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -463,6 +463,10 @@ if(do_after(user, 20, target = G:affecting)) if(!M || !G || !G:affecting) return + if(src.occupant) + user << "\The [src] is in use." + return + M.loc = src if(M.client) @@ -554,6 +558,9 @@ if(do_after(user, 20, target = L)) if(!L) return + if(src.occupant) + user << "\The [src] is in use." + return L.loc = src if(L.client) From 647a9f6d385df42822e690c344fb111d2e5d3379 Mon Sep 17 00:00:00 2001 From: Crazy Lemon Date: Sun, 13 Dec 2015 11:53:02 -0800 Subject: [PATCH 2/2] I used the github web interface for this I am probably bad people --- code/game/machinery/cryopod.dm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 254b4102c68..d14cdbe651e 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -464,7 +464,7 @@ if(!M || !G || !G:affecting) return if(src.occupant) - user << "\The [src] is in use." + user << "\The [src] is in use." return M.loc = src @@ -483,7 +483,7 @@ icon_state = occupied_icon_state M << "[on_enter_occupant_message]" - M << "If you ghost, log out or close your client now, your character will shortly be permanently removed from the round." + M << "If you ghost, log out or close your client now, your character will shortly be permanently removed from the round." occupant = M time_entered = world.time @@ -559,7 +559,7 @@ if(!L) return if(src.occupant) - user << "\The [src] is in use." + user << "\The [src] is in use." return L.loc = src @@ -576,7 +576,7 @@ 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." + 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 @@ -636,7 +636,7 @@ return if(src.occupant) - usr << "\The [src] is in use." + usr << "\The [src] is in use." return for(var/mob/living/carbon/slime/M in range(1,usr)) @@ -652,7 +652,7 @@ return if(src.occupant) - usr << "\The [src] is in use." + usr << "\The [src] is in use." return usr.stop_pulling() @@ -667,7 +667,7 @@ icon_state = occupied_icon_state usr << "[on_enter_occupant_message]" - usr << "If you ghost, log out or close your client now, your character will shortly be permanently removed from the round." + usr << "If you ghost, log out or close your client now, your character will shortly be permanently removed from the round." occupant = usr time_entered = world.time