cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-30 07:28:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update life.dm

Browse Source
This commit is contained in:
Novacat
2021-01-24 19:45:36 -05:00
committed by GitHub
parent 3eceda5bb3
commit 1519b09bc8
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/life.dm
-3
View File
@@ -1322,12 +1322,9 @@
var/obj/item/clothing/glasses/welding/O = glasses
if(!O.up)
found_welder = 1
<<<<<<< HEAD
if(!found_welder && nif && nif.flag_check(NIF_V_UVFILTER,NIF_FLAGS_VISION)) found_welder = 1 //VOREStation Add - NIF
=======
if(istype(glasses, /obj/item/clothing/glasses/sunglasses/thinblindfold))
found_welder = 1
>>>>>>> 49562f4... Merge pull request #7834 from Greenjoe12345/spriteandfold
if(!found_welder && istype(head, /obj/item/clothing/head/welding))
var/obj/item/clothing/head/welding/O = head
if(!O.up)