From d68f0ece6af2c425e4d95403a7bdf52a2f6b38b3 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Thu, 30 Jul 2020 14:52:28 -0400
Subject: [PATCH] Update mecha.dm

---
 code/game/mecha/mecha.dm | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index 0a675ce564d..2fb9c36103f 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -1052,16 +1052,10 @@
 		var/pass_damage = W.force
 		pass_damage = (pass_damage*pass_damage_reduc_mod)	//Apply the reduction of damage from not having enough armor penetration. This is not regular armor values at play.
 		for(var/obj/item/mecha_parts/mecha_equipment/ME in equipment)
-<<<<<<< HEAD
-			pass_damage = ME.handle_projectile_contact(W, pass_damage)
-		src.take_damage(pass_damage,W.damtype)
-		src.check_for_internal_damage(list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST))
-=======
 			pass_damage = ME.handle_projectile_contact(W, user, pass_damage)
 		src.take_damage(pass_damage,W.damtype)	//The take_damage() proc handles armor values
 		if(pass_damage > internal_damage_minimum)	//Only decently painful attacks trigger a chance of mech damage.
 			src.check_for_internal_damage(list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST))
->>>>>>> 55d60d0... Merge pull request #7350 from lbnesquik/Kot-Extra-Mech-branch
 	return
 
 //////////////////////