From 52de48dd0a2aa4b8dc6e390874cefca81a8ca5c1 Mon Sep 17 00:00:00 2001 From: skull132 Date: Mon, 4 Jan 2016 15:29:05 +0200 Subject: [PATCH] Enthralling Loyalty Implanted People Vampires can no longer enthrall loyalty implanted people, and will be informed as such. --- code/game/gamemodes/vampire/vampire_powers.dm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/code/game/gamemodes/vampire/vampire_powers.dm b/code/game/gamemodes/vampire/vampire_powers.dm index b54efcc6..00e34610 100644 --- a/code/game/gamemodes/vampire/vampire_powers.dm +++ b/code/game/gamemodes/vampire/vampire_powers.dm @@ -293,9 +293,10 @@ M.current.remove_vampire_blood(150) M.current.verbs -= /client/vampire/proc/vampire_enthrall spawn(1800) M.current.verbs += /client/vampire/proc/vampire_enthrall - else - M.current << "\red You or your target either moved or you dont have enough usable blood." - return + return + else + M.current << "\red You or your target either moved or you dont have enough usable blood." + return /client/vampire/proc/vampire_cloak() set category = "Abilities" @@ -327,14 +328,14 @@ /mob/proc/can_enthrall(mob/living/carbon/C) var/enthrall_safe = 0 -/* for(var/obj/item/weapon/implant/loyalty/L in C) + for(var/obj/item/weapon/implant/loyalty/L in C) if(L && L.implanted) enthrall_safe = 1 break - for(var/obj/item/weapon/implant/traitor/T in C) - if(T && T.implanted) - enthrall_safe = 1 - break*/ +// for(var/obj/item/weapon/implant/traitor/T in C) +// if(T && T.implanted) +// enthrall_safe = 1 +// break if(!C) world.log << "something bad happened on enthralling a mob src is [src] [src.key] \ref[src]" return 0 @@ -526,4 +527,4 @@ bloodold = mind.vampire.bloodusable mind.vampire.bloodusable = max(0, (mind.vampire.bloodusable - amount)) if(bloodold != mind.vampire.bloodusable) - src << "\blue You have [mind.vampire.bloodusable] left to use." \ No newline at end of file + src << "\blue You have [mind.vampire.bloodusable] left to use."