From 70640ca8ac545576a4859b6712823a294a9c3aae Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Thu, 19 Nov 2020 19:50:33 -0500
Subject: [PATCH] Update organ_external.dm

---
 code/modules/organs/organ_external.dm | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm
index d732a971a68..0efa1f6d75f 100644
--- a/code/modules/organs/organ_external.dm
+++ b/code/modules/organs/organ_external.dm
@@ -1390,14 +1390,9 @@ Note that amputating the affected organ does in fact remove the infection from t
 	. = 0
 	for(var/obj/item/organ/external/L in organs)
 		for(var/obj/item/I in L.implants)
-<<<<<<< HEAD
 			if(!istype(I,/obj/item/weapon/implant) && !istype(I,/obj/item/device/nif)) //VOREStation Add - NIFs
 				return 1
-=======
-			if(!istype(I,/obj/item/weapon/implant))
-				return 1
 
 /obj/item/organ/external/proc/is_hidden_by_tail()
 	if(owner && owner.tail_style && owner.tail_style.hide_body_parts && (organ_tag in owner.tail_style.hide_body_parts))
 		return 1
->>>>>>> 576d065... Kaleidoscope 2: The Retabbening (#7697)