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

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
@@ -21,6 +21,8 @@
/turf/open/floor/plasteel/dark
icon_state = "darkfull"
/turf/open/floor/plasteel/dark/airless
initial_gas_mix = "TEMP=2.7"
/turf/open/floor/plasteel/dark/telecomms
initial_gas_mix = "n2=100;TEMP=80"
/turf/open/floor/plasteel/dark/telecomms/mainframe
@@ -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