From 38f5faf0a7db97efe6fff86707bd70f03c5ea00b Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 3 Mar 2021 03:00:20 +0100 Subject: [PATCH] [MIRROR] Fixes surrender alert sticking around forever (#3774) * Proper source for surrender status effect (#57312) * Fixes surrender alert sticking around forever Co-authored-by: Yenwodyah --- code/datums/status_effects/neutral.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/status_effects/neutral.dm b/code/datums/status_effects/neutral.dm index 4990a29da3d..9bea1228d33 100644 --- a/code/datums/status_effects/neutral.dm +++ b/code/datums/status_effects/neutral.dm @@ -130,11 +130,11 @@ icon_state = "aimed" /datum/status_effect/grouped/heldup/on_apply() - owner.apply_status_effect(STATUS_EFFECT_SURRENDER) + owner.apply_status_effect(STATUS_EFFECT_SURRENDER, src) return ..() /datum/status_effect/grouped/heldup/on_remove() - owner.remove_status_effect(STATUS_EFFECT_SURRENDER) + owner.remove_status_effect(STATUS_EFFECT_SURRENDER, src) return ..() // holdup is for the person aiming