From bdae2caa82d9dcc698755b1fce539fc848f1dca4 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Thu, 9 Feb 2023 21:33:25 +0100 Subject: [PATCH] [MIRROR] Effects no longer runtime on being attacked [MDB IGNORE] (#19242) * Effects no longer runtime on being attacked (#73300) ## About The Pull Request Effects didn;t override generic attack, which caused runtimes when attacked ## Why It's Good For The Game Closes #73295 ## Changelog Signed-off-by: GitHub * Effects no longer runtime on being attacked --------- Signed-off-by: GitHub Co-authored-by: Zephyr <12817816+ZephyrTFA@users.noreply.github.com> --- code/game/objects/effects/effects.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/game/objects/effects/effects.dm b/code/game/objects/effects/effects.dm index bb96a9a59d5..c50b54687c9 100644 --- a/code/game/objects/effects/effects.dm +++ b/code/game/objects/effects/effects.dm @@ -19,6 +19,9 @@ return ..() +/obj/effect/attack_generic(mob/user, damage_amount, damage_type, damage_flag, sound_effect, armor_penetration) + return + /obj/effect/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir) return