From a2fbd76a49b5a0810b15e84a61be606732587ee3 Mon Sep 17 00:00:00 2001 From: Tupinambis Date: Thu, 1 Oct 2020 17:37:53 -0500 Subject: [PATCH] fix travis? --- code/modules/surgery/organs/eyes.dm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/code/modules/surgery/organs/eyes.dm b/code/modules/surgery/organs/eyes.dm index 772bf588af..d5ea708270 100644 --- a/code/modules/surgery/organs/eyes.dm +++ b/code/modules/surgery/organs/eyes.dm @@ -421,13 +421,6 @@ name = "ipc eyes" 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) . = ..() if(!owner || . & EMP_PROTECT_SELF) @@ -436,7 +429,12 @@ owner.flash_act(visual = 1) if(severity >= 70) 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_TWO