Merge pull request #2828 from Crazylemon64/cryopods-one-at-a-time

Cryopods now only let one in at a time
This commit is contained in:
Fox McCloud
2015-12-13 18:09:01 -05:00
+12 -5
View File
@@ -463,6 +463,10 @@
if(do_after(user, 20, target = G:affecting))
if(!M || !G || !G:affecting) return
if(src.occupant)
user << "<span class='boldnotice'>\The [src] is in use.</span>"
return
M.loc = src
if(M.client)
@@ -479,7 +483,7 @@
icon_state = occupied_icon_state
M << "<span class='notice'>[on_enter_occupant_message]</span>"
M << "<span class='notice'><b>If you ghost, log out or close your client now, your character will shortly be permanently removed from the round.</b></span>"
M << "<span class='boldnotice'>If you ghost, log out or close your client now, your character will shortly be permanently removed from the round.</span>"
occupant = M
time_entered = world.time
@@ -554,6 +558,9 @@
if(do_after(user, 20, target = L))
if(!L) return
if(src.occupant)
user << "<span class='boldnotice'>\The [src] is in use.</span>"
return
L.loc = src
if(L.client)
@@ -569,7 +576,7 @@
icon_state = occupied_icon_state
L << "<span class='notice'>[on_enter_occupant_message]</span>"
L << "<span class='notice'><b>If you ghost, log out or close your client now, your character will shortly be permanently removed from the round.</b></span>"
L << "<span class='boldnotice'>If you ghost, log out or close your client now, your character will shortly be permanently removed from the round.</span>"
occupant = L
time_entered = world.time
@@ -629,7 +636,7 @@
return
if(src.occupant)
usr << "<span class='notice'><B>\The [src] is in use.</B></span>"
usr << "<span class='boldnotice'>\The [src] is in use.</span>"
return
for(var/mob/living/carbon/slime/M in range(1,usr))
@@ -645,7 +652,7 @@
return
if(src.occupant)
usr << "<span class='notice'><B>\The [src] is in use.</B></span>"
usr << "<span class='boldnotice'>\The [src] is in use.</span>"
return
usr.stop_pulling()
@@ -660,7 +667,7 @@
icon_state = occupied_icon_state
usr << "<span class='notice'>[on_enter_occupant_message]</span>"
usr << "<span class='notice'><b>If you ghost, log out or close your client now, your character will shortly be permanently removed from the round.</b></span>"
usr << "<span class='boldnotice'>If you ghost, log out or close your client now, your character will shortly be permanently removed from the round.</span>"
occupant = usr
time_entered = world.time