From bb4be2c86a1c2923c31bf7d7428b0acb5beeb8f9 Mon Sep 17 00:00:00 2001 From: Cael_Aislinn Date: Mon, 21 Jan 2013 19:25:19 +1000 Subject: [PATCH] moved cryo cells to the same layer as tables - this will look weird for stuff on the top tile ('behind' the cry cell) but beakers wont be hidden underneath it when they're ejected any more, fixed typo in escape shuttle, fixed syntax error in new player setup screen Signed-off-by: Cael_Aislinn --- code/game/machinery/computer/shuttle.dm | 2 +- code/game/machinery/cryo.dm | 2 +- code/modules/mob/new_player/new_player.dm | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/code/game/machinery/computer/shuttle.dm b/code/game/machinery/computer/shuttle.dm index 23c1c3b4a2c..978db653f94 100644 --- a/code/game/machinery/computer/shuttle.dm +++ b/code/game/machinery/computer/shuttle.dm @@ -52,7 +52,7 @@ world << text("\blue Alert: [] authorizations needed until shuttle is launched early", src.auth_need - src.authorized.len) if("Abort") - world << "\blue All authorizations to shorting time for shuttle launch have been revoked!" + world << "\blue All authorizations to shortening time for shuttle launch have been revoked!" src.authorized.len = 0 src.authorized = list( ) diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index 9b433f33f77..479714b6b44 100644 --- a/code/game/machinery/cryo.dm +++ b/code/game/machinery/cryo.dm @@ -4,7 +4,7 @@ icon_state = "cell-off" density = 1 anchored = 1.0 - layer = 5 + layer = 2.8 var/on = 0 var/temperature_archived diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index f6d6b5118db..38dfc6ab4ce 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -318,8 +318,9 @@ if(job && IsJobAvailable(job.title)) var/active = 0 // Only players with the job assigned and AFK for less than 10 minutes count as active - for(var/mob/M in player_list) if(M.mind && M.client && M.mind.assigned_job == job && M.client.inactivity <= 10 * 60 * 10) - active++ + for(var/mob/M in player_list) + if(M.mind && M.mind.assigned_job == job && M.client && M.client.inactivity <= 10 * 60 * 10) + active++ dat += "[job.title] ([job.current_positions]) (Active: [active])
" dat += ""