Skip to content

Commit

Permalink
Revert "add: xray removes tint and eyeprot" (#5908)
Browse files Browse the repository at this point in the history
Revert "add: xray removes tint and eyeprot (#5632)"

This reverts commit fc28dad.
  • Loading branch information
Bizzonium authored Sep 15, 2024
1 parent 9c6ec0c commit 9852dbf
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 13 deletions.
4 changes: 1 addition & 3 deletions code/modules/mob/living/carbon/carbon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -786,9 +786,7 @@ so that different stomachs can handle things in different ways VB*/
if(!GLOB.tinted_weldhelh)
return
var/tinttotal = get_total_tint()
if((sight & (SEE_MOBS|SEE_OBJS|SEE_TURFS)) == (SEE_MOBS|SEE_OBJS|SEE_TURFS))
clear_fullscreen("tint", 0)
else if(tinttotal >= TINT_BLIND)
if(tinttotal >= TINT_BLIND)
overlay_fullscreen("tint", /atom/movable/screen/fullscreen/blind)
else if(tinttotal >= TINT_IMPAIR)
overlay_fullscreen("tint", /atom/movable/screen/fullscreen/impaired, 2)
Expand Down
14 changes: 4 additions & 10 deletions code/modules/mob/living/carbon/human/human.dm
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,6 @@
return

dna.species.update_sight(src)
update_tint()
SEND_SIGNAL(src, COMSIG_MOB_UPDATE_SIGHT)
sync_lighting_plane_alpha()

Expand Down Expand Up @@ -726,22 +725,17 @@
///Returns a number between -1 to 2
/mob/living/carbon/human/check_eye_prot()
var/eye_prot = ..()
var/check = (sight & (SEE_MOBS|SEE_OBJS|SEE_TURFS)) == (SEE_MOBS|SEE_OBJS|SEE_TURFS)
if(istype(head, /obj/item/clothing/head)) //are they wearing something on their head
var/obj/item/clothing/head/HFP = head //if yes gets the flash protection value from that item
if(!check || HFP.flash_protect < 0)
eye_prot += HFP.flash_protect
eye_prot += HFP.flash_protect
if(istype(glasses, /obj/item/clothing/glasses)) //glasses
var/obj/item/clothing/glasses/GFP = glasses
if(!check || GFP.flash_protect < 0)
eye_prot += GFP.flash_protect
eye_prot += GFP.flash_protect
if(istype(wear_mask, /obj/item/clothing/mask)) //mask
var/obj/item/clothing/mask/MFP = wear_mask
if(!check || MFP.flash_protect < 0)
eye_prot += MFP.flash_protect
eye_prot += MFP.flash_protect
for(var/obj/item/organ/internal/cyberimp/eyes/EFP in internal_organs)
if(!check || EFP.flash_protect < 0)
eye_prot += EFP.flash_protect
eye_prot += EFP.flash_protect
return eye_prot


Expand Down

0 comments on commit 9852dbf

Please sign in to comment.