From 8dd4fd4e669d03158577a771dbfc29c634b74057 Mon Sep 17 00:00:00 2001 From: Arturlang Date: Thu, 21 May 2020 22:26:05 +0300 Subject: [PATCH] Actually fixes mesmerize (#12330) --- code/datums/status_effects/debuffs.dm | 2 ++ code/modules/antagonists/bloodsucker/powers/mesmerize.dm | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm index 4c200f110d..b976ac0fc8 100644 --- a/code/datums/status_effects/debuffs.dm +++ b/code/datums/status_effects/debuffs.dm @@ -120,11 +120,13 @@ /datum/status_effect/mesmerize/on_creation(mob/living/new_owner, set_duration) . = ..() ADD_TRAIT(owner, TRAIT_MUTE, "mesmerize") + ADD_TRAIT(owner, TRAIT_COMBAT_MODE_LOCKED, "mesmerize") owner.add_movespeed_modifier(/datum/movespeed_modifier/status_effect/mesmerize) /datum/status_effect/mesmerize/on_remove() . = ..() REMOVE_TRAIT(owner, TRAIT_MUTE, "mesmerize") + REMOVE_TRAIT(owner, TRAIT_COMBAT_MODE_LOCKED, "mesmerize") owner.remove_movespeed_modifier(/datum/movespeed_modifier/status_effect/mesmerize) /datum/status_effect/mesmerize/on_creation(mob/living/new_owner, set_duration) diff --git a/code/modules/antagonists/bloodsucker/powers/mesmerize.dm b/code/modules/antagonists/bloodsucker/powers/mesmerize.dm index 0a7e87029a..eea80d52f3 100644 --- a/code/modules/antagonists/bloodsucker/powers/mesmerize.dm +++ b/code/modules/antagonists/bloodsucker/powers/mesmerize.dm @@ -117,8 +117,6 @@ RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/ContinueTarget) // 5 second windup addtimer(CALLBACK(src, .proc/apply_effects, L, target, power_time), 6 SECONDS) - ADD_TRAIT(target, TRAIT_COMBAT_MODE_LOCKED, src) - ADD_TRAIT(L, TRAIT_COMBAT_MODE_LOCKED, src) /datum/action/bloodsucker/targeted/mesmerize/proc/apply_effects(aggressor, victim, power_time) var/mob/living/carbon/target = victim @@ -127,7 +125,6 @@ return PowerActivatedSuccessfully() // blood & cooldown only altered if power activated successfully - less "fuck you"-y target.apply_status_effect(STATUS_EFFECT_MESMERIZE, power_time) - REMOVE_TRAIT(L, TRAIT_COMBAT_MODE_LOCKED, src) target.face_atom(L) target.Stun(power_time) to_chat(L, "[target] is fixed in place by your hypnotic gaze.") @@ -136,7 +133,6 @@ spawn(power_time) if(istype(target) && success) target.notransform = FALSE - REMOVE_TRAIT(target, TRAIT_COMBAT_MODE_LOCKED, src) if(istype(L) && target.stat == CONSCIOUS && (target in L.fov_view(10))) // They Woke Up! (Notice if within view) to_chat(L, "[target] has snapped out of their trance.")