Merge pull request #15520 from optimumtact/patch-10

Fix how AI turrets assess human perps
This commit is contained in:
duncathan salt
2016-02-14 00:55:47 -06:00
+2 -1
View File
@@ -554,7 +554,6 @@
invisibility = 2
icon_state = "[base_icon_state][off_state]"
/obj/machinery/porta_turret/proc/assess_perp(mob/living/carbon/human/perp)
var/threatcount = 0 //the integer returned
@@ -607,6 +606,8 @@
return threatcount
/obj/machinery/porta_turret/ai/assess_perp(mob/living/carbon/human/perp)
return 10 //AI turrets shoot at everything not in their faction
/obj/machinery/porta_turret/proc/in_faction(mob/target)
if(!(faction in target.faction))