Merge pull request #6452 from Citadel-Station-13/upstream-merge-37268

[MIRROR] Fixes SCP ruin turret faction, fixes hostile mobs attacking turrets in the same faction
2018-04-22 02:44:56 -05:00
parent 675243f95e 8f1cd52a36
commit 8cdbc9ef5e
5 changed files with 31 additions and 28 deletions
@@ -188,7 +188,7 @@

 		if(istype(the_target, /obj/machinery/porta_turret))
 			var/obj/machinery/porta_turret/P = the_target
-			if(P.faction in faction)
+			if(P.in_faction(src)) //Don't attack if the turret is in the same faction
 				return FALSE
 			if(P.has_cover &&!P.raised) //Don't attack invincible turrets
 				return FALSE