From 0857207eb1106f591de49d13e9ea76c37c0bb4e2 Mon Sep 17 00:00:00 2001 From: DGamerL <108773801+DGamerL@users.noreply.github.com> Date: Mon, 29 Jul 2024 17:01:38 +0200 Subject: [PATCH] Some borgs now block flashes again (#26280) * Some borgs now block flashes again * Check if it affects silicons * Charlie review --- code/modules/mob/living/silicon/robot/robot_mob.dm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/robot_mob.dm b/code/modules/mob/living/silicon/robot/robot_mob.dm index 1d96d950fa0..db589f570d4 100644 --- a/code/modules/mob/living/silicon/robot/robot_mob.dm +++ b/code/modules/mob/living/silicon/robot/robot_mob.dm @@ -63,8 +63,8 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( var/emagged = FALSE /// Can the robot be emagged? var/is_emaggable = TRUE - /// Is the robot protected from the visual portion of flashbangs and flashes(1)? Are they protected from laser pointer (2)? - var/eye_protection = 0 + /// Is the robot protected from the visual portion of flashbangs and flashes? + var/eye_protection = FALSE /// Is the robot protected from the audio component of flashbangs? Prevents inflicting confusion. var/ear_protection = FALSE /// All incoming damage has this number subtracted from it. @@ -1500,7 +1500,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( req_one_access = list(ACCESS_CENT_SPECOPS) ionpulse = TRUE pdahide = TRUE - eye_protection = 2 // Immunity to flashes and the visual part of flashbangs + eye_protection = TRUE // Immunity to flashes and the visual part of flashbangs ear_protection = TRUE // Immunity to the audio part of flashbangs damage_protection = 10 // Reduce all incoming damage by this number allow_rename = FALSE @@ -1592,7 +1592,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( req_one_access = list(ACCESS_CENT_SPECOPS) ionpulse = TRUE pdahide = TRUE - eye_protection = 2 // Immunity to flashes and the visual part of flashbangs + eye_protection = TRUE // Immunity to flashes and the visual part of flashbangs ear_protection = TRUE // Immunity to the audio part of flashbangs emp_protection = TRUE // Immunity to EMP, due to heavy shielding damage_protection = 20 // Reduce all incoming damage by this number. Very high in the case of /destroyer borgs, since it is an admin-only borg. @@ -1764,6 +1764,9 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( return externally_powered return cell.is_powered() || externally_powered +/mob/living/silicon/robot/can_be_flashed(intensity, override_blindness_check) + return eye_protection + /mob/living/silicon/robot/can_remote_apc_interface(obj/machinery/power/apc/ourapc) if(ourapc.hacked_by_ruin_AI || ourapc.aidisabled) return FALSE