From eb9260c8bf3d3a8c009874cabf99d283a9423c5c Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Sun, 17 Dec 2017 17:38:09 -0600
Subject: [PATCH] Update implantcase.dm

---
 .../objects/items/implants/implantcase.dm     | 82 -------------------
 1 file changed, 82 deletions(-)

diff --git a/code/game/objects/items/implants/implantcase.dm b/code/game/objects/items/implants/implantcase.dm
index aa700b6e37..00bda4dadb 100644
--- a/code/game/objects/items/implants/implantcase.dm
+++ b/code/game/objects/items/implants/implantcase.dm
@@ -1,84 +1,3 @@
-<<<<<<< HEAD
-/obj/item/implantcase
-	name = "implant case"
-	desc = "A glass case containing an implant."
-	icon = 'icons/obj/items_and_weapons.dmi'
-	icon_state = "implantcase-0"
-	item_state = "implantcase"
-	lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
-	throw_speed = 2
-	throw_range = 5
-	w_class = WEIGHT_CLASS_TINY
-	materials = list(MAT_GLASS=500)
-	var/obj/item/implant/imp = null
-	var/imp_type
-
-/obj/item/implantcase/update_icon()
-	if(imp)
-		icon_state = "implantcase-[imp.item_color]"
-		reagents = imp.reagents
-	else
-		icon_state = "implantcase-0"
-		reagents = null
-
-
-/obj/item/implantcase/attackby(obj/item/W, mob/user, params)
-	if(istype(W, /obj/item/pen))
-		var/t = stripped_input(user, "What would you like the label to be?", name, null)
-		if(user.get_active_held_item() != W)
-			return
-		if(!in_range(src, user) && loc != user)
-			return
-		if(t)
-			name = "implant case - '[t]'"
-		else
-			name = "implant case"
-	else if(istype(W, /obj/item/implanter))
-		var/obj/item/implanter/I = W
-		if(I.imp)
-			if(imp || I.imp.imp_in)
-				return
-			I.imp.loc = src
-			imp = I.imp
-			I.imp = null
-			update_icon()
-			I.update_icon()
-		else
-			if(imp)
-				if(I.imp)
-					return
-				imp.loc = I
-				I.imp = imp
-				imp = null
-				update_icon()
-			I.update_icon()
-
-	else
-		return ..()
-
-/obj/item/implantcase/Initialize(mapload)
-	. = ..()
-	if(imp_type)
-		imp = new imp_type(src)
-	update_icon()
-
-
-/obj/item/implantcase/tracking
-	name = "implant case - 'Tracking'"
-	desc = "A glass case containing a tracking implant."
-	imp_type = /obj/item/implant/tracking
-
-/obj/item/implantcase/weapons_auth
-	name = "implant case - 'Firearms Authentication'"
-	desc = "A glass case containing a firearms authentication implant."
-	imp_type = /obj/item/implant/weapons_auth
-
-/obj/item/implantcase/adrenaline
-	name = "implant case - 'Adrenaline'"
-	desc = "A glass case containing an adrenaline implant."
-	imp_type = /obj/item/implant/adrenalin
-=======
 /obj/item/implantcase
 	name = "implant case"
 	desc = "A glass case containing an implant."
@@ -159,4 +78,3 @@
 	name = "implant case - 'Adrenaline'"
 	desc = "A glass case containing an adrenaline implant."
 	imp_type = /obj/item/implant/adrenalin
->>>>>>> 5233ec1... Finishes the forceMove port (#33519)