From 8269028cdfafb9d1d5ae68cad533f82986d6401b Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Mon, 6 Feb 2017 15:09:28 -0600 Subject: [PATCH] Fixes air inside shuttle, adds to config --- _maps/shuttles/emergency_arena.dmm | 24 ++++++++++++------------ config/unbuyableshuttles.txt | 3 ++- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/_maps/shuttles/emergency_arena.dmm b/_maps/shuttles/emergency_arena.dmm index fc2a6384e97..36ef140c0d6 100644 --- a/_maps/shuttles/emergency_arena.dmm +++ b/_maps/shuttles/emergency_arena.dmm @@ -5,18 +5,18 @@ "e" = (/obj/effect/landmark/shuttle_arena_entrance,/turf/open/indestructible/necropolis/air,/area/lavaland/underground/shuttle_arena) "f" = (/obj/effect/light_emitter,/turf/open/indestructible/necropolis/air,/area/lavaland/underground/shuttle_arena) "g" = (/turf/open/space,/area/space) -"h" = (/turf/closed/indestructible/necropolis,/area/shuttle/escape) -"i" = (/turf/open/indestructible{tag = "icon-cult"; icon_state = "cult"},/area/shuttle/escape) -"j" = (/obj/structure/closet/crate/necropolis/dragon,/turf/open/indestructible{tag = "icon-cult"; icon_state = "cult"},/area/shuttle/escape) -"k" = (/turf/open/indestructible/necropolis/air,/area/shuttle/escape) -"l" = (/obj/structure/fluff/drake_statue,/turf/open/indestructible{tag = "icon-cult"; icon_state = "cult"},/area/shuttle/escape) -"m" = (/obj/structure/closet/crate/necropolis/tendril,/turf/open/indestructible/necropolis/air,/area/shuttle/escape) -"n" = (/obj/structure/fluff/drake_statue,/turf/open/indestructible/necropolis/air,/area/shuttle/escape) -"o" = (/obj/effect/forcefield/arena_shuttle_entrance,/turf/open/indestructible/necropolis/air,/area/shuttle/escape) -"p" = (/obj/effect/forcefield/arena_shuttle_entrance,/obj/docking_port/mobile/emergency{name = "The Arena"; timid = 1},/turf/open/indestructible/necropolis/air,/area/shuttle/escape) -"q" = (/obj/effect/landmark/shuttle_arena_safe,/turf/open/indestructible/necropolis/air,/area/shuttle/escape) -"r" = (/obj/effect/landmark/shuttle_arena_safe,/turf/open/indestructible{tag = "icon-cult"; icon_state = "cult"},/area/shuttle/escape) -"s" = (/obj/structure/healingfountain,/turf/open/indestructible/necropolis/air,/area/shuttle/escape) +"h" = (/turf/closed/indestructible/necropolis,/area/shuttle/escape{noteleport = 1}) +"i" = (/turf/open/indestructible{tag = "icon-cult"; icon_state = "cult"},/area/shuttle/escape{noteleport = 1}) +"j" = (/obj/structure/closet/crate/necropolis/dragon,/turf/open/indestructible{tag = "icon-cult"; icon_state = "cult"},/area/shuttle/escape{noteleport = 1}) +"k" = (/turf/open/indestructible/necropolis/air,/area/shuttle/escape{noteleport = 1}) +"l" = (/obj/structure/fluff/drake_statue,/turf/open/indestructible{tag = "icon-cult"; icon_state = "cult"},/area/shuttle/escape{noteleport = 1}) +"m" = (/obj/structure/closet/crate/necropolis/tendril,/turf/open/indestructible/necropolis/air,/area/shuttle/escape{noteleport = 1}) +"n" = (/obj/structure/fluff/drake_statue,/turf/open/indestructible/necropolis/air,/area/shuttle/escape{noteleport = 1}) +"o" = (/obj/effect/forcefield/arena_shuttle_entrance,/turf/open/indestructible/necropolis/air,/area/shuttle/escape{noteleport = 1}) +"p" = (/obj/effect/forcefield/arena_shuttle_entrance,/obj/docking_port/mobile/emergency{name = "The Arena"; timid = 1},/turf/open/indestructible/necropolis/air,/area/shuttle/escape{noteleport = 1}) +"q" = (/obj/effect/landmark/shuttle_arena_safe,/turf/open/indestructible/necropolis/air,/area/shuttle/escape{noteleport = 1}) +"r" = (/obj/effect/landmark/shuttle_arena_safe,/turf/open/indestructible{tag = "icon-cult"; icon_state = "cult"},/area/shuttle/escape{noteleport = 1}) +"s" = (/obj/structure/healingfountain,/turf/open/indestructible/necropolis/air,/area/shuttle/escape{noteleport = 1}) (1,1,1) = {" aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/config/unbuyableshuttles.txt b/config/unbuyableshuttles.txt index 9a7008d4d9f..6376e0c3703 100644 --- a/config/unbuyableshuttles.txt +++ b/config/unbuyableshuttles.txt @@ -15,4 +15,5 @@ #_maps/shuttles/emergency_mini.dmm #_maps/shuttles/emergency_imfedupwiththisworld.dmm #_maps/shuttles/emergency_goon.dmm -#_maps/shuttles/emergency_wabbajack.dmm \ No newline at end of file +#_maps/shuttles/emergency_wabbajack.dmm +#_maps/shuttles/emergency_arena.dmm \ No newline at end of file