From e0da59f5eab93699be4b4a46d9d076b060ce27cf Mon Sep 17 00:00:00 2001 From: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com> Date: Tue, 3 Sep 2024 10:01:11 -0400 Subject: [PATCH] Borgs get flashed again (#26674) --- code/modules/mob/living/silicon/robot/robot_defense.dm | 2 +- code/modules/mob/living/silicon/robot/robot_mob.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/robot_defense.dm b/code/modules/mob/living/silicon/robot/robot_defense.dm index 9129dd97b27..3e282f1204f 100644 --- a/code/modules/mob/living/silicon/robot/robot_defense.dm +++ b/code/modules/mob/living/silicon/robot/robot_defense.dm @@ -57,7 +57,7 @@ step_away(src, user, 15) /mob/living/silicon/robot/flash_eyes(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0, type = /atom/movable/screen/fullscreen/stretch/flash/noise) - if(!affect_silicon) + if(!affect_silicon || !can_be_flashed()) return Confused(intensity * 4 SECONDS) var/software_damage = (intensity * 40) diff --git a/code/modules/mob/living/silicon/robot/robot_mob.dm b/code/modules/mob/living/silicon/robot/robot_mob.dm index db589f570d4..223d9cfde8d 100644 --- a/code/modules/mob/living/silicon/robot/robot_mob.dm +++ b/code/modules/mob/living/silicon/robot/robot_mob.dm @@ -1765,7 +1765,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( return cell.is_powered() || externally_powered /mob/living/silicon/robot/can_be_flashed(intensity, override_blindness_check) - return eye_protection + return !eye_protection /mob/living/silicon/robot/can_remote_apc_interface(obj/machinery/power/apc/ourapc) if(ourapc.hacked_by_ruin_AI || ourapc.aidisabled)