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
+2 -4
View File
@@ -45,14 +45,12 @@
"aj" = (
/obj/machinery/porta_turret/syndicate/energy/heavy{
desc = "An energy blaster auto-turret designed to contain and terminate in case of a breach in security.";
faction = "scp";
faction = list("scp");
mode = 1;
name = "emergency containment breach turret"
},
/obj/effect/turf_decal/box,
/turf/open/floor/plasteel/dark{
initial_gas_mix = "TEMP=2.7"
},
/turf/open/floor/plasteel/dark/airless,
/area/ruin/space/has_grav/powered/scp_294)
"ak" = (
/obj/effect/turf_decal/tile/beige/corner{