From 87c16e39394caed9c048ca2524428a0323b64a76 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Mon, 27 Nov 2017 17:50:46 -0500 Subject: [PATCH] Merge pull request #33112 from AnturK/devilfix Fixes devilstuff --- code/game/gamemodes/devil/game_mode.dm | 2 +- code/modules/admin/admin.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/devil/game_mode.dm b/code/game/gamemodes/devil/game_mode.dm index 722c1f525e..957e261933 100644 --- a/code/game/gamemodes/devil/game_mode.dm +++ b/code/game/gamemodes/devil/game_mode.dm @@ -23,7 +23,7 @@ for(var/D in devils) var/datum/mind/devil = D text += printplayer(devil) - text += printdevilinfo(devil) + text += printdevilinfo(devil.current) text += printobjectives(devil) text += "
" text += "
" diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index d2eebf48a7..22365c4584 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -713,7 +713,7 @@ /datum/admins/proc/output_devil_info(mob/living/M) if(is_devil(M)) - to_chat(usr, SSticker.mode.printdevilinfo(M.mind)) + to_chat(usr, SSticker.mode.printdevilinfo(M)) else to_chat(usr, "[M] is not a devil.")