From a8e458188a1ca8819e9639d1e0fe14c3814c7532 Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Sun, 25 Feb 2018 16:39:35 -0500
Subject: [PATCH] Update inflict_handler.dm

---
 .../spells/spell_types/inflict_handler.dm     | 52 +------------------
 1 file changed, 1 insertion(+), 51 deletions(-)

diff --git a/code/modules/spells/spell_types/inflict_handler.dm b/code/modules/spells/spell_types/inflict_handler.dm
index 0387ccc83f..a1ba69b426 100644
--- a/code/modules/spells/spell_types/inflict_handler.dm
+++ b/code/modules/spells/spell_types/inflict_handler.dm
@@ -1,52 +1,3 @@
-<<<<<<< HEAD
-/obj/effect/proc_holder/spell/targeted/inflict_handler
-	name = "Inflict Handler"
-	desc = "This spell blinds and/or destroys/damages/heals and/or knockdowns/stuns the target."
-
-	var/amt_knockdown = 0
-	var/amt_unconscious = 0
-	var/amt_stun = 0
-
-	//set to negatives for healing
-	var/amt_dam_fire = 0
-	var/amt_dam_brute = 0
-	var/amt_dam_oxy = 0
-	var/amt_dam_tox = 0
-
-	var/amt_eye_blind = 0
-	var/amt_eye_blurry = 0
-
-	var/destroys = "none" //can be "none", "gib" or "disintegrate"
-
-	var/summon_type = null //this will put an obj at the target's location
-
-/obj/effect/proc_holder/spell/targeted/inflict_handler/cast(list/targets,mob/user = usr)
-
-	for(var/mob/living/target in targets)
-		playsound(target,sound, 50,1)
-		switch(destroys)
-			if("gib")
-				target.gib()
-			if("disintegrate")
-				target.dust()
-
-		if(!target)
-			continue
-		//damage/healing
-		target.adjustBruteLoss(amt_dam_brute)
-		target.adjustFireLoss(amt_dam_fire)
-		target.adjustToxLoss(amt_dam_tox)
-		target.adjustOxyLoss(amt_dam_oxy)
-		//disabling
-		target.Knockdown(amt_knockdown)
-		target.Unconscious(amt_unconscious)
-		target.Stun(amt_stun)
-
-		target.blind_eyes(amt_eye_blind)
-		target.blur_eyes(amt_eye_blurry)
-		//summoning
-		if(summon_type)
-=======
 /obj/effect/proc_holder/spell/targeted/inflict_handler
 	name = "Inflict Handler"
 	desc = "This spell blinds and/or destroys/damages/heals and/or knockdowns/stuns the target."
@@ -98,5 +49,4 @@
 		target.blur_eyes(amt_eye_blurry)
 		//summoning
 		if(summon_type)
->>>>>>> 2ac902a... Refactors anti-magic into a component (#35639)
-			new summon_type(target.loc, target)
\ No newline at end of file
+			new summon_type(target.loc, target)