From 9b0bb5f8145d5ae57bdc39692bef2f6a8eacfad3 Mon Sep 17 00:00:00 2001 From: Cameron Lennox Date: Mon, 21 Apr 2025 18:24:28 -0400 Subject: [PATCH] Makes FBP not go blind from welders (#17493) * Makes FBP not go blind from welders Also makes it so the eye color verb is actually attached to the eyes. * Different way * gwah --- code/__defines/damage_organs.dm | 2 +- code/game/objects/items/weapons/tools/weldingtool.dm | 2 ++ code/modules/organs/internal/eyes.dm | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/code/__defines/damage_organs.dm b/code/__defines/damage_organs.dm index 90a77c878b..10e0632afd 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 742ff520b7..764e082b3a 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 89b2c0fb5b..d45be0ae9f 100644 --- a/code/modules/organs/internal/eyes.dm +++ b/code/modules/organs/internal/eyes.dm @@ -11,6 +11,8 @@ ..() name = "optical sensor" verbs |= /obj/item/organ/internal/eyes/proc/change_eye_color + 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" @@ -106,7 +108,6 @@ 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)