From 98233171d7fd063f0165ec86a2d43d091065a80d Mon Sep 17 00:00:00 2001
From: mikomyazaki <47489928+mikomyazaki@users.noreply.github.com>
Date: Thu, 13 Aug 2020 19:36:39 +0100
Subject: [PATCH] Turrets create less unnecessary timers (#9685)

---
 code/game/machinery/portable_turret.dm | 5 +++--
 html/changelogs/less_turret_timers.yml | 6 ++++++
 2 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 html/changelogs/less_turret_timers.yml

diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm
index 08cf4096dda..6168447d08a 100644
--- a/code/game/machinery/portable_turret.dm
+++ b/code/game/machinery/portable_turret.dm
@@ -496,8 +496,9 @@
 
 	if(!tryToShootAt(targets))
 		if(!tryToShootAt(secondarytargets) && !resetting) // if no valid targets, go for secondary targets
-			resetting = TRUE
-			addtimer(CALLBACK(src, .proc/reset), 6 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE) // no valid targets, close the cover
+			if(raised || raising) // we've already reset
+				resetting = TRUE
+				addtimer(CALLBACK(src, .proc/reset), 6 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE) // no valid targets, close the cover
 
 	if(targets.len || secondarytargets.len)
 		if(!fast_processing)
diff --git a/html/changelogs/less_turret_timers.yml b/html/changelogs/less_turret_timers.yml
new file mode 100644
index 00000000000..08f17fff2a2
--- /dev/null
+++ b/html/changelogs/less_turret_timers.yml
@@ -0,0 +1,6 @@
+author: mikomyazaki
+
+delete-after: True
+
+changes: 
+  - bugfix: "Turrets no longer constantly try to reset themselves, even when in a dormant state."
\ No newline at end of file