From ff63262b79dc03d7651e04444dac1b7ecd4af9d4 Mon Sep 17 00:00:00 2001 From: CHOMPStation2StaffMirrorBot <94713762+CHOMPStation2StaffMirrorBot@users.noreply.github.com> Date: Mon, 21 Apr 2025 15:53:19 -0700 Subject: [PATCH] [MIRROR] Makes FBP not go blind from welders (#10707) Co-authored-by: Cameron Lennox --- code/__defines/damage_organs.dm | 2 +- code/game/objects/items/weapons/tools/weldingtool.dm | 2 ++ code/modules/organs/internal/eyes.dm | 9 +++------ 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/code/__defines/damage_organs.dm b/code/__defines/damage_organs.dm index d9eef97bd7..78b1479085 100644 --- a/code/__defines/damage_organs.dm +++ b/code/__defines/damage_organs.dm @@ -54,7 +54,7 @@ #define ORGAN_ASSISTED 1 // Like pacemakers, not robotic #define ORGAN_ROBOT 2 // Fully robotic, no organic parts #define ORGAN_LIFELIKE 3 // Robotic, made to appear organic -#define ORGAN_NANOFORM 4 // VOREStation Add - Fully nanoswarm organ +#define ORGAN_NANOFORM 4 // Fully nanoswarm organ //Germs and infections. #define GERM_LEVEL_AMBIENT 110 // Maximum germ level you can reach by standing still. diff --git a/code/game/objects/items/weapons/tools/weldingtool.dm b/code/game/objects/items/weapons/tools/weldingtool.dm index efd7125385..08d3c28913 100644 --- a/code/game/objects/items/weapons/tools/weldingtool.dm +++ b/code/game/objects/items/weapons/tools/weldingtool.dm @@ -314,6 +314,8 @@ var/obj/item/organ/internal/eyes/E = H.internal_organs_by_name[O_EYES] if(!E) return + if(user.isSynthetic()) //Fixes robots going blind when doing the equivalent of a bruise pack. + return if(H.nif && H.nif.flag_check(NIF_V_UVFILTER,NIF_FLAGS_VISION)) return //VOREStation Add - NIF switch(safety) if(1) diff --git a/code/modules/organs/internal/eyes.dm b/code/modules/organs/internal/eyes.dm index 13f9ea2c9c..85af29bceb 100644 --- a/code/modules/organs/internal/eyes.dm +++ b/code/modules/organs/internal/eyes.dm @@ -5,15 +5,13 @@ organ_tag = O_EYES parent_organ = BP_HEAD var/list/eye_colour = list(0,0,0) - var/innate_flash_protection = FLASH_PROTECTION_NONE /obj/item/organ/internal/eyes/robotize() ..() name = "optical sensor" - innate_flash_protection = FLASH_PROTECTION_MAJOR // CHOMPedit: So synths can repair brute damage on themselves without needing eye protection, like many other servers. QOL. verbs |= /obj/item/organ/internal/eyes/proc/change_eye_color - organ_verbs = list(/obj/item/organ/internal/eyes/proc/change_eye_color) //CHOMPAdd - handle_organ_mod_special() //CHOMPAdd + organ_verbs = list(/obj/item/organ/internal/eyes/proc/change_eye_color) + handle_organ_mod_special() /obj/item/organ/internal/eyes/robot name = "optical sensor" @@ -103,13 +101,12 @@ owner.eye_blurry += 10 /obj/item/organ/internal/eyes/proc/get_total_protection(var/flash_protection = FLASH_PROTECTION_NONE) - return (flash_protection + innate_flash_protection) + return (flash_protection) /obj/item/organ/internal/eyes/proc/additional_flash_effects(var/intensity) return -1 /obj/item/organ/internal/eyes/emp_act(severity) - // ..() //Returns if the organ isn't robotic // VOREStation Edit - Don't take damage if(robotic >= ORGAN_ASSISTED) return owner.eye_blurry += (4/severity)