shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #37268 from ShizCalev/scp-ruin-fix

Browse Source 
Fixes SCP ruin turret faction, fixes hostile mobs attacking turrets in the same faction
This commit is contained in:
Jordan Brown
2018-04-18 12:33:45 -04:00
committed by CitadelStationBot
parent f98040513a
commit 44df2b780e
5 changed files with 31 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/mob/living/simple_animal/hostile/hostile.dm
View File

@@ -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