cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-07-21 05:04:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2023-06-09 21:55:09 -04:00
committed by GitHub
parent 3d53d2bb62
commit 4b77ac894e
1 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/pointdefense.dm
-13
View File
@@ -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