From dedd8478cd7fd10e43b1bc96d16f199d025d4b28 Mon Sep 17 00:00:00 2001
From: "n3ophyt3@gmail.com"
 <n3ophyt3@gmail.com@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Tue, 28 Dec 2010 15:42:03 +0000
Subject: [PATCH] Gave turrets a go-over, they are now marginally less dumb  
 Instead of switching targets every time their code loops, they now stick to
 the same target until it is incapacitated     Turrets set to stun will switch
 targets when their current target is lying down, because they assume it is
 nice and properly stunned     Turrets set to kill will switch targets when
 their current target is dying (or anything else that sets the stat var to 1) 
  The target list now properly updates if people manage to enter or leave the
 protected area in nonstandard ways (teleportation of tech, magic, and badmin
 varieties, mostly)   If turrets are turned off, they will not pop up when
 someone enters their area

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@722 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/game/machinery/turrets.dm | 102 +++++++++++++++++++++++++--------
 1 file changed, 79 insertions(+), 23 deletions(-)

diff --git a/code/game/machinery/turrets.dm b/code/game/machinery/turrets.dm
index 456e23da4f6..e02434fa280 100644
--- a/code/game/machinery/turrets.dm
+++ b/code/game/machinery/turrets.dm
@@ -43,7 +43,8 @@
 
 /area/turret_protected/proc/popDownTurrets()
 	for (var/obj/machinery/turret/aTurret in src)
-		aTurret.popDown()
+		if (!aTurret.isDown())
+			aTurret.popDown()
 
 /obj/machinery/turret
 	name = "turret"
@@ -117,39 +118,94 @@
 		if (istype(loc, /area/turret_protected))
 			src.wasvalid = 1
 			var/area/turret_protected/tarea = loc
+			listcheck()
 
-			if (tarea.turretTargets.len>0)
+			if (tarea.turretTargets.len>0 && enabled)
 				if (!isPopping())
 					if (isDown())
 						popUp()
 					else
-						var/mob/target
-						do
-							target = pick(tarea.turretTargets)
-							src.dir = get_dir(src, target)
-							if (src.enabled)
-								if (istype(target, /mob/living))
-									if (target.stat!=2)
-										src.shootAt(target)
-									else
-										tarea.subjectDied(target)
-										target = null
-								else if (istype(target, /obj/mecha))
-									var/obj/mecha/mecha = target
-									if(!mecha.occupant)
-										if (mecha in tarea.turretTargets)
-											tarea.turretTargets -= mecha
-											target = null
-									else
-										src.shootAt(target)
-						while(!target && tarea.turretTargets.len>0)
-
+						targetting()
+			else
+				if (!isPopping())
+					if (!isDown())
+						popDown()
 		else
 			if (src.wasvalid)
 				src.die()
 			else
 				world << text("ERROR: Turret at [x], [y], [z] is NOT in a turret-protected area!")
 
+/obj/machinery/turret/proc/listcheck()
+	for (var/mob/living/carbon/guy in loc.loc)
+		if (guy in loc.loc:turretTargets)
+			continue
+		if (!guy.stat)
+			loc.loc:turretTargets += guy
+
+
+/obj/machinery/turret/proc/targetting()
+	var/mob/target
+	var/notarget = 0
+	do
+		if (notarget >= 20)
+			return
+		if (target)
+			if ((target.lying && !lasers) || target.stat)
+				target = null
+		if (!target)
+			listcheck()
+			if (!lasers)
+				for (var/mob/possible in loc.loc:turretTargets)
+					if (possible.stat)
+						loc.loc:Exited(possible)
+						notarget++
+						continue
+					if (possible.lying)
+						notarget++
+						continue
+					if (!target)
+						target = possible
+						notarget = 0
+						break
+			else
+				for (var/mob/possible in loc.loc:turretTargets)
+					if (possible.stat)
+						loc.loc:Exited(possible)
+						notarget++
+						continue
+					if (!target)
+						target = possible
+						notarget = 0
+						break
+
+		if (target)
+			src.dir = get_dir(src, target)
+			if (src.enabled)
+				if (istype(target, /mob/living))
+					if (istype(target.loc.loc, loc.loc))
+						if (!target.stat)
+							src.shootAt(target)
+						else
+							loc.loc:Exited(target)
+							target = null
+					else
+						loc.loc:Exited(target)
+						target = null
+				else if (istype(target, /obj/mecha))
+					var/obj/mecha/mecha = target
+					if (istype(target.loc.loc, loc.loc))
+						loc.loc:Exited(target)
+					if(!mecha.occupant)
+						if (mecha in loc.loc:turretTargets)
+							loc.loc:turretTargets -= mecha
+							target = null
+					else
+						src.shootAt(target)
+		else sleep(1)
+	while(!target && loc.loc:turretTargets.len>0)
+
+
 /obj/machinery/turret/proc/isDown()
 	return (invisibility!=0)