-Fully implemented turrets firing at simple_animals (It was only 1/4 of the way done). Porta-turrets also have to set to neutralize non-human lifeforms in order to shoot at simple_animals.

Fixes Issue 736

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4336 316c924e-a436-60f5-8080-3fe189b3f50e

code/game/machinery/portable_turret.dm

@@ -448,10 +448,13 @@ Status: []<BR>"},
 	var/list/targets = list()		   // list of primary targets
 	var/list/secondarytargets = list() // targets that are least important
 
-	if(src.check_anomalies) // if its set to check for xenos/carps, check for non-mob "crittersssss"
+	if(src.check_anomalies) // if its set to check for xenos/carps, check for non-mob "crittersssss"(And simple_animals)
 		for (var/obj/effect/critter/L in view(7,src))
 			if(L.alive)
 				targets += L
+		for(var/mob/living/simple_animal/C in view(7,src))
+			if(!C.stat)
+				targets += C
 
 	for (var/mob/living/carbon/C in view(7,src)) // loops through all living carbon-based lifeforms in view(12)
 		if(istype(C, /mob/living/carbon/alien) && src.check_anomalies) // git those fukken xenos

code/game/machinery/turrets.dm

@@ -22,6 +22,8 @@
 		var/obj/mecha/Mech = O
 		if( Mech.occupant )
 			turretTargets |= Mech
+	else if(istype(O,/mob/living/simple_animal))
+		turretTargets |= O
 	return 1
 
 /area/turret_protected/Exited(O)
@@ -137,6 +139,11 @@
 			var/obj/mecha/ME = T
 			if( ME.occupant )
 				return 1
+		else if(istype(T,/mob/living/simple_animal))
+			var/mob/living/simple_animal/A = T
+			if( !A.stat )
+				if(lasers)
+					return 1
 	return 0
 
 /obj/machinery/turret/proc/get_new_target()

html/changelog.html

@@ -47,6 +47,14 @@ should be listed in the changelog upon commit tho. Thanks. -->
 
 <!-- To take advantage of the pretty new format (well it was new when I wrote this anyway), open the "add-to-changelog.html" file in any browser and add the stuff and then generate the html code and paste it here -->
 
+<div class="commit sansserif">
+	<h2 class="date">August 7, 2012</h2>
+	<h3 class="author">Sieve updated:</h3>
+	<ul class="changes bgimages16">
+		<li class="bugfix">Turrets now properly fire at simple_animals.</li>
+	</ul>
+</div>
+
 <div class="commit sansserif">
 	<h2 class="date">August 6, 2012</h2>
 	<h3 class="author">Dingus updated:</h3>