From 7cb01f2a2a2b8ebe1ff41de47e20de1ba8556637 Mon Sep 17 00:00:00 2001 From: SmArtKar <44720187+SmArtKar@users.noreply.github.com> Date: Mon, 3 Nov 2025 22:35:12 +0100 Subject: [PATCH] Fixes burnt out cyborg flashes triggering flash VFX (#93752) ## About The Pull Request Closes #93643 ## Changelog :cl: fix: Fixed burnt out cyborg flashes triggering flash VFX /:cl: --- code/modules/assembly/flash.dm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/code/modules/assembly/flash.dm b/code/modules/assembly/flash.dm index 27bb7895195..f3f2cb4ebeb 100644 --- a/code/modules/assembly/flash.dm +++ b/code/modules/assembly/flash.dm @@ -276,6 +276,7 @@ return FALSE if(!AOE_flash(user = user)) return FALSE + return TRUE /obj/item/assembly/flash/emp_act(severity) . = ..() @@ -293,12 +294,14 @@ /obj/item/assembly/flash/cyborg /obj/item/assembly/flash/cyborg/attack(mob/living/M, mob/user) - ..() - new /obj/effect/temp_visual/borgflash(get_turf(src)) + . = ..() + if (.) + new /obj/effect/temp_visual/borgflash(get_turf(src)) /obj/item/assembly/flash/cyborg/attack_self(mob/user) - ..() - new /obj/effect/temp_visual/borgflash(get_turf(src)) + . = ..() + if (.) + new /obj/effect/temp_visual/borgflash(get_turf(src)) /obj/item/assembly/flash/cyborg/attackby(obj/item/W, mob/user, list/modifiers, list/attack_modifiers) return