diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index 535c3fea002..d169d4f82bb 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -448,10 +448,13 @@ Status: []
"}, 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 diff --git a/code/game/machinery/turrets.dm b/code/game/machinery/turrets.dm index b1b8c71b8f9..2a728f4b4f4 100644 --- a/code/game/machinery/turrets.dm +++ b/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() diff --git a/html/changelog.html b/html/changelog.html index 94d4cf01888..2f76474424d 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -47,6 +47,14 @@ should be listed in the changelog upon commit tho. Thanks. --> +
+

August 7, 2012

+

Sieve updated:

+ +
+

August 6, 2012

Dingus updated: