From 4b77ac894e8dc8fc24d36d673ff7db6360d91756 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Fri, 9 Jun 2023 21:55:09 -0400
Subject: [PATCH] powder that makes you say yes

---
 code/game/machinery/pointdefense.dm | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/code/game/machinery/pointdefense.dm b/code/game/machinery/pointdefense.dm
index 60fed2c509..a3ceb43efd 100644
--- a/code/game/machinery/pointdefense.dm
+++ b/code/game/machinery/pointdefense.dm
@@ -138,13 +138,8 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/pointdefense)
 	var/charge_cooldown = 1 SECOND  //time between it can fire at different targets
 	var/last_shot = 0
 	var/kill_range = 18
-<<<<<<< HEAD
 	var/rotation_speed = 4.5 SECONDS  //How quickly we turn to face threats
-	var/weakref/engaging = null // The meteor we're shooting at
-=======
-	var/rotation_speed = 0.25 SECONDS  //How quickly we turn to face threats
 	var/datum/weakref/engaging = null // The meteor we're shooting at
->>>>>>> b22b9e6e48... Merge pull request #14936 from ItsSelis/selis-weakrefs
 	var/id_tag = null
 
 /obj/machinery/pointdefense/Initialize()
@@ -204,11 +199,7 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/pointdefense)
 			return FALSE
 	return TRUE
 
-<<<<<<< HEAD
-/obj/machinery/pointdefense/proc/Shoot(var/weakref/target)
-=======
 /obj/machinery/power/pointdefense/proc/Shoot(var/datum/weakref/target)
->>>>>>> b22b9e6e48... Merge pull request #14936 from ItsSelis/selis-weakrefs
 	var/obj/effect/meteor/M = target.resolve()
 	if(!istype(M))
 		engaging = null
@@ -222,12 +213,8 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/pointdefense)
 
 	set_dir(ATAN2(transform.b, transform.a) > 0 ? NORTH : SOUTH)
 
-<<<<<<< HEAD
-/obj/machinery/pointdefense/proc/finish_shot(var/weakref/target)
-=======
 /obj/machinery/power/pointdefense/proc/finish_shot(var/datum/weakref/target)
 
->>>>>>> b22b9e6e48... Merge pull request #14936 from ItsSelis/selis-weakrefs
 	var/obj/machinery/pointdefense_control/PC = get_controller()
 	engaging = null
 	PC.targets -= target