From 46bc0a93bcc4f2087f08dd53facab6ceb4c8a8a4 Mon Sep 17 00:00:00 2001 From: Kyep Date: Mon, 12 Jun 2017 23:21:26 -0700 Subject: [PATCH] Neca Requests Head jobs are now highlighted. Antags are now highlighted. Fixes some table formatting. Removes a src. No longer permits cryoing mobs already in cryo. --- code/game/machinery/cryopod.dm | 2 +- code/modules/admin/verbs/randomverbs.dm | 24 +++++++++++++++++++++--- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 274e238c182..6a336a5f55e 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -550,7 +550,7 @@ to_chat(user, "You stop [L == user ? "climbing into the cryo pod." : "putting [L] into the cryo pod."]") /obj/machinery/cryopod/proc/take_occupant(var/mob/living/carbon/E, var/willing_factor = 1) - if(src.occupant) + if(occupant) return if(!E) return diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 997589c2e9e..107ae846026 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -891,16 +891,34 @@ Traitors and the like can also be revived with the previous role mostly intact. return var/msg = "SSD Report" - msg += "SSD Players:" + msg += "SSD Players:
" + msg += "" var/mins_ssd + var/job_string + var/key_string + var/role_string for(var/mob/living/carbon/human/H in living_mob_list) if(!H.player_logged) continue if(!H.last_logout) continue mins_ssd = round((world.time - H.last_logout) / 600) - msg += "" - msg += "" + job_string = H.job + key_string = H.key + if(job_string in command_positions) + job_string = "" + job_string + "" + role_string = "" + if(H.mind) + role_string = "[H.mind.special_role]" + if(!H.key && H.mind.key) + key_string = H.mind.key + msg += "" + msg += "" + if(istype(H.loc, /obj/machinery/cryopod)) + msg += "" + else + msg += "" + msg += "" msg += "
KeyReal NameJobMins SSDSpecial RoleAreaPPNCryo
[H.key][H][H.job][mins_ssd] mins[get_area(H)]PPCryo
[key_string][H.real_name][job_string][mins_ssd][role_string][get_area(H)]PPIn CryoCryo
" src << browse(msg, "window=Player_ssd_check")