From e0d9ff04852fe908fe0da8b44bab08c5666faa9e Mon Sep 17 00:00:00 2001 From: Kyep Date: Mon, 22 Aug 2016 01:24:57 -0700 Subject: [PATCH] Fixes issue with dead SSD players --- code/defines/procs/admin.dm | 2 +- code/modules/mob/mob_helpers.dm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/defines/procs/admin.dm b/code/defines/procs/admin.dm index 73224f67d94..ea03d32bd6b 100644 --- a/code/defines/procs/admin.dm +++ b/code/defines/procs/admin.dm @@ -45,7 +45,7 @@ return . /proc/key_name_admin(var/whom, var/include_name = 1) - var/message = "[key_name(whom, 1, include_name)](?)[isAntag(whom) ? "(A)" : ""][isSSD(whom) ? "(SSD!)" : ""] ([admin_jump_link(whom, "holder")])" + var/message = "[key_name(whom, 1, include_name)](?)[isAntag(whom) ? "(A)" : ""][isLivingSSD(whom) ? "(SSD!)" : ""] ([admin_jump_link(whom, "holder")])" return message /proc/log_and_message_admins(var/message as text) diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index be8f617d942..5d5ee9236c8 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -34,8 +34,8 @@ return 1 return 0 -proc/isSSD(mob/M) - return istype(M) && M.player_logged +proc/isLivingSSD(mob/M) + return istype(M) && M.player_logged && M.stat != DEAD proc/isAntag(A) if(istype(A, /mob/living/carbon))