From 9be1b2ed4e2915ed981b8f0ee38df5cf1bfb4480 Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Tue, 21 Oct 2025 18:00:03 +0200 Subject: [PATCH] [NO GBP] Fixes borg flashing (#93527) ## About The Pull Request Flashing a borg still called a dead proc I forgot to remove from the code. Now it's fixed. ## Why It's Good For The Game Fixes an issue that hasn't been reported yet. I don't have the time to implement any unit test rn tho. ## Changelog :cl: fix: Fixes borg being chiefly unaffected by flashes. /:cl: --- code/modules/assembly/flash.dm | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/code/modules/assembly/flash.dm b/code/modules/assembly/flash.dm index bc28b4146ea..27bb7895195 100644 --- a/code/modules/assembly/flash.dm +++ b/code/modules/assembly/flash.dm @@ -264,19 +264,12 @@ // Attacker lateral to the victim. return DEVIATION_PARTIAL -/obj/item/assembly/flash/attack(mob/living/M, mob/user) +/obj/item/assembly/flash/attack(mob/living/target, mob/user) if(!try_use_flash(user)) return FALSE - . = TRUE - if(!issilicon(M)) - flash_mob(M, user, confusion_duration = 5 SECONDS, targeted = TRUE) - return - flash_silicon(M, user) - - user.visible_message(span_warning("[user] fails to blind [M] with the flash!"), span_warning("You fail to blind [M] with the flash!")) - -/obj/item/assembly/flash/proc/flash_silicon(mob/living/silicon/silicon) + flash_mob(target, user, confusion_duration = 5 SECONDS, targeted = TRUE) + return TRUE /obj/item/assembly/flash/attack_self(mob/living/carbon/user, flag = 0, emp = 0) if(holder)