cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Makes FBP not go blind from welders (#10707)

Browse Source 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-04-21 15:53:19 -07:00
committed by GitHub
parent 8f76dabfc3
commit ff63262b79
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/__defines/damage_organs.dm
View File

@@ -54,7 +54,7 @@
#define ORGAN_ASSISTED 1 // Like pacemakers, not robotic #define ORGAN_ASSISTED 1 // Like pacemakers, not robotic
#define ORGAN_ROBOT 2 // Fully robotic, no organic parts #define ORGAN_ROBOT 2 // Fully robotic, no organic parts
#define ORGAN_LIFELIKE 3 // Robotic, made to appear organic #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. //Germs and infections.
#define GERM_LEVEL_AMBIENT 110 // Maximum germ level you can reach by standing still. #define GERM_LEVEL_AMBIENT 110 // Maximum germ level you can reach by standing still.

2
code/game/objects/items/weapons/tools/weldingtool.dm
View File

@@ -314,6 +314,8 @@
var/obj/item/organ/internal/eyes/E = H.internal_organs_by_name[O_EYES] var/obj/item/organ/internal/eyes/E = H.internal_organs_by_name[O_EYES]
if(!E) if(!E)
return 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 if(H.nif && H.nif.flag_check(NIF_V_UVFILTER,NIF_FLAGS_VISION)) return //VOREStation Add - NIF
switch(safety) switch(safety)
if(1) if(1)

9
code/modules/organs/internal/eyes.dm
View File

@@ -5,15 +5,13 @@
organ_tag = O_EYES organ_tag = O_EYES
parent_organ = BP_HEAD parent_organ = BP_HEAD
var/list/eye_colour = list(0,0,0) var/list/eye_colour = list(0,0,0)
var/innate_flash_protection = FLASH_PROTECTION_NONE
/obj/item/organ/internal/eyes/robotize() /obj/item/organ/internal/eyes/robotize()
..() ..()
name = "optical sensor" 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 verbs |= /obj/item/organ/internal/eyes/proc/change_eye_color
organ_verbs = list(/obj/item/organ/internal/eyes/proc/change_eye_color) //CHOMPAdd organ_verbs = list(/obj/item/organ/internal/eyes/proc/change_eye_color)
handle_organ_mod_special() //CHOMPAdd handle_organ_mod_special()
/obj/item/organ/internal/eyes/robot /obj/item/organ/internal/eyes/robot
name = "optical sensor" name = "optical sensor"
@@ -103,13 +101,12 @@
owner.eye_blurry += 10 owner.eye_blurry += 10
/obj/item/organ/internal/eyes/proc/get_total_protection(var/flash_protection = FLASH_PROTECTION_NONE) /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) /obj/item/organ/internal/eyes/proc/additional_flash_effects(var/intensity)
return -1 return -1
/obj/item/organ/internal/eyes/emp_act(severity) /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) if(robotic >= ORGAN_ASSISTED)
return return
owner.eye_blurry += (4/severity) owner.eye_blurry += (4/severity)