From 08af4665b4cfe8f78215a0f40fa7cd8f05d6b742 Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Wed, 13 Dec 2017 16:45:54 -0500
Subject: [PATCH] Update implant.dm

---
 code/game/objects/items/implants/implant.dm | 100 --------------------
 1 file changed, 100 deletions(-)

diff --git a/code/game/objects/items/implants/implant.dm b/code/game/objects/items/implants/implant.dm
index 8b65341d02..7ca82c1236 100644
--- a/code/game/objects/items/implants/implant.dm
+++ b/code/game/objects/items/implants/implant.dm
@@ -1,102 +1,3 @@
-<<<<<<< HEAD
-/obj/item/implant
-	name = "implant"
-	icon = 'icons/obj/implants.dmi'
-	icon_state = "generic" //Shows up as the action button icon
-	actions_types = list(/datum/action/item_action/hands_free/activate)
-	var/activated = 1 //1 for implant types that can be activated, 0 for ones that are "always on" like mindshield implants
-	var/mob/living/imp_in = null
-	item_color = "b"
-	var/allow_multiple = FALSE
-	var/uses = -1
-	flags_1 = DROPDEL_1
-
-
-/obj/item/implant/proc/trigger(emote, mob/living/carbon/source)
-	return
-
-/obj/item/implant/proc/activate()
-	return
-
-/obj/item/implant/ui_action_click()
-	activate("action_button")
-
-/obj/item/implant/proc/can_be_implanted_in(mob/living/target) // for human-only and other special requirements
-	return TRUE
-
-/mob/living/proc/can_be_implanted()
-	return TRUE
-
-/mob/living/silicon/can_be_implanted()
-	return FALSE
-
-/mob/living/simple_animal/can_be_implanted()
-	return healable //Applies to robots and most non-organics, exceptions can override.
-
-
-
-//What does the implant do upon injection?
-//return 1 if the implant injects
-//return 0 if there is no room for implant / it fails
-/obj/item/implant/proc/implant(mob/living/target, mob/user, silent = 0)
-	LAZYINITLIST(target.implants)
-	if(!target.can_be_implanted() || !can_be_implanted_in(target))
-		return 0
-	for(var/X in target.implants)
-		if(istype(X, type))
-			var/obj/item/implant/imp_e = X
-			if(!allow_multiple)
-				if(imp_e.uses < initial(imp_e.uses)*2)
-					if(uses == -1)
-						imp_e.uses = -1
-					else
-						imp_e.uses = min(imp_e.uses + uses, initial(imp_e.uses)*2)
-					qdel(src)
-					return 1
-				else
-					return 0
-
-	src.loc = target
-	imp_in = target
-	target.implants += src
-	if(activated)
-		for(var/X in actions)
-			var/datum/action/A = X
-			A.Grant(target)
-	if(ishuman(target))
-		var/mob/living/carbon/human/H = target
-		H.sec_hud_set_implants()
-
-	if(user)
-		add_logs(user, target, "implanted", object="[name]")
-
-	return 1
-
-/obj/item/implant/proc/removed(mob/living/source, silent = 0, special = 0)
-	src.loc = null
-	imp_in = null
-	source.implants -= src
-	for(var/X in actions)
-		var/datum/action/A = X
-		A.Grant(source)
-	if(ishuman(source))
-		var/mob/living/carbon/human/H = source
-		H.sec_hud_set_implants()
-
-	return 1
-
-/obj/item/implant/Destroy()
-	if(imp_in)
-		removed(imp_in)
-	return ..()
-
-/obj/item/implant/proc/get_data()
-	return "No information available"
-
-/obj/item/implant/dropped(mob/user)
-	. = 1
-	..()
-=======
 /obj/item/implant
 	name = "implant"
 	icon = 'icons/obj/implants.dmi'
@@ -194,4 +95,3 @@
 /obj/item/implant/dropped(mob/user)
 	. = 1
 	..()
->>>>>>> a162837... Replaces a bunch of loc assignments with forcemoves and moves to nullspace (#33465)