Merge pull request #5416 from Citadel-Station-13/upstream-merge-35188

[MIRROR] Adds a SCP-294 ruin
This commit is contained in:
CitadelStationBot
2018-02-11 07:38:37 -06:00
committed by GitHub
12 changed files with 1626 additions and 31 deletions
+4
View File
@@ -462,4 +462,8 @@
/area/ruin/space/has_grav/listeningstation
name = "Listening Post"
icon_state = "yellow"
/area/ruin/space/has_grav/powered/scp_294
name = "Abandoned SCP-294 Containment"
icon_state = "yellow"
@@ -592,6 +592,7 @@
lethal_projectile_sound = 'sound/weapons/lasercannonfire.ogg'
desc = "An energy blaster auto-turret."
/obj/machinery/porta_turret/syndicate/setup()
return
@@ -0,0 +1,10 @@
/obj/effect/spawner/trap
name = "random trap"
icon = 'icons/obj/hand_of_god_structures.dmi'
icon_state = "trap_rand"
/obj/effect/spawner/trap/Initialize(mapload)
..()
var/new_type = pick(subtypesof(/obj/structure/trap) - typesof(/obj/structure/trap/ctf))
new new_type(get_turf(src))
return INITIALIZE_HINT_QDEL
@@ -318,6 +318,8 @@
/turf/open/floor/plasteel/freezer
icon_state = "freezerfloor"
/turf/open/floor/plasteel/freezer/airless
initial_gas_mix = "TEMP=2.7"
/turf/open/floor/plasteel/bar
icon_state = "bar"