From da469e6f76c1aedc6fce1c9c24c9fd8f2b0dcbfb Mon Sep 17 00:00:00 2001 From: DeityLink Date: Thu, 20 Aug 2015 06:29:08 +0200 Subject: [PATCH] check convertables --- code/game/gamemodes/cult/cult.dm | 4 ++-- code/modules/admin/admin_verbs.dm | 1 + code/modules/admin/verbs/debug.dm | 20 ++++++++++++++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index ce8a341fc1a..4a44ceeba85 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -499,8 +499,8 @@ /datum/game_mode/cult/proc/get_unconvertables() //writepanic("[__FILE__].[__LINE__] ([src.type])([usr ? usr.ckey : ""]) \\/datum/game_mode/cult/proc/get_unconvertables() called tick#: [world.time]") var/list/ucs = list() - for(var/mob/living/carbon/human/player in mob_list) - if(!is_convertable_to_cult(player.mind)) + for(var/mob/living/carbon/human/player in player_list) + if(player.mind && !is_convertable_to_cult(player.mind)) ucs += player.mind return ucs diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index bfd283aa24e..a6a5f71649e 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -178,6 +178,7 @@ var/list/admin_verbs_debug = list( /client/proc/cure_disease, /client/proc/check_bomb, /client/proc/set_teleport_pref, + /client/proc/check_convertables, /client/proc/cmd_admin_find_bad_blood_tracks, #ifdef PROFILE_MACHINES /client/proc/cmd_admin_dump_macprofile, diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index f70fbf63514..34991a0230a 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -1823,6 +1823,26 @@ client/proc/cure_disease() log_admin("[src]/([ckey(src.key)] Cured all mobs of [disease_name == "-Cure All-" ? "all diseases." : "[disease_name]"]") message_admins("[src]/([ckey(src.key)] Cured all mobs of [disease_name == "-Cure All-" ? "all diseases." : "[disease_name]"]") +client/proc/check_convertables() + set name = "Check Convertables" + set category = "Debug" + if(!holder || !ticker || !ticker.mode) return + + var/dat = "" + for(var/mob/M in player_list) + if(!M.mind) + dat += "[M.real_name]/([ckey(src.key)]): NO MIND
" + else if(!istype(M,/mob/living/carbon/human)) + dat += "[M.real_name]/([ckey(src.key)]): NOT HUMAN
" + else if(!is_convertable_to_cult(M.mind)) + dat += "[M.real_name]/([ckey(src.key)]): UNCONVERTABLE
" + else if(M.mind in ticker.mode.cult) + dat += "[M.real_name]/([ckey(src.key)]): CULTIST
" + else + dat += "[M.real_name]/([ckey(src.key)]): CONVERTABLE
" + + usr << dat + /client/proc/spawn_datum(var/object as text) set category = "Debug" set desc = "(datum path) Spawn a datum (turfs NOT supported)"