From 79d6f42dfdb083db0998122f356726b6ce67b8a9 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Sat, 28 Oct 2017 01:16:26 -0500
Subject: [PATCH] conflicts

---
 .../clothing/neck/{neck.dm => _neck.dm}       | 19 ++++++++++++++++++-
 code/modules/surgery/eye_surgery.dm           |  2 +-
 tgstation.dme                                 |  2 +-
 3 files changed, 20 insertions(+), 3 deletions(-)
 rename code/modules/clothing/neck/{neck.dm => _neck.dm} (91%)

diff --git a/code/modules/clothing/neck/neck.dm b/code/modules/clothing/neck/_neck.dm
similarity index 91%
rename from code/modules/clothing/neck/neck.dm
rename to code/modules/clothing/neck/_neck.dm
index 2867aa405e..2b66a85fe6 100644
--- a/code/modules/clothing/neck/neck.dm
+++ b/code/modules/clothing/neck/_neck.dm
@@ -1,3 +1,20 @@
+/obj/item/clothing/neck
+	name = "necklace"
+	icon = 'icons/obj/clothing/neck.dmi'
+	body_parts_covered = NECK
+	slot_flags = SLOT_NECK
+	strip_delay = 40
+	equip_delay_other = 40
+
+/obj/item/clothing/neck/worn_overlays(isinhands = FALSE)
+	. = list()
+	if(!isinhands)
+		if(body_parts_covered & HEAD)
+			if(damaged_clothes)
+				. += mutable_appearance('icons/effects/item_damage.dmi', "damagedmask")
+			if(blood_DNA)
+				. += mutable_appearance('icons/effects/blood.dmi', "maskblood")
+
 /obj/item/clothing/neck/tie
 	name = "tie"
 	desc = "A neosilk clip-on tie."
@@ -162,4 +179,4 @@
 	desc = "Damn, it feels good to be a gangster."
 	icon = 'icons/obj/clothing/neck.dmi'
 	icon_state = "bling"
-	item_color = "bling"
+	item_color = "bling"
\ No newline at end of file
diff --git a/code/modules/surgery/eye_surgery.dm b/code/modules/surgery/eye_surgery.dm
index 3e84d48e66..9099489420 100644
--- a/code/modules/surgery/eye_surgery.dm
+++ b/code/modules/surgery/eye_surgery.dm
@@ -35,4 +35,4 @@
 		target.adjustBrainLoss(100)
 	else
 		user.visible_message("<span class='warning'>[user] accidentally stabs [target] right in the brain! Or would have, if [target] had a brain.</span>", "<span class='warning'>You accidentally stab [target] right in the brain! Or would have, if [target] had a brain.</span>")
-	return FALSE
+	return FALSE
\ No newline at end of file
diff --git a/tgstation.dme b/tgstation.dme
index 6c81456840..61117150ba 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -1287,7 +1287,7 @@
 #include "code\modules\clothing\masks\hailer.dm"
 #include "code\modules\clothing\masks\miscellaneous.dm"
 #include "code\modules\clothing\masks\vg_masks.dm"
-#include "code\modules\clothing\neck\neck.dm"
+#include "code\modules\clothing\neck\_neck.dm"
 #include "code\modules\clothing\outfits\ert.dm"
 #include "code\modules\clothing\outfits\event.dm"
 #include "code\modules\clothing\outfits\standard.dm"