cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix travis?

Browse Source
This commit is contained in:
Tupinambis
2020-10-01 17:37:53 -05:00
parent f1bc1ccafb
commit a2fbd76a49
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/modules/surgery/organs/eyes.dm
View File

@@ -421,13 +421,6 @@
name = "ipc eyes" name = "ipc eyes"
icon_state = "cybernetic_eyeballs" icon_state = "cybernetic_eyeballs"
<<<<<<< HEAD
/obj/item/organ/eyes/night_vision/spider
name = "spider eyes"
desc = "These eyes seem to have increased sensitivity to bright light, offset by basic night vision."
see_in_dark = 4
flash_protect = -1
=======
/obj/item/organ/eyes/ipc/emp_act(severity) /obj/item/organ/eyes/ipc/emp_act(severity)
. = ..() . = ..()
if(!owner || . & EMP_PROTECT_SELF) if(!owner || . & EMP_PROTECT_SELF)
@@ -436,7 +429,12 @@
owner.flash_act(visual = 1) owner.flash_act(visual = 1)
if(severity >= 70) if(severity >= 70)
owner.adjustOrganLoss(ORGAN_SLOT_EYES, 20) owner.adjustOrganLoss(ORGAN_SLOT_EYES, 20)
>>>>>>> master
/obj/item/organ/eyes/night_vision/spider
name = "spider eyes"
desc = "These eyes seem to have increased sensitivity to bright light, offset by basic night vision."
see_in_dark = 4
flash_protect = -1
#undef BLURRY_VISION_ONE #undef BLURRY_VISION_ONE
#undef BLURRY_VISION_TWO #undef BLURRY_VISION_TWO