From d7260c87b964f3637dbc23f366d874f7fcc0822a Mon Sep 17 00:00:00 2001 From: Krausus Date: Sat, 30 May 2015 03:23:47 -0400 Subject: [PATCH] Fixes admins disabling shadowlings/thralls Fixes the Shadowling Hivemind language being entirely deleted and shadowling abilities not being removed --- code/datums/mind.dm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/code/datums/mind.dm b/code/datums/mind.dm index a0ca40d98ca..a096bd6a5f3 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -964,21 +964,17 @@ datum/mind special_role = null current << "Your powers have been quenched! You are no longer a shadowling!" current.spell_list.Cut() + if(current.mind) + current.mind.spell_list.Cut() message_admins("[key_name_admin(usr)] has de-shadowling'ed [current].") log_admin("[key_name(usr)] has de-shadowling'ed [current].") current.verbs -= /mob/living/carbon/human/proc/shadowling_hatch current.verbs -= /mob/living/carbon/human/proc/shadowling_ascendance - if(current.languages) - for(var/datum/language/L in current.languages) - if(L.name == "Shadowling Hivemind") - del(L) + current.remove_language("Shadowling Hivemind") else if(src in ticker.mode.shadowling_thralls) ticker.mode.shadowling_thralls -= src special_role = null - if(current.languages) - for(var/datum/language/L in current.languages) - if(L.name == "Shadowling Hivemind") - del(L) + current.remove_language("Shadowling Hivemind") current << "You have been brainwashed! You are no longer a thrall!" message_admins("[key_name_admin(usr)] has de-thrall'ed [current].") log_admin("[key_name(usr)] has de-thrall'ed [current].")