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

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

Browse Source 
[MIRROR] Fixes SCP ruin turret faction, fixes hostile mobs attacking turrets in the same faction
This commit is contained in:
LetterJay
2018-04-22 02:44:56 -05:00
committed by GitHub
parent 675243f95e 8f1cd52a36
commit 8cdbc9ef5e
5 changed files with 31 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomRuins/SpaceRuins/scp_294.dmm
+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{