From 8914a24d575c592ad43dcc3a43155e460b2ff399 Mon Sep 17 00:00:00 2001 From: ClownMoff <148357670+ClownMoff@users.noreply.github.com> Date: Thu, 26 Sep 2024 16:18:25 +0100 Subject: [PATCH] Updates BoxStation and MetaStation Emergency Shuttles and Adds the Rage Cage Emergency Shuttle (#11189) * Create emergency_ultraraven.dmm * Ultra Raven * emergency casino * RAGECAGE BABY * Update emergency_ultraraven.dmm * Update emergency_ultraraven.dmm * Update emergency_ultraraven.dmm * The Raven costs 120k now * Update emergency_ultraraven.dmm * Update emergency_ultraraven.dmm * spockie changes * a * Update emergency_ragecage.dmm * Update emergency_casino.dmm * Skibidi Toilet, Skibidi-Skibidi Toilet,Skibidi Toilet, Skibidi-Skibidi Toilet,Skibidi Toilet, Skibidi-Skibidi Toilet,Skibidi Toilet, Skibidi-Skibidi Toilet,Skibidi Toilet, Skibidi-Skibidi Toilet,Skibidi Toilet, Skibidi-Skibidi Toilet, * Update emergency_casino.dmm * Update emergency_ultraraven.dmm * AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA * aaaaa * Update emergency_ultraraven.dmm * Update emergency_ultraraven.dmm * Update emergency_ultraraven.dmm * Update emergency_ultraraven.dmm * Update emergency_ultraraven.dmm * Update emergency_ultraraven.dmm * Update emergency_ultraraven.dmm * Update emergency_ragecage.dmm * Update shuttles.dm * Update emergency_ragecage.dmm * Update emergency_meta.dmm * Update emergency_meta.dmm * Update emergency_meta.dmm * uh * Update emergency_meta.dmm * :flushed: * Update emergency_box.dmm * Update emergency_box.dmm * Update emergency_box.dmm * Update emergency_box.dmm * Update emergency_box.dmm * :flushed: * linters * Update emergency_box.dmm * Update emergency_box.dmm --- _maps/shuttles/emergency/emergency_box.dmm | 757 ++++++++--- .../shuttles/emergency/emergency_funnypod.dmm | 1 + _maps/shuttles/emergency/emergency_meta.dmm | 1174 ++++++++++------- .../shuttles/emergency/emergency_ragecage.dmm | 1136 ++++++++++++++++ code/datums/shuttles.dm | 9 + 5 files changed, 2398 insertions(+), 679 deletions(-) create mode 100644 _maps/shuttles/emergency/emergency_ragecage.dmm diff --git a/_maps/shuttles/emergency/emergency_box.dmm b/_maps/shuttles/emergency/emergency_box.dmm index 20ae2977ba325..4905f73d54616 100644 --- a/_maps/shuttles/emergency/emergency_box.dmm +++ b/_maps/shuttles/emergency/emergency_box.dmm @@ -9,93 +9,194 @@ /turf/closed/wall/mineral/titanium/interior, /area/shuttle/escape) "af" = ( -/obj/structure/table, -/obj/machinery/recharger, -/turf/open/floor/mineral/titanium/blue, +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 8 + }, +/turf/open/floor/iron, /area/shuttle/escape) "ag" = ( -/obj/structure/chair/fancy/shuttle{ - dir = 1 - }, -/turf/open/floor/mineral/titanium/blue, +/turf/open/floor/iron, /area/shuttle/escape) "ah" = ( -/obj/machinery/computer/emergency_shuttle, -/turf/open/floor/mineral/titanium/blue, +/obj/effect/turf_decal/siding/thinplating_new/corner{ + dir = 8 + }, +/obj/effect/turf_decal/siding/thinplating_new/corner, +/obj/effect/turf_decal/siding/thinplating_new/corner{ + dir = 4 + }, +/turf/open/floor/iron, /area/shuttle/escape) "ai" = ( -/obj/structure/table, -/obj/item/storage/firstaid/regular{ - pixel_x = 2; - pixel_y = 3 +/obj/structure/chair/fancy/shuttle{ + dir = 4 }, -/obj/item/crowbar, -/obj/item/storage/firstaid/fire, -/turf/open/floor/mineral/titanium/blue, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/iron/techmaint, /area/shuttle/escape) "al" = ( -/obj/machinery/computer/atmos_alert{ +/obj/machinery/computer/crew{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating_new{ dir = 4 }, -/turf/open/floor/mineral/titanium/blue, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/iron/tech/grid, /area/shuttle/escape) "am" = ( /obj/structure/chair/fancy/shuttle{ dir = 8 }, -/turf/open/floor/mineral/titanium/blue, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/iron/techmaint, /area/shuttle/escape) "an" = ( -/turf/open/floor/mineral/titanium/blue, +/obj/item/clothing/suit/hazardvest{ + desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; + name = "emergency lifejacket" + }, +/obj/item/clothing/suit/hazardvest{ + desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; + name = "emergency lifejacket" + }, +/obj/item/clothing/suit/hazardvest{ + desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; + name = "emergency lifejacket" + }, +/obj/item/clothing/suit/hazardvest{ + desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; + name = "emergency lifejacket" + }, +/obj/item/clothing/suit/hazardvest{ + desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; + name = "emergency lifejacket" + }, +/obj/item/tank/internals/emergency_oxygen{ + pixel_x = 3 + }, +/obj/item/tank/internals/emergency_oxygen{ + pixel_x = 3 + }, +/obj/item/tank/internals/emergency_oxygen{ + pixel_x = 3 + }, +/obj/item/tank/internals/emergency_oxygen{ + pixel_x = 3 + }, +/obj/item/tank/internals/emergency_oxygen{ + pixel_x = 3 + }, +/obj/item/clothing/mask/breath{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/clothing/mask/breath{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/clothing/mask/breath{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/clothing/mask/breath{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/clothing/mask/breath{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/clothing/head/utility/hardhat/orange{ + name = "protective hat"; + pixel_y = 9 + }, +/obj/item/clothing/head/utility/hardhat/orange{ + name = "protective hat"; + pixel_y = 9 + }, +/obj/item/clothing/head/utility/hardhat/orange{ + name = "protective hat"; + pixel_y = 9 + }, +/obj/item/clothing/head/utility/hardhat/orange{ + name = "protective hat"; + pixel_y = 9 + }, +/obj/item/clothing/head/utility/hardhat/orange{ + name = "protective hat"; + pixel_y = 9 + }, +/obj/structure/closet/crate{ + name = "lifejackets" + }, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/iron, /area/shuttle/escape) "ao" = ( -/obj/structure/chair/fancy/shuttle{ - dir = 4 - }, -/turf/open/floor/mineral/titanium/blue, +/obj/structure/chair/fancy/shuttle, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/iron/techmaint, /area/shuttle/escape) "ap" = ( -/obj/machinery/computer/security{ +/obj/machinery/computer/communications{ dir = 8 }, -/turf/open/floor/mineral/titanium/blue, +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 8 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/iron/tech/grid, /area/shuttle/escape) "aq" = ( -/obj/machinery/computer/crew{ - dir = 4 +/obj/effect/turf_decal/guideline/guideline_edge/blue{ + dir = 1 }, -/turf/open/floor/mineral/titanium/blue, +/turf/open/floor/iron/white, /area/shuttle/escape) "ar" = ( -/obj/structure/chair/fancy/shuttle{ +/obj/machinery/computer/emergency_shuttle, +/obj/effect/turf_decal/siding/thinplating_new, +/obj/machinery/status_display/evac/directional/north, +/turf/open/floor/iron/tech/grid, +/area/shuttle/escape) +"as" = ( +/obj/effect/turf_decal/guideline/guideline_edge_alt/blue{ dir = 8 }, -/obj/structure/extinguisher_cabinet{ - pixel_y = -30 +/obj/effect/turf_decal/guideline/guideline_half_edge/blue{ + dir = 10 }, -/turf/open/floor/mineral/titanium/blue, -/area/shuttle/escape) -"as" = ( -/obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = -29 +/obj/effect/turf_decal/guideline/guideline_half_edge/blue{ + dir = 4 }, -/turf/open/floor/mineral/titanium, +/obj/machinery/computer/operating{ + dir = 1 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/white/textured, /area/shuttle/escape) "at" = ( -/obj/machinery/button/flasher{ - id = "cockpit_flasher"; - pixel_x = 6; - pixel_y = -24 +/obj/structure/chair/fancy/shuttle{ + dir = 8 }, -/obj/machinery/light, -/turf/open/floor/mineral/titanium, +/obj/structure/extinguisher_cabinet{ + pixel_y = -30 + }, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/iron/techmaint, /area/shuttle/escape) "au" = ( -/obj/machinery/computer/communications{ - dir = 8 +/obj/structure/extinguisher_cabinet{ + pixel_x = -5; + pixel_y = 30 }, -/turf/open/floor/mineral/titanium/blue, +/obj/effect/turf_decal/siding/thinplating_new, +/turf/open/floor/iron, /area/shuttle/escape) "az" = ( /obj/machinery/status_display/evac, @@ -106,46 +207,44 @@ /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "aB" = ( -/obj/machinery/flasher{ - id = "cockpit_flasher"; - pixel_x = 6; - pixel_y = 24 +/obj/machinery/stasis, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/guideline/guideline_edge_alt/blue{ + dir = 4 }, -/obj/machinery/light{ - dir = 1 +/obj/effect/turf_decal/guideline/guideline_half_edge/blue{ + dir = 6 }, -/turf/open/floor/mineral/titanium/blue, +/obj/item/defibrillator/loaded, +/turf/open/floor/iron/white/textured, /area/shuttle/escape) "aC" = ( -/turf/open/floor/mineral/titanium, +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 8 + }, +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 4 + }, +/turf/open/floor/iron, /area/shuttle/escape) "aD" = ( -/obj/structure/closet/emcloset, -/turf/open/floor/mineral/titanium/blue, +/obj/machinery/recharger, +/obj/effect/turf_decal/siding/thinplating_new, +/obj/structure/table/reinforced, +/turf/open/floor/iron/tech/grid, /area/shuttle/escape) "aE" = ( -/obj/structure/table, -/obj/item/storage/firstaid/fire, -/obj/item/storage/firstaid/regular{ - pixel_x = 2; - pixel_y = 3 +/obj/effect/turf_decal/bot_white, +/obj/structure/chair/fancy/shuttle{ + dir = 1 }, -/obj/item/crowbar, -/turf/open/floor/mineral/titanium/blue, +/turf/open/floor/iron/techmaint, /area/shuttle/escape) "aF" = ( -/obj/machinery/flasher{ - id = "shuttle_flasher"; - pixel_x = -24; - pixel_y = 6 - }, -/obj/machinery/button/flasher{ - id = "shuttle_flasher"; - pixel_x = -24; - pixel_y = -6 +/obj/structure/chair/fancy/shuttle{ + dir = 4 }, -/obj/machinery/light/small{ - brightness = 3; +/obj/machinery/light{ dir = 8 }, /turf/open/floor/mineral/plastitanium/red/brig, @@ -160,28 +259,28 @@ /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "aK" = ( -/obj/structure/chair/fancy/shuttle, -/turf/open/floor/mineral/titanium/blue, +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 1 + }, +/turf/open/floor/iron, /area/shuttle/escape) "aM" = ( /obj/structure/table, -/turf/open/floor/mineral/titanium/blue, +/turf/open/floor/iron/techmaint, /area/shuttle/escape) "aQ" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = -5; - pixel_y = 30 +/obj/effect/turf_decal/siding/thinplating_new/corner{ + dir = 8 }, -/turf/open/floor/mineral/titanium, +/obj/effect/turf_decal/siding/thinplating_new/corner, +/turf/open/floor/iron, /area/shuttle/escape) "aR" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 27 }, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/mineral/titanium, +/obj/effect/turf_decal/siding/thinplating_new, +/turf/open/floor/iron, /area/shuttle/escape) "aS" = ( /obj/structure/chair/fancy/shuttle{ @@ -190,7 +289,8 @@ /obj/structure/window/reinforced{ dir = 4 }, -/turf/open/floor/mineral/titanium/blue, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/iron/techmaint, /area/shuttle/escape) "aT" = ( /obj/structure/chair/fancy/shuttle{ @@ -199,13 +299,20 @@ /obj/structure/window/reinforced{ dir = 8 }, -/turf/open/floor/mineral/titanium/blue, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/iron/techmaint, /area/shuttle/escape) "aW" = ( /obj/structure/extinguisher_cabinet{ pixel_y = -30 }, -/turf/open/floor/mineral/titanium, +/obj/effect/turf_decal/siding/thinplating_new/corner{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating_new/corner{ + dir = 1 + }, +/turf/open/floor/iron, /area/shuttle/escape) "bb" = ( /turf/open/floor/mineral/titanium/yellow, @@ -218,23 +325,37 @@ /area/shuttle/escape) "bd" = ( /obj/machinery/stasis, -/turf/open/floor/mineral/titanium/white, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/guideline/guideline_edge_alt/blue, +/obj/effect/turf_decal/guideline/guideline_half_edge/blue{ + dir = 9 + }, +/obj/effect/turf_decal/guideline/guideline_half_edge/blue{ + dir = 1 + }, +/turf/open/floor/iron/white/textured, /area/shuttle/escape) "be" = ( /obj/structure/table, -/obj/item/storage/firstaid/fire, -/obj/item/storage/firstaid/regular{ - pixel_x = 2; - pixel_y = 3 - }, -/obj/item/crowbar, /obj/structure/extinguisher_cabinet{ pixel_x = 27 }, -/obj/machinery/light/small{ +/obj/effect/turf_decal/guideline/guideline_edge/blue{ + dir = 8 + }, +/obj/item/storage/firstaid/regular{ + pixel_x = -10; + pixel_y = 7 + }, +/obj/item/storage/firstaid/o2{ + pixel_x = 6; + pixel_y = 7 + }, +/obj/item/storage/firstaid/toxin, +/obj/machinery/light{ dir = 4 }, -/turf/open/floor/mineral/titanium/white, +/turf/open/floor/iron/white/textured, /area/shuttle/escape) "bf" = ( /obj/structure/closet, @@ -263,31 +384,40 @@ /turf/open/floor/plating/airless, /area/shuttle/escape) "bl" = ( -/obj/machinery/light/small{ +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 1 + }, +/obj/machinery/light{ dir = 4 }, -/turf/open/floor/mineral/titanium/blue, +/turf/open/floor/iron, /area/shuttle/escape) "bm" = ( -/obj/structure/table, -/obj/machinery/light{ - dir = 8 +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 4 }, -/turf/open/floor/mineral/titanium/blue, +/turf/open/floor/iron, /area/shuttle/escape) "bn" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/mineral/titanium, +/obj/effect/turf_decal/siding/thinplating_new, +/turf/open/floor/iron, /area/shuttle/escape) "bo" = ( -/obj/machinery/light/small, -/turf/open/floor/mineral/titanium, +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 1 + }, +/obj/machinery/light, +/turf/open/floor/iron, /area/shuttle/escape) "bp" = ( /obj/machinery/light, -/turf/open/floor/mineral/titanium, +/obj/effect/turf_decal/siding/thinplating_new/corner{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating_new/corner{ + dir = 1 + }, +/turf/open/floor/iron, /area/shuttle/escape) "bq" = ( /obj/machinery/light/small{ @@ -303,14 +433,65 @@ /turf/open/floor/mineral/titanium/yellow, /area/shuttle/escape) "bs" = ( -/obj/machinery/light/small{ - brightness = 3; +/obj/structure/table/optable, +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/turf_decal/guideline/guideline_edge/blue{ + dir = 4 + }, +/obj/item/storage/backpack/duffelbag/med/surgery{ + pixel_y = 7 + }, +/obj/item/surgical_drapes, +/turf/open/floor/iron/white/textured, +/area/shuttle/escape) +"ds" = ( +/obj/structure/extinguisher_cabinet{ + pixel_x = 27 + }, +/obj/structure/closet/emcloset, +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 1 + }, +/obj/machinery/light, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/iron, +/area/shuttle/escape) +"ef" = ( +/obj/structure/table, +/obj/machinery/recharger{ + pixel_y = 5; + pixel_x = 7 + }, +/obj/item/storage/box/handcuffs{ + pixel_x = -8; + pixel_y = 2 + }, +/turf/open/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) +"es" = ( +/obj/effect/turf_decal/siding/thinplating_new/corner{ dir = 8 }, -/turf/open/floor/mineral/titanium/white, +/obj/effect/turf_decal/siding/thinplating_new/corner, +/obj/effect/turf_decal/siding/thinplating_new/corner{ + dir = 1 + }, +/turf/open/floor/iron, /area/shuttle/escape) "ga" = ( -/turf/open/floor/mineral/titanium/white, +/obj/effect/turf_decal/tile/blue/diagonal_centre, +/turf/open/floor/iron/white, +/area/shuttle/escape) +"jX" = ( +/obj/machinery/computer/atmos_alert{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 4 + }, +/turf/open/floor/iron/tech/grid, /area/shuttle/escape) "mA" = ( /obj/machinery/door/airlock/titanium{ @@ -319,12 +500,81 @@ /obj/structure/fans/tiny, /turf/open/floor/plating, /area/shuttle/escape) +"mU" = ( +/obj/effect/turf_decal/siding/thinplating_new, +/obj/effect/turf_decal/siding/thinplating_new/corner{ + dir = 4 + }, +/turf/open/floor/iron, +/area/shuttle/escape) +"qi" = ( +/obj/structure/chair/fancy/shuttle{ + dir = 4 + }, +/obj/effect/turf_decal/bot_white, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/iron/techmaint, +/area/shuttle/escape) +"qO" = ( +/obj/machinery/button/flasher{ + id = "cockpit_flasher"; + pixel_x = 6; + pixel_y = -24 + }, +/turf/open/floor/iron, +/area/shuttle/escape) +"tF" = ( +/obj/structure/chair/fancy/shuttle{ + dir = 1 + }, +/obj/effect/turf_decal/bot_white, +/obj/effect/turf_decal/siding/thinplating_new, +/turf/open/floor/iron/techmaint, +/area/shuttle/escape) +"wq" = ( +/obj/item/radio/intercom{ + name = "Station Intercom (General)"; + pixel_y = -29 + }, +/turf/open/floor/iron, +/area/shuttle/escape) +"yM" = ( +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 4 + }, +/obj/effect/turf_decal/bot_white, +/obj/structure/tank_dispenser/oxygen, +/turf/open/floor/iron, +/area/shuttle/escape) +"Ao" = ( +/obj/effect/turf_decal/siding/thinplating_new, +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 1 + }, +/turf/open/floor/iron, +/area/shuttle/escape) +"BN" = ( +/obj/machinery/computer/security{ + dir = 8 + }, +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 8 + }, +/turf/open/floor/iron/tech/grid, +/area/shuttle/escape) "Dd" = ( /obj/machinery/door/airlock/titanium{ name = "Emergency Shuttle Cargo" }, /obj/machinery/door/firedoor, -/turf/open/floor/mineral/titanium/blue, +/turf/open/floor/mineral/titanium/yellow, +/area/shuttle/escape) +"FC" = ( +/obj/structure/chair/fancy/shuttle, +/obj/machinery/status_display/evac/directional/north, +/turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "Gx" = ( /obj/machinery/door/airlock/titanium{ @@ -334,6 +584,24 @@ /obj/structure/fans/tiny, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) +"HD" = ( +/obj/effect/turf_decal/guideline/guideline_edge/blue, +/turf/open/floor/iron/white, +/area/shuttle/escape) +"IL" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/command/glass{ + name = "Cockpit"; + req_access_txt = "19" + }, +/turf/open/floor/iron, +/area/shuttle/escape) +"JT" = ( +/obj/structure/chair/fancy/shuttle{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) "JW" = ( /obj/effect/spawner/structure/window/shuttle, /turf/open/floor/plating, @@ -348,32 +616,128 @@ /obj/structure/fans/tiny, /turf/open/floor/plating, /area/shuttle/escape) +"KS" = ( +/obj/structure/chair/fancy/shuttle{ + dir = 8 + }, +/obj/effect/turf_decal/bot_white, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/iron/techmaint, +/area/shuttle/escape) "Lm" = ( /obj/machinery/door/airlock/public/glass{ name = "Emergency Shuttle Infirmary" }, /obj/machinery/door/firedoor, -/turf/open/floor/mineral/titanium/white, +/obj/effect/turf_decal/guideline/guideline_edge/blue{ + dir = 4 + }, +/obj/effect/turf_decal/guideline/guideline_edge/blue{ + dir = 8 + }, +/obj/effect/turf_decal/caution/stand_clear, +/turf/open/floor/iron/dark, +/area/shuttle/escape) +"Np" = ( +/obj/item/storage/firstaid/regular{ + pixel_x = 2; + pixel_y = 3 + }, +/obj/item/crowbar, +/obj/item/storage/firstaid/fire, +/obj/effect/turf_decal/siding/thinplating_new, +/obj/structure/table/reinforced, +/turf/open/floor/iron/tech/grid, +/area/shuttle/escape) +"Nq" = ( +/obj/machinery/flasher{ + id = "shuttle_flasher"; + pixel_x = -24; + pixel_y = 6 + }, +/obj/machinery/button/flasher{ + id = "shuttle_flasher"; + pixel_x = -24; + pixel_y = -6 + }, +/obj/structure/chair/fancy/shuttle{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) +"Pt" = ( +/obj/effect/turf_decal/caution{ + dir = 4 + }, +/obj/effect/turf_decal/guideline/guideline_tri/blue{ + dir = 8 + }, +/obj/effect/turf_decal/guideline/guideline_tri/blue{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/shuttle/escape) +"PC" = ( +/obj/effect/turf_decal/siding/thinplating_new/corner{ + dir = 8 + }, +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 1 + }, +/turf/open/floor/iron, /area/shuttle/escape) "RE" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Emergency Shuttle Brig"; - req_access_txt = "2" +/obj/structure/chair/fancy/shuttle{ + dir = 4 }, -/obj/machinery/door/firedoor, -/turf/open/floor/mineral/titanium, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/effect/turf_decal/siding/thinplating_new, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/iron/techmaint, /area/shuttle/escape) -"Ta" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Emergency Shuttle Cockpit"; - req_access_txt = "19" +"TU" = ( +/obj/effect/turf_decal/siding/thinplating_new/corner{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating_new/corner{ + dir = 1 }, +/turf/open/floor/iron, +/area/shuttle/escape) +"UI" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Brig"; + req_access_txt = "2" + }, +/turf/open/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) +"US" = ( /obj/machinery/door/firedoor, -/turf/open/floor/mineral/titanium, +/obj/machinery/door/airlock/security/glass{ + name = "Brig"; + req_access_txt = "2" + }, +/turf/open/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) +"Vh" = ( +/obj/structure/table, +/obj/machinery/status_display/evac/directional/north, +/turf/open/floor/iron/techmaint, /area/shuttle/escape) "XC" = ( -/obj/structure/closet/emcloset, -/turf/open/floor/mineral/titanium/white, +/obj/effect/turf_decal/guideline/guideline_edge_alt/blue{ + dir = 1 + }, +/obj/effect/turf_decal/guideline/guideline_half_edge/blue{ + dir = 5 + }, +/obj/effect/turf_decal/guideline/guideline_half_edge/blue, +/obj/effect/turf_decal/box, +/turf/open/floor/iron/white, /area/shuttle/escape) (1,1,1) = {" @@ -384,6 +748,7 @@ aa ad ad ad +ad Gx ad Km @@ -406,16 +771,17 @@ ad ad ad ad -aA +ef +Nq aF aG ad bn -ao -ao -ao -ao -ao +qi +ai +ai +ai +ai bo ad bb @@ -427,13 +793,14 @@ ad (3,1,1) = {" ad ae +jX al -aq ad -aA +FC aG -aJ -ad +aG +aG +UI aQ aC aC @@ -450,21 +817,22 @@ bk "} (4,1,1) = {" JW -af +aD am -ar +at ad aA aG +aG aJ ad -aC +au aS aS aS aS aS -aC +aK Dd bb bb @@ -474,21 +842,22 @@ bk "} (5,1,1) = {" JW +tF ag -aC -as +wq ad -JW -RE -JW -bj -aC +aA +JT +aG +JT +ad +bn aT aT aT aT aT -aC +aK ad bc br @@ -497,17 +866,18 @@ bi bk "} (6,1,1) = {" +ad +ar +ag +qO +ad +JW JW +US +JW +bj ah aC -at -ad -aB -aC -aK -bm -aC -aC aC aC aC @@ -522,73 +892,76 @@ bk "} (7,1,1) = {" JW +tF ag -aC -aC -Ta -aC -aC +ag +IL +ag +ag +bn ao aM -aC +Ao aS aS aS aS aS -aC +aK JW XC bs -XC +as bi bk "} (8,1,1) = {" JW +Np ai +ai +ad +yM +bm +mU ao -ao -az -an -aC aM -aM -aC -aT +Ao +RE aT aT aT aT -aC +aK Lm +Pt ga -ga -ga +aq bi bk "} (9,1,1) = {" ad ae +BN ap -au ad -aD -aC -aC -aC -aC -aC +Vh +aE +PC +af +af +es aC aC aC aC aC +TU JW +HD ga -ga -ga +aq bi bk "} @@ -598,19 +971,20 @@ ad ad ad ad +aM aE bl -an +ag an aR +KS am am am am -am -aR +ds JW -bd +aB be bd ad @@ -624,6 +998,7 @@ aa ad JW ad +ad JW ad ad diff --git a/_maps/shuttles/emergency/emergency_funnypod.dmm b/_maps/shuttles/emergency/emergency_funnypod.dmm index 84e5505309e15..79c7854ca2a47 100644 --- a/_maps/shuttles/emergency/emergency_funnypod.dmm +++ b/_maps/shuttles/emergency/emergency_funnypod.dmm @@ -23,6 +23,7 @@ name = "Escape Pod Airlock" }, /obj/docking_port/mobile/emergency, +/obj/structure/fans/tiny, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "R" = ( diff --git a/_maps/shuttles/emergency/emergency_meta.dmm b/_maps/shuttles/emergency/emergency_meta.dmm index a968c28f5da78..2cd54480bb07b 100644 --- a/_maps/shuttles/emergency/emergency_meta.dmm +++ b/_maps/shuttles/emergency/emergency_meta.dmm @@ -15,132 +15,74 @@ /area/shuttle/escape) "al" = ( /obj/structure/table, -/obj/item/phone{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/cigbutt/cigarbutt{ - pixel_x = 5; - pixel_y = -1 +/obj/item/storage/fancy/donut_box, +/turf/open/floor/iron/dark/side{ + dir = 4 }, -/turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "am" = ( -/obj/machinery/computer/crew, -/turf/open/floor/mineral/titanium/blue, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 9 + }, +/turf/open/floor/carpet/blue, /area/shuttle/escape) "an" = ( -/obj/machinery/computer/security, -/turf/open/floor/mineral/titanium/blue, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 1 + }, +/obj/structure/chair/fancy/corp{ + dir = 1 + }, +/turf/open/floor/carpet/blue, /area/shuttle/escape) "ao" = ( /obj/structure/table, -/obj/item/storage/firstaid/regular, -/turf/open/floor/mineral/titanium/blue, +/obj/item/restraints/handcuffs{ + pixel_y = 3 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 1 + }, +/turf/open/floor/carpet/blue, /area/shuttle/escape) "ap" = ( -/obj/structure/closet/emcloset, -/turf/open/floor/mineral/titanium/blue, +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/closet/firecloset, +/obj/effect/turf_decal/box, +/turf/open/floor/mineral/plastitanium, /area/shuttle/escape) "aq" = ( -/turf/open/floor/mineral/titanium/blue, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 8 + }, +/obj/structure/chair/fancy/corp{ + dir = 8 + }, +/turf/open/floor/carpet/blue, /area/shuttle/escape) "ar" = ( -/obj/structure/chair/fancy/shuttle, -/turf/open/floor/mineral/titanium/blue, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, /area/shuttle/escape) "as" = ( -/obj/item/radio/intercom{ - dir = 4; - name = "Station Intercom (General)"; - pixel_y = 27 - }, -/obj/structure/chair/fancy/shuttle, -/obj/machinery/light{ - dir = 1 +/obj/effect/decal/cleanable/dirt, +/obj/machinery/holopad{ + pixel_x = 16 }, -/turf/open/floor/mineral/titanium/blue, +/turf/open/floor/iron, /area/shuttle/escape) "at" = ( -/obj/item/clothing/suit/hazardvest{ - desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; - name = "emergency lifejacket" - }, -/obj/item/clothing/suit/hazardvest{ - desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; - name = "emergency lifejacket" - }, -/obj/item/clothing/suit/hazardvest{ - desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; - name = "emergency lifejacket" - }, -/obj/item/clothing/suit/hazardvest{ - desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; - name = "emergency lifejacket" - }, -/obj/item/clothing/suit/hazardvest{ - desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; - name = "emergency lifejacket" - }, -/obj/item/tank/internals/emergency_oxygen{ - pixel_x = 3 - }, -/obj/item/tank/internals/emergency_oxygen{ - pixel_x = 3 - }, -/obj/item/tank/internals/emergency_oxygen{ - pixel_x = 3 - }, -/obj/item/tank/internals/emergency_oxygen{ - pixel_x = 3 - }, -/obj/item/tank/internals/emergency_oxygen{ - pixel_x = 3 - }, -/obj/item/clothing/mask/breath{ - pixel_x = -3; - pixel_y = -3 - }, -/obj/item/clothing/mask/breath{ - pixel_x = -3; - pixel_y = -3 - }, -/obj/item/clothing/mask/breath{ - pixel_x = -3; - pixel_y = -3 - }, -/obj/item/clothing/mask/breath{ - pixel_x = -3; - pixel_y = -3 - }, -/obj/item/clothing/mask/breath{ - pixel_x = -3; - pixel_y = -3 - }, -/obj/item/clothing/head/utility/hardhat/orange{ - name = "protective hat"; - pixel_y = 9 - }, -/obj/item/clothing/head/utility/hardhat/orange{ - name = "protective hat"; - pixel_y = 9 - }, -/obj/item/clothing/head/utility/hardhat/orange{ - name = "protective hat"; - pixel_y = 9 - }, -/obj/item/clothing/head/utility/hardhat/orange{ - name = "protective hat"; - pixel_y = 9 - }, -/obj/item/clothing/head/utility/hardhat/orange{ - name = "protective hat"; - pixel_y = 9 - }, -/obj/structure/closet/crate{ - name = "lifejackets" +/obj/machinery/status_display/evac{ + dir = 8; + pixel_x = 32 }, -/turf/open/floor/mineral/titanium/blue, +/turf/open/floor/iron, /area/shuttle/escape) "au" = ( /obj/structure/shuttle/engine/propulsion{ @@ -158,64 +100,67 @@ /turf/open/floor/plating/airless, /area/shuttle/escape) "aw" = ( -/obj/structure/table, -/obj/item/storage/fancy/donut_box, -/turf/open/floor/mineral/titanium/blue, -/area/shuttle/escape) -"ax" = ( -/obj/structure/chair/office{ - dir = 1 - }, -/turf/open/floor/mineral/titanium/blue, -/area/shuttle/escape) -"ay" = ( -/obj/structure/table, -/obj/item/restraints/handcuffs{ - pixel_y = 3 +/obj/machinery/computer/communications{ + dir = 4 }, -/obj/machinery/light{ +/turf/open/floor/iron/dark/side{ dir = 4 }, -/turf/open/floor/mineral/titanium/blue, +/area/shuttle/escape) +"ax" = ( +/turf/open/floor/carpet/blue, /area/shuttle/escape) "az" = ( /obj/machinery/status_display/evac, /turf/closed/wall/mineral/titanium, /area/shuttle/escape) "aA" = ( -/obj/structure/tank_dispenser/oxygen{ - pixel_x = -1; - pixel_y = 2 - }, -/turf/open/floor/mineral/titanium/blue, +/obj/effect/turf_decal/box, +/obj/structure/tank_dispenser/oxygen, +/turf/open/floor/mineral/plastitanium, /area/shuttle/escape) "aB" = ( -/obj/machinery/computer/communications{ +/obj/machinery/computer/emergency_shuttle{ + dir = 4 + }, +/turf/open/floor/iron/dark/side{ dir = 4 }, -/turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "aC" = ( -/obj/structure/chair/office, -/turf/open/floor/mineral/titanium/blue, -/area/shuttle/escape) -"aE" = ( -/obj/structure/chair/fancy/shuttle{ +/obj/structure/table, +/obj/item/folder/blue, +/obj/structure/extinguisher_cabinet{ + dir = 4; + pixel_y = -27 + }, +/turf/open/floor/iron/dark/side{ dir = 1 }, -/turf/open/floor/mineral/titanium/blue, +/area/shuttle/escape) +"aE" = ( +/obj/structure/flora/ausbushes/grassybush, +/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/ausbushes/brflowers, +/obj/structure/flora/ausbushes/leafybush, +/obj/structure/window/shuttle, +/turf/open/floor/grass, /area/shuttle/escape) "aF" = ( -/obj/machinery/computer/emergency_shuttle{ +/obj/machinery/computer/station_alert{ + dir = 4 + }, +/turf/open/floor/iron/dark/side{ dir = 4 }, -/turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "aG" = ( -/obj/structure/chair/office{ - dir = 8 +/obj/machinery/recharge_station, +/obj/effect/turf_decal/delivery, +/obj/machinery/light{ + dir = 1 }, -/turf/open/floor/mineral/titanium/blue, +/turf/open/floor/iron, /area/shuttle/escape) "aI" = ( /obj/machinery/vending/wallmed{ @@ -229,27 +174,25 @@ /turf/closed/wall/mineral/titanium, /area/shuttle/escape) "aL" = ( -/obj/machinery/computer/station_alert{ +/obj/structure/table, +/obj/item/storage/toolbox/emergency{ + pixel_y = 3 + }, +/turf/open/floor/iron/dark/side{ dir = 4 }, -/turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "aN" = ( -/obj/machinery/status_display/evac{ - dir = 8; - pixel_x = 32 +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/blue{ + dir = 1 }, -/obj/machinery/holopad, -/turf/open/floor/mineral/titanium, -/area/shuttle/escape) -"aO" = ( -/obj/structure/table, -/obj/item/storage/toolbox/emergency{ - pixel_y = 3 +/obj/machinery/door/airlock/medical/glass{ + name = "Escape Shuttle Infirmary" }, -/turf/open/floor/mineral/titanium/blue, +/turf/open/floor/iron/white, /area/shuttle/escape) -"aP" = ( +"aO" = ( /obj/structure/table, /obj/machinery/recharger{ active_power_usage = 0; @@ -257,28 +200,16 @@ pixel_y = 4; use_power = 0 }, -/turf/open/floor/mineral/titanium/blue, -/area/shuttle/escape) -"aQ" = ( -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = -2; - pixel_y = 8 - }, -/obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = -31 +/turf/open/floor/iron/dark/corner{ + dir = 4 }, -/turf/open/floor/mineral/titanium/blue, +/area/shuttle/escape) +"aP" = ( +/turf/open/floor/iron/dark, /area/shuttle/escape) "aR" = ( -/obj/structure/table, -/obj/item/folder/blue, -/obj/structure/extinguisher_cabinet{ - dir = 4; - pixel_y = -27 - }, -/turf/open/floor/mineral/titanium/blue, +/obj/machinery/holopad, +/turf/open/floor/carpet/blue, /area/shuttle/escape) "aS" = ( /obj/item/radio/intercom{ @@ -289,17 +220,13 @@ dir = 1 }, /obj/machinery/light, -/turf/open/floor/mineral/titanium/blue, +/obj/effect/turf_decal/bot, +/turf/open/floor/mineral/titanium, /area/shuttle/escape) "aT" = ( -/obj/structure/table, -/obj/item/stack/medical/gauze, -/obj/item/stack/medical/bruise_pack, -/obj/item/stack/medical/ointment, -/obj/machinery/light{ - dir = 4 - }, -/turf/open/floor/mineral/titanium/blue, +/obj/structure/chair/fancy/shuttle, +/obj/effect/turf_decal/bot, +/turf/open/floor/mineral/titanium, /area/shuttle/escape) "ba" = ( /obj/structure/sign/departments/medbay/alt, @@ -334,40 +261,56 @@ /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "bj" = ( -/obj/structure/table, /obj/item/defibrillator/loaded, -/turf/open/floor/mineral/titanium, +/obj/structure/table, +/obj/effect/turf_decal/bot, +/turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "bk" = ( -/obj/machinery/shower, -/turf/open/floor/mineral/titanium/white, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/siding/thinplating_new/light{ + dir = 4 + }, +/turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "bl" = ( -/obj/machinery/stasis, -/turf/open/floor/mineral/titanium, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/white, /area/shuttle/escape) "bm" = ( -/obj/structure/rack, -/obj/item/crowbar, -/obj/item/wrench, -/obj/item/weldingtool, -/obj/item/wirecutters, -/obj/item/stack/cable_coil, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/iron, +/obj/effect/turf_decal/siding/thinplating_new/light, +/obj/structure/closet/crate/freezer/blood, +/turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "bn" = ( -/obj/structure/reagent_dispensers/watertank, /obj/effect/turf_decal/delivery, +/obj/machinery/portable_atmospherics/canister/oxygen, /turf/open/floor/iron, /area/shuttle/escape) "bo" = ( -/obj/structure/reagent_dispensers/fueltank, -/obj/effect/turf_decal/delivery, -/obj/machinery/light{ - dir = 1 +/obj/structure/rack, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/item/storage/toolbox/electrical{ + pixel_x = -3; + pixel_y = 1 + }, +/obj/item/storage/toolbox/mechanical{ + pixel_y = -1 + }, +/obj/item/storage/toolbox/emergency{ + pixel_x = 3; + pixel_y = -5 + }, +/obj/item/radio, +/obj/item/flashlight/flare{ + pixel_x = -6; + pixel_y = -2 + }, +/obj/item/flashlight/flare{ + pixel_x = 3; + pixel_y = 3 }, /turf/open/floor/iron, /area/shuttle/escape) @@ -376,8 +319,8 @@ /turf/open/floor/iron, /area/shuttle/escape) "bq" = ( -/obj/machinery/recharge_station, /obj/effect/turf_decal/delivery, +/obj/structure/reagent_dispensers/watertank, /turf/open/floor/iron, /area/shuttle/escape) "bs" = ( @@ -391,56 +334,17 @@ /turf/closed/wall/mineral/titanium, /area/shuttle/escape) "bu" = ( -/obj/structure/table, -/obj/item/reagent_containers/glass/bottle/epinephrine{ - pixel_x = 6 - }, -/obj/item/reagent_containers/glass/bottle/charcoal{ - pixel_x = -3 - }, -/obj/item/reagent_containers/glass/bottle/epinephrine{ - pixel_x = -3; - pixel_y = 8 - }, -/obj/item/reagent_containers/glass/bottle/charcoal{ - pixel_x = 6; - pixel_y = 8 - }, -/obj/item/reagent_containers/syringe/epinephrine{ - pixel_x = 3; - pixel_y = -2 - }, -/obj/item/reagent_containers/syringe/epinephrine{ - pixel_x = 4; - pixel_y = 1 - }, -/obj/item/reagent_containers/syringe/epinephrine{ - pixel_x = -2; - pixel_y = 5 - }, -/obj/item/reagent_containers/syringe/epinephrine{ - pixel_x = 2; - pixel_y = 8 - }, -/turf/open/floor/mineral/titanium, +/obj/machinery/stasis, +/obj/effect/turf_decal/siding/thinplating_new/light, +/obj/effect/turf_decal/box, +/turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "bv" = ( -/obj/structure/rack, -/obj/item/storage/toolbox/electrical{ - pixel_x = -3; - pixel_y = 1 - }, -/obj/item/storage/toolbox/mechanical{ - pixel_y = -1 - }, -/obj/item/storage/toolbox/emergency{ - pixel_x = 3; - pixel_y = -5 - }, -/obj/effect/turf_decal/stripes/line{ +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ dir = 4 }, -/turf/open/floor/iron, +/turf/open/floor/iron/white, /area/shuttle/escape) "bw" = ( /obj/item/cigbutt, @@ -453,12 +357,10 @@ /turf/open/floor/iron, /area/shuttle/escape) "bz" = ( -/obj/structure/table/optable, -/obj/item/surgical_drapes, -/obj/machinery/light{ - dir = 8 +/obj/machinery/computer/crew{ + dir = 4 }, -/turf/open/floor/mineral/titanium, +/turf/open/floor/iron/white, /area/shuttle/escape) "bA" = ( /obj/effect/turf_decal/stripes/line{ @@ -510,39 +412,66 @@ /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "bH" = ( -/obj/structure/table, -/obj/item/scalpel{ - pixel_y = 12 - }, -/obj/item/circular_saw, -/obj/item/retractor{ - pixel_x = 4 - }, -/obj/item/hemostat{ - pixel_x = -4 - }, -/obj/item/clothing/gloves/color/latex, -/obj/item/clothing/mask/surgical, /obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_x = -27 }, -/obj/item/surgicaldrill, -/obj/item/cautery, -/turf/open/floor/mineral/titanium, +/obj/machinery/shower{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/noslip/blue, /area/shuttle/escape) "bI" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/arrows{ + dir = 8 + }, /obj/structure/sink, -/turf/open/floor/mineral/titanium/white, +/turf/open/floor/iron/white, /area/shuttle/escape) "bJ" = ( /obj/structure/table, -/obj/item/storage/firstaid/fire, -/obj/item/storage/firstaid/regular{ +/obj/item/reagent_containers/glass/bottle/epinephrine{ + pixel_x = 6 + }, +/obj/item/reagent_containers/glass/bottle/charcoal{ + pixel_x = -3 + }, +/obj/item/reagent_containers/glass/bottle/epinephrine{ + pixel_x = -3; + pixel_y = 8 + }, +/obj/item/reagent_containers/glass/bottle/charcoal{ + pixel_x = 6; + pixel_y = 8 + }, +/obj/item/reagent_containers/syringe/epinephrine{ + pixel_x = 3; + pixel_y = -2 + }, +/obj/item/reagent_containers/syringe/epinephrine{ + pixel_x = 4; + pixel_y = 1 + }, +/obj/item/reagent_containers/syringe/epinephrine{ + pixel_x = -2; + pixel_y = 5 + }, +/obj/item/reagent_containers/syringe/epinephrine{ pixel_x = 2; - pixel_y = 3 + pixel_y = 8 }, -/turf/open/floor/mineral/titanium, +/obj/effect/turf_decal/siding/thinplating_new/light{ + dir = 9 + }, +/turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "bK" = ( /obj/structure/table, @@ -551,13 +480,34 @@ pixel_x = 3; pixel_y = 3 }, -/turf/open/floor/mineral/titanium, +/obj/effect/turf_decal/siding/thinplating_new/light{ + dir = 1 + }, +/turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "bL" = ( /obj/structure/extinguisher_cabinet, /turf/closed/wall/mineral/titanium/nodiagonal, /area/shuttle/escape) -"bM" = ( +"bM" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/obj/structure/bed/roller, +/obj/machinery/iv_drip, +/obj/effect/turf_decal/siding/thinplating_new/light{ + dir = 1 + }, +/turf/open/floor/mineral/titanium/blue, +/area/shuttle/escape) +"bN" = ( +/obj/structure/chair/fancy/shuttle{ + dir = 1 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/mineral/titanium, +/area/shuttle/escape) +"bO" = ( /obj/structure/rack, /obj/item/tank/internals/oxygen/red, /obj/item/clothing/suit/utility/fire/firefighter, @@ -566,35 +516,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/iron, -/area/shuttle/escape) -"bN" = ( -/obj/machinery/space_heater, /obj/structure/extinguisher_cabinet{ dir = 4; pixel_y = -27 }, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, -/area/shuttle/escape) -"bO" = ( -/obj/structure/closet/crate{ - name = "emergency supplies crate" - }, -/obj/item/storage/toolbox/emergency, -/obj/item/storage/toolbox/emergency, -/obj/item/flashlight/flare{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/flashlight/flare{ - pixel_x = -6; - pixel_y = -2 - }, -/obj/item/crowbar, -/obj/item/wrench, -/obj/item/radio, -/obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/shuttle/escape) "bP" = ( @@ -622,12 +547,11 @@ /turf/open/floor/iron, /area/shuttle/escape) "bQ" = ( -/obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = -31 +/obj/machinery/advanced_airlock_controller{ + pixel_y = 24 }, -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/shuttle/escape) "bR" = ( @@ -639,22 +563,11 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/shuttle/escape) -"bS" = ( -/obj/machinery/vending/wallmed{ - name = "Emergency NanoMed"; - use_power = 0 - }, -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/shuttle/escape) "bU" = ( /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "bV" = ( -/obj/structure/chair/fancy/shuttle, -/obj/machinery/light{ - dir = 1 - }, -/turf/open/floor/mineral/titanium/blue, +/turf/open/floor/iron/dark/side, /area/shuttle/escape) "bW" = ( /obj/item/clothing/suit/hazardvest{ @@ -735,29 +648,21 @@ /obj/structure/closet/crate{ name = "lifejackets" }, -/obj/machinery/light{ - dir = 4 - }, -/turf/open/floor/mineral/titanium/blue, +/obj/effect/turf_decal/bot, +/turf/open/floor/mineral/plastitanium, /area/shuttle/escape) "bX" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/open/floor/mineral/titanium/blue, +/obj/structure/closet/emcloset, +/obj/effect/turf_decal/box, +/turf/open/floor/mineral/plastitanium, /area/shuttle/escape) "bY" = ( -/obj/machinery/light{ - dir = 4 - }, -/turf/open/floor/mineral/titanium/blue, +/turf/open/floor/iron/dark/corner, /area/shuttle/escape) "ca" = ( -/obj/structure/chair/fancy/shuttle{ - dir = 1 - }, -/obj/machinery/light, -/turf/open/floor/mineral/titanium/blue, +/obj/machinery/space_heater, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, /area/shuttle/escape) "cb" = ( /obj/machinery/light/small{ @@ -775,13 +680,40 @@ }, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) +"cl" = ( +/obj/machinery/holopad{ + pixel_x = 16; + pixel_y = -16 + }, +/turf/open/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) "cO" = ( -/obj/machinery/door/airlock/titanium{ - name = "Emergency Shuttle Airlock" +/turf/open/floor/iron, +/area/shuttle/escape) +"cW" = ( +/obj/structure/table, +/obj/effect/turf_decal/siding/thinplating_new/light{ + dir = 8 + }, +/obj/item/storage/backpack/duffelbag/med/surgery{ + pixel_y = 7 }, -/obj/structure/fans/tiny, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) +"dy" = ( +/obj/item/stack/medical/bruise_pack, +/obj/item/stack/medical/ointment, +/obj/item/stack/medical/gauze, +/obj/structure/table, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/escape) +"dE" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating_new/dark, +/turf/open/floor/carpet/blue, +/area/shuttle/escape) "ef" = ( /obj/machinery/door/airlock/security/glass{ name = "Brig"; @@ -790,6 +722,23 @@ /obj/machinery/door/firedoor, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) +"eB" = ( +/turf/open/floor/iron/dark/corner{ + dir = 4 + }, +/area/shuttle/escape) +"fb" = ( +/obj/machinery/holopad, +/turf/open/floor/iron/dark, +/area/shuttle/escape) +"fi" = ( +/obj/structure/chair/fancy/shuttle{ + dir = 1 + }, +/obj/machinery/light, +/obj/effect/turf_decal/bot, +/turf/open/floor/mineral/titanium, +/area/shuttle/escape) "fr" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/orange/hidden{ @@ -797,6 +746,14 @@ }, /turf/open/floor/iron, /area/shuttle/escape) +"gU" = ( +/obj/machinery/door/airlock/command/glass{ + name = "Cockpit"; + req_access_txt = "19" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/carpet/blue, +/area/shuttle/escape) "hJ" = ( /obj/machinery/light{ dir = 4 @@ -807,6 +764,20 @@ }, /turf/open/floor/iron, /area/shuttle/escape) +"jb" = ( +/turf/open/floor/iron/white, +/area/shuttle/escape) +"mw" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark, +/obj/structure/chair/fancy/corp, +/turf/open/floor/carpet/blue, +/area/shuttle/escape) +"mV" = ( +/obj/effect/turf_decal/siding/thinplating_new/light{ + dir = 10 + }, +/turf/open/floor/mineral/titanium/blue, +/area/shuttle/escape) "pq" = ( /obj/machinery/door/airlock/command{ name = "Emergency Recovery Airlock"; @@ -816,6 +787,79 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/shuttle/escape) +"rl" = ( +/obj/machinery/door/airlock/titanium{ + name = "Emergency Shuttle Airlock" + }, +/obj/structure/fans/tiny, +/turf/open/floor/iron/white, +/area/shuttle/escape) +"rp" = ( +/obj/item/radio/intercom{ + dir = 4; + name = "Station Intercom (General)"; + pixel_y = 27 + }, +/obj/structure/chair/fancy/shuttle, +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/mineral/titanium, +/area/shuttle/escape) +"sb" = ( +/obj/effect/turf_decal/siding/thinplating_new/light{ + dir = 4 + }, +/turf/open/floor/mineral/titanium/blue, +/area/shuttle/escape) +"uD" = ( +/obj/structure/chair/fancy/shuttle, +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/mineral/titanium, +/area/shuttle/escape) +"ve" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/machinery/holopad{ + pixel_x = 16; + pixel_y = -16 + }, +/turf/open/floor/iron/white, +/area/shuttle/escape) +"wu" = ( +/obj/effect/turf_decal/siding/thinplating_new/light, +/turf/open/floor/mineral/titanium/blue, +/area/shuttle/escape) +"AT" = ( +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -2; + pixel_y = 8 + }, +/obj/item/radio/intercom{ + name = "Station Intercom (General)"; + pixel_y = -31 + }, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/shuttle/escape) +"Bg" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 10 + }, +/turf/open/floor/carpet/blue, +/area/shuttle/escape) +"BK" = ( +/turf/open/floor/iron/dark/corner{ + dir = 8 + }, +/area/shuttle/escape) "BN" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/binary/dp_vent_pump, @@ -830,9 +874,6 @@ "CQ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/orange/hidden, -/obj/machinery/advanced_airlock_controller{ - pixel_y = 24 - }, /turf/open/floor/iron, /area/shuttle/escape) "DK" = ( @@ -840,13 +881,48 @@ /obj/machinery/atmospherics/components/unary/tank/air, /turf/open/floor/iron, /area/shuttle/escape) +"Eg" = ( +/obj/structure/table, +/obj/item/storage/firstaid/regular{ + pixel_x = 2; + pixel_y = 3 + }, +/obj/item/storage/firstaid/fire, +/obj/effect/turf_decal/siding/thinplating_new/light{ + dir = 1 + }, +/turf/open/floor/mineral/titanium/blue, +/area/shuttle/escape) +"EG" = ( +/obj/structure/table, +/obj/item/phone{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/cigbutt/cigarbutt{ + pixel_x = 5; + pixel_y = -1 + }, +/turf/open/floor/iron/dark/corner, +/area/shuttle/escape) "Gk" = ( -/obj/machinery/door/airlock/command/glass{ - name = "Cockpit"; - req_access_txt = "19" +/obj/effect/turf_decal/delivery, +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/iron, +/area/shuttle/escape) +"Kc" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/item/kirbyplants{ + icon_state = "plant-10" + }, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/escape) +"Kk" = ( +/turf/open/floor/iron/dark/side{ + dir = 8 }, -/obj/machinery/door/firedoor, -/turf/open/floor/mineral/titanium, /area/shuttle/escape) "Li" = ( /obj/effect/spawner/structure/window/shuttle, @@ -854,9 +930,74 @@ /turf/open/floor/plating, /area/shuttle/escape) "LY" = ( -/turf/open/floor/mineral/titanium, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, /area/shuttle/escape) "Ml" = ( +/obj/machinery/stasis, +/obj/effect/turf_decal/box, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/mineral/titanium/blue, +/area/shuttle/escape) +"PE" = ( +/obj/machinery/door/airlock/medical/glass{ + name = "Escape Shuttle Infirmary" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/white, +/area/shuttle/escape) +"PV" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/shuttle/escape) +"Qj" = ( +/obj/machinery/computer/security, +/turf/open/floor/iron/dark/side, +/area/shuttle/escape) +"Rb" = ( +/obj/structure/table/optable, +/obj/item/surgical_drapes, +/turf/open/floor/mineral/titanium/blue, +/area/shuttle/escape) +"Rg" = ( +/obj/structure/table, +/obj/item/storage/firstaid/regular, +/turf/open/floor/iron/dark/side, +/area/shuttle/escape) +"Ro" = ( +/obj/structure/flora/ausbushes/grassybush, +/obj/structure/flora/ausbushes/brflowers, +/turf/open/floor/grass, +/area/shuttle/escape) +"RM" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/chair/fancy/shuttle{ + dir = 4 + }, +/turf/open/floor/iron, +/area/shuttle/escape) +"Sy" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/medical/glass{ + name = "Escape Shuttle Infirmary" + }, +/turf/open/floor/iron/white, +/area/shuttle/escape) +"TI" = ( +/obj/machinery/computer/crew, +/turf/open/floor/iron/dark/side, +/area/shuttle/escape) +"Ui" = ( +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/shuttle/escape) +"Vh" = ( /obj/machinery/door/airlock/titanium{ name = "Emergency Shuttle Airlock" }, @@ -868,17 +1009,24 @@ width = 25 }, /obj/structure/fans/tiny, +/turf/open/floor/iron/white, +/area/shuttle/escape) +"Vs" = ( +/obj/effect/turf_decal/siding/thinplating_new/light{ + dir = 6 + }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) -"PE" = ( -/obj/machinery/door/airlock/medical/glass{ - name = "Escape Shuttle Infirmary" +"VU" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/recharge_station, +/obj/effect/turf_decal/delivery, +/obj/machinery/light{ + dir = 1 }, -/obj/machinery/door/firedoor, -/turf/open/floor/mineral/titanium/white, -/area/shuttle/escape) -"Vs" = ( -/turf/open/floor/mineral/titanium/white, +/turf/open/floor/iron, /area/shuttle/escape) "Xm" = ( /obj/machinery/door/airlock/titanium{ @@ -893,21 +1041,47 @@ /obj/machinery/atmospherics/pipe/manifold/orange/hidden, /turf/open/floor/iron, /area/shuttle/escape) +"Yp" = ( +/obj/item/kirbyplants{ + icon_state = "plant-10" + }, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/escape) +"YP" = ( +/obj/machinery/computer/operating{ + dir = 8 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/mineral/titanium/blue, +/area/shuttle/escape) +"ZP" = ( +/obj/structure/chair/fancy/shuttle, +/obj/effect/turf_decal/bot, +/turf/open/floor/carpet/grimy, +/area/shuttle/escape) +"ZQ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/suit_storage_unit/standard_unit, +/turf/open/floor/iron, +/area/shuttle/escape) (1,1,1) = {" aa -aa +ad au au au -ad au au ad au au au -aa +au +au +ad aa "} (2,1,1) = {" @@ -916,13 +1090,14 @@ ad av av av -ad av av ad av av av +av +av ad aa "} @@ -930,78 +1105,83 @@ aa ad ad ad +Li +Li +Li ad ad ad -ad -ad -ad -ad -ad +Li +Li +Li ad ad ad "} (4,1,1) = {" Li +EG al aw aB aF aL aO -aP aJ bd bd +RM bd DK Li "} (5,1,1) = {" Li +TI am aq -aC -aG -ax aq -aQ +aq +Bg +AT ad be hJ BN +CQ Yo bf "} (6,1,1) = {" Li +Qj an ax -LY -LY -LY -aC aR +ax +mw +aC ad bf Ce +bQ CQ fr bf "} (7,1,1) = {" Li +Rg ao -ay -LY -LY -LY -bY -aq +ax +ax +ax +dE +ar pq cb ad +ZQ by by Li @@ -1011,44 +1191,47 @@ ad ad az ad -Gk +gU ad az ad ad ad ad +ad az ad ad "} (9,1,1) = {" ad -ap -bX -aq -LY -aq bX ap +Yp +cO +Yp +ap +bX ad bh bh bh +bh bD ad "} (10,1,1) = {" Li +cO +bY LY LY LY -LY -LY -LY -LY +eB +cO ef bU +cl bU bU bE @@ -1056,62 +1239,66 @@ Li "} (11,1,1) = {" ad -ar -LY +aT +bV +bN aE -ac +aT ar -LY -aE +bN ac bi bU bU +bU bF Li "} (12,1,1) = {" +rl cO -LY -LY -aE +bV +bN aI +aT ar -LY -aE +bN ad -bi +bs cd bs +bs bG ad "} (13,1,1) = {" ad +uD bV -LY -aE -ac +bN +Ro +aT ar -LY aS ad ad bt +ad az ad ad "} (14,1,1) = {" +rl cO -LY -LY -aE +bV +bN aJ +aT ar -LY -aE +bN ad +Ml bj bu bz @@ -1120,130 +1307,138 @@ ad "} (15,1,1) = {" ag -ar -LY +ZP +bV +bN aE -ac +aT ar -LY -aE +bN ac +sb bk Vs -Vs +bl bI Li "} (16,1,1) = {" Li +aT +bV +aP +fb +aP ar -LY -LY -LY -LY -LY -LY +cO PE -Vs -Vs -Vs +PV +jb +ve +jb bJ Li "} (17,1,1) = {" Li -ar -LY +aT +bV +bN aE -ac +aT ar -LY -aE +bN ac +cW +mV bl -bl -Vs +bv bK ad "} (18,1,1) = {" Li -ar -LY -aE +aT +bV +bN bL +aT ar -LY -aE -ba -ad +bN +ac +Rb +wu +jb +PV +Eg ac -PE -ba -ad "} (19,1,1) = {" ad -as -LY +rp +bV +bN aE -ac +aT ar -LY -ca +fi ad +YP bm bv -bA +bl bM -ad +ac "} (20,1,1) = {" -Ml -LY -LY -aE -bS +Vh +cO +bV +aP +aP +aP ar -LY -aE -ac -bn -bw -be bN +ba +ad +ac +aN +Sy +ba ad "} (21,1,1) = {" ad -ar -LY +aT +bV +bN aE -ac +aT ar -LY -aE +bN aJ +VU bo -be -be +bA +bA bO -Li +ad "} (22,1,1) = {" +rl +cO +BK +Kk +Kk +Kk +Ui cO -LY -LY -LY -LY -LY -LY -LY Xm bp -be bw -bP +as +be +ca Li "} (23,1,1) = {" @@ -1251,7 +1446,7 @@ ad LY LY LY -LY +cO LY LY LY @@ -1259,22 +1454,24 @@ Xm bp be be -bQ -ad +be +bP +Li "} (24,1,1) = {" ad +Kc bW aA at -LY -aN -LY -aT +dy +bW +Kc ag +aG bq -bp -bp +Gk +bn bR ad "} @@ -1282,15 +1479,16 @@ ad ad ad Li -ad Li ad Li +Li ad ad ad Li Li +Li ad ad "} diff --git a/_maps/shuttles/emergency/emergency_ragecage.dmm b/_maps/shuttles/emergency/emergency_ragecage.dmm new file mode 100644 index 0000000000000..c4f33d51f1fc7 --- /dev/null +++ b/_maps/shuttles/emergency/emergency_ragecage.dmm @@ -0,0 +1,1136 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aj" = ( +/turf/open/floor/iron, +/area/shuttle/escape) +"am" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/plating/rust, +/area/shuttle/escape) +"bh" = ( +/obj/machinery/computer/emergency_shuttle{ + dir = 1 + }, +/obj/effect/turf_decal/tile/dark_blue/fourcorners, +/turf/open/floor/iron/dark, +/area/shuttle/escape) +"bB" = ( +/obj/effect/decal/cleanable/robot_debris/old, +/obj/effect/decal/cleanable/blood/old, +/turf/open/floor/plating/rust, +/area/shuttle/escape) +"bL" = ( +/obj/structure/table/reinforced, +/obj/item/defibrillator/compact/loaded, +/obj/item/defibrillator/compact/loaded, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/mineral/titanium/white, +/area/shuttle/escape) +"cq" = ( +/turf/open/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) +"dC" = ( +/obj/structure/table/reinforced, +/obj/item/storage/firstaid/regular{ + pixel_x = 2; + pixel_y = 3 + }, +/obj/effect/turf_decal/tile/dark_blue/opposingcorners, +/turf/open/floor/iron/dark, +/area/shuttle/escape) +"dO" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/grille, +/turf/open/floor/plating, +/area/shuttle/escape) +"ed" = ( +/obj/structure/fans/tiny, +/obj/machinery/door/airlock/titanium{ + name = "Emergency Shuttle Airlock" + }, +/obj/docking_port/mobile/emergency, +/turf/open/floor/iron, +/area/shuttle/escape) +"em" = ( +/obj/effect/turf_decal/tile/dark_blue/opposingcorners, +/turf/open/floor/iron/dark, +/area/shuttle/escape) +"es" = ( +/obj/structure/chair/foldable{ + dir = 1 + }, +/obj/effect/turf_decal/stripes{ + dir = 1 + }, +/turf/open/floor/plating, +/area/shuttle/escape) +"fg" = ( +/obj/effect/decal/cleanable/blood/tracks, +/turf/open/floor/plating/rust, +/area/shuttle/escape) +"fB" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/dark_blue/opposingcorners, +/obj/machinery/recharger{ + active_power_usage = 0; + idle_power_usage = 0; + use_power = 0 + }, +/turf/open/floor/iron/dark, +/area/shuttle/escape) +"fG" = ( +/obj/structure/table/reinforced, +/obj/machinery/recharger{ + active_power_usage = 0; + idle_power_usage = 0; + use_power = 0 + }, +/turf/open/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) +"gu" = ( +/turf/open/floor/iron/checker, +/area/shuttle/escape) +"hb" = ( +/obj/machinery/door/airlock/command/glass{ + name = "Cockpit"; + req_access_txt = "19" + }, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/escape) +"hI" = ( +/obj/structure/window/reinforced, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/grille, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/open/floor/plating, +/area/shuttle/escape) +"iY" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/firedoor/window, +/turf/open/floor/plating, +/area/shuttle/escape) +"ji" = ( +/obj/structure/shuttle/engine/heater, +/obj/structure/window/reinforced/spawner{ + dir = 1 + }, +/turf/open/floor/plating, +/area/shuttle/escape) +"jq" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/structure/grille, +/turf/open/floor/plating, +/area/shuttle/escape) +"kf" = ( +/obj/structure/table/glass, +/obj/item/book/manual/wiki/medicine, +/obj/item/stack/medical/gauze, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/mineral/titanium/white, +/area/shuttle/escape) +"ll" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/iron, +/area/shuttle/escape) +"lO" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/grille, +/turf/open/floor/plating, +/area/shuttle/escape) +"mp" = ( +/obj/machinery/computer/crew{ + dir = 1 + }, +/obj/effect/turf_decal/tile/dark_blue/fourcorners, +/turf/open/floor/iron/dark, +/area/shuttle/escape) +"ms" = ( +/obj/structure/table/reinforced, +/obj/item/storage/box/handcuffs{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/restraints/handcuffs{ + pixel_y = 3 + }, +/turf/open/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) +"my" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/structure/grille, +/turf/open/floor/plating, +/area/shuttle/escape) +"mR" = ( +/obj/structure/chair/foldable, +/obj/effect/turf_decal/stripes, +/turf/open/floor/iron, +/area/shuttle/escape) +"na" = ( +/obj/structure/chair/fancy/shuttle{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) +"nI" = ( +/obj/structure/chair/foldable{ + dir = 1 + }, +/obj/effect/turf_decal/stripes{ + dir = 1 + }, +/turf/open/floor/iron/checker, +/area/shuttle/escape) +"nP" = ( +/obj/machinery/computer/communications{ + dir = 1 + }, +/obj/effect/turf_decal/tile/dark_blue/fourcorners, +/turf/open/floor/iron/dark, +/area/shuttle/escape) +"oU" = ( +/obj/effect/decal/cleanable/glass, +/obj/effect/turf_decal/tile/dark_blue/opposingcorners, +/turf/open/floor/iron/dark, +/area/shuttle/escape) +"oY" = ( +/obj/effect/decal/cleanable/blood/tracks, +/turf/open/floor/iron, +/area/shuttle/escape) +"qi" = ( +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/effect/turf_decal/stripes{ + dir = 1 + }, +/obj/machinery/power/port_gen/pacman, +/obj/item/wrench, +/obj/item/stack/sheet/mineral/plasma/twenty, +/turf/open/floor/plating, +/area/shuttle/escape) +"qB" = ( +/obj/item/melee/baseball_bat, +/turf/open/floor/plating, +/area/shuttle/escape) +"rb" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/table/reinforced, +/obj/item/storage/firstaid{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/firstaid/fire, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/mineral/titanium/white, +/area/shuttle/escape) +"rW" = ( +/obj/structure/window/reinforced, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/grille, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/open/floor/plating, +/area/shuttle/escape) +"sy" = ( +/obj/machinery/stasis, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/mineral/titanium/white, +/area/shuttle/escape) +"tw" = ( +/obj/effect/decal/cleanable/blood/tracks, +/turf/open/floor/iron/checker, +/area/shuttle/escape) +"uz" = ( +/obj/structure/table/glass, +/obj/item/storage/belt/medical, +/obj/item/storage/belt/medical, +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = -3; + pixel_y = 2 + }, +/obj/item/clothing/neck/stethoscope, +/obj/item/clothing/neck/stethoscope, +/obj/item/clothing/glasses/hud/health, +/obj/item/clothing/glasses/hud/health, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/mineral/titanium/white, +/area/shuttle/escape) +"vD" = ( +/obj/structure/chair/foldable{ + dir = 8 + }, +/obj/effect/turf_decal/stripes{ + dir = 8 + }, +/turf/open/floor/iron, +/area/shuttle/escape) +"yj" = ( +/obj/item/chair/foldable, +/obj/effect/turf_decal/stripes{ + dir = 4 + }, +/turf/open/floor/iron, +/area/shuttle/escape) +"ym" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/structure/grille, +/turf/open/floor/plating, +/area/shuttle/escape) +"zd" = ( +/obj/structure/window/reinforced, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/grille, +/turf/open/floor/plating, +/area/shuttle/escape) +"zA" = ( +/obj/structure/chair/foldable{ + dir = 1 + }, +/obj/effect/turf_decal/stripes{ + dir = 1 + }, +/turf/open/floor/iron, +/area/shuttle/escape) +"zU" = ( +/obj/structure/chair/fancy/shuttle{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) +"AO" = ( +/turf/open/floor/mineral/titanium/blue, +/area/shuttle/escape) +"Bt" = ( +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/plating/rust, +/area/shuttle/escape) +"BY" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/iron, +/area/shuttle/escape) +"Cb" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/item/storage/firstaid/regular{ + pixel_x = 2; + pixel_y = 12 + }, +/obj/item/storage/backpack/duffelbag/med/surgery, +/turf/open/floor/mineral/titanium/white, +/area/shuttle/escape) +"De" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/turf/open/floor/iron, +/area/shuttle/escape) +"Dv" = ( +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/structure/grille, +/turf/open/floor/plating, +/area/shuttle/escape) +"DA" = ( +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/structure/grille, +/turf/open/floor/plating, +/area/shuttle/escape) +"EQ" = ( +/obj/structure/table/reinforced, +/obj/item/storage/firstaid{ + pixel_x = 3; + pixel_y = 2 + }, +/obj/item/storage/firstaid/brute, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/mineral/titanium/white, +/area/shuttle/escape) +"FH" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/cable/yellow, +/obj/structure/grille, +/turf/open/floor/plating, +/area/shuttle/escape) +"GA" = ( +/turf/open/floor/plating, +/area/shuttle/escape) +"GS" = ( +/obj/effect/decal/cleanable/blood/old, +/turf/open/floor/iron, +/area/shuttle/escape) +"HL" = ( +/obj/structure/table/optable, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/mineral/titanium/white, +/area/shuttle/escape) +"HY" = ( +/obj/structure/chair/foldable{ + dir = 8 + }, +/obj/effect/turf_decal/stripes{ + dir = 8 + }, +/turf/open/floor/iron/checker, +/area/shuttle/escape) +"IQ" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/effect/turf_decal/stripes{ + dir = 1 + }, +/obj/effect/turf_decal/caution{ + pixel_y = -18 + }, +/obj/effect/turf_decal/caution, +/turf/open/floor/plating/rust, +/area/shuttle/escape) +"Jh" = ( +/obj/structure/chair/foldable{ + dir = 4 + }, +/obj/effect/turf_decal/stripes{ + dir = 4 + }, +/turf/open/floor/iron, +/area/shuttle/escape) +"Jp" = ( +/obj/effect/decal/cleanable/blood/splatter, +/turf/open/floor/plating/rust, +/area/shuttle/escape) +"Jx" = ( +/obj/machinery/door/airlock/medical/glass{ + name = "Escape Shuttle Infirmary" + }, +/turf/open/floor/mineral/titanium/white, +/area/shuttle/escape) +"JK" = ( +/obj/structure/chair/foldable{ + dir = 4 + }, +/obj/effect/turf_decal/stripes{ + dir = 4 + }, +/turf/open/floor/iron/checker, +/area/shuttle/escape) +"JL" = ( +/obj/effect/decal/cleanable/robot_debris/old, +/turf/open/floor/plating, +/area/shuttle/escape) +"KW" = ( +/turf/open/floor/plating/rust, +/area/shuttle/escape) +"Lx" = ( +/obj/structure/fans/tiny, +/obj/machinery/door/airlock/titanium{ + name = "Emergency Shuttle Airlock"; + req_access_txt = "2" + }, +/turf/open/floor/iron, +/area/shuttle/escape) +"LS" = ( +/obj/structure/chair/foldable{ + dir = 4 + }, +/obj/effect/turf_decal/stripes{ + dir = 4 + }, +/turf/open/floor/plating/rust, +/area/shuttle/escape) +"Mw" = ( +/turf/template_noop, +/area/template_noop) +"MF" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/machinery/door/airlock/alarmlock, +/turf/open/floor/plating, +/area/shuttle/escape) +"MX" = ( +/obj/effect/decal/cleanable/blood/old, +/turf/open/floor/plating, +/area/shuttle/escape) +"Nb" = ( +/obj/item/melee/baseball_bat, +/obj/machinery/light/floor, +/turf/open/floor/plating, +/area/shuttle/escape) +"NP" = ( +/obj/item/chair/foldable, +/obj/effect/turf_decal/stripes{ + dir = 4 + }, +/turf/open/floor/iron/checker, +/area/shuttle/escape) +"Od" = ( +/obj/effect/decal/cleanable/blood/tracks, +/turf/open/floor/plating, +/area/shuttle/escape) +"Ox" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/stasis, +/turf/open/floor/mineral/titanium/white, +/area/shuttle/escape) +"OZ" = ( +/obj/effect/decal/cleanable/glass, +/obj/effect/decal/cleanable/glass, +/turf/closed/wall, +/area/shuttle/escape) +"Pd" = ( +/obj/item/chair/foldable, +/obj/effect/turf_decal/stripes{ + dir = 4 + }, +/turf/open/floor/plating/rust, +/area/shuttle/escape) +"Pf" = ( +/obj/machinery/computer/operating{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/mineral/titanium/white, +/area/shuttle/escape) +"PK" = ( +/obj/structure/chair/fancy/shuttle, +/obj/effect/turf_decal/tile/dark_blue/opposingcorners, +/turf/open/floor/iron/dark, +/area/shuttle/escape) +"PQ" = ( +/obj/effect/decal/cleanable/blood/tracks{ + dir = 8 + }, +/turf/open/floor/plating, +/area/shuttle/escape) +"Qh" = ( +/obj/structure/window/reinforced, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/structure/grille, +/turf/open/floor/plating, +/area/shuttle/escape) +"Rg" = ( +/obj/effect/decal/cleanable/glass, +/turf/open/floor/iron, +/area/shuttle/escape) +"Sd" = ( +/obj/item/chair/foldable, +/obj/effect/turf_decal/stripes{ + dir = 8 + }, +/turf/open/floor/iron, +/area/shuttle/escape) +"Sz" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Brig Area"; + req_access_txt = "2" + }, +/turf/open/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) +"TP" = ( +/obj/structure/chair/foldable, +/obj/effect/turf_decal/stripes, +/turf/open/floor/iron/checker, +/area/shuttle/escape) +"Ug" = ( +/obj/structure/chair/foldable, +/obj/effect/turf_decal/stripes, +/turf/open/floor/plating, +/area/shuttle/escape) +"UA" = ( +/obj/structure/shuttle/engine/propulsion/burst, +/turf/open/floor/plating, +/area/shuttle/escape) +"VI" = ( +/obj/effect/decal/cleanable/blood/gibs, +/turf/open/floor/plating, +/area/shuttle/escape) +"Wb" = ( +/turf/closed/wall/rust, +/area/shuttle/escape) +"WG" = ( +/obj/machinery/vending/medical, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/mineral/titanium/white, +/area/shuttle/escape) +"Yu" = ( +/obj/effect/decal/cleanable/robot_debris/old, +/turf/open/floor/plating/rust, +/area/shuttle/escape) +"Yy" = ( +/turf/closed/wall, +/area/shuttle/escape) +"Zs" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/cable/yellow, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/grille, +/turf/open/floor/plating, +/area/shuttle/escape) + +(1,1,1) = {" +Mw +Mw +Mw +Yy +Yy +Lx +Yy +ed +Wb +Wb +Wb +Wb +Yy +Lx +Yy +Lx +Yy +Wb +iY +iY +iY +Yy +Yy +Mw +"} +(2,1,1) = {" +Mw +Yy +OZ +Yy +gu +GA +GA +aj +aj +GA +gu +aj +GA +GA +aj +GS +iY +na +na +na +na +Yy +ji +UA +"} +(3,1,1) = {" +Yy +Yy +Bt +Pd +LS +NP +NP +JK +JK +JK +Jh +yj +Jh +Jh +BY +gu +Sz +cq +cq +cq +cq +iY +ji +UA +"} +(4,1,1) = {" +Yy +KW +mR +jq +FH +Zs +Zs +Zs +Zs +Zs +Zs +Zs +Zs +Dv +es +gu +iY +cq +cq +cq +cq +iY +ji +UA +"} +(5,1,1) = {" +iY +aj +Ug +my +Nb +GA +KW +GA +qB +GA +JL +GA +Nb +Qh +zA +gu +Yy +zU +fG +ms +zU +Yy +ji +UA +"} +(6,1,1) = {" +iY +gu +mR +dO +KW +GA +GA +KW +GA +GA +PQ +KW +KW +zd +zA +gu +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(7,1,1) = {" +iY +gu +TP +dO +GA +GA +VI +KW +Yu +MX +PQ +GA +GA +zd +es +aj +Yy +bL +rb +EQ +uz +Yy +ji +UA +"} +(8,1,1) = {" +Yy +Rg +TP +dO +KW +GA +GA +GA +GA +KW +PQ +KW +qB +hI +qi +KW +iY +AO +AO +AO +sy +iY +ji +UA +"} +(9,1,1) = {" +iY +KW +TP +dO +qB +GA +GA +GA +Nb +GA +PQ +KW +GA +MF +IQ +KW +Jx +AO +AO +AO +Pf +iY +ji +UA +"} +(10,1,1) = {" +Wb +KW +TP +dO +GA +JL +GA +GA +KW +GA +GA +GA +qB +rW +zA +KW +iY +AO +AO +AO +HL +iY +ji +UA +"} +(11,1,1) = {" +iY +am +TP +dO +GA +GA +GA +GA +GA +KW +GA +bB +GA +zd +nI +aj +Yy +WG +kf +Ox +Cb +Yy +ji +UA +"} +(12,1,1) = {" +iY +KW +mR +dO +KW +KW +Jp +GA +GA +GA +KW +KW +KW +zd +zA +gu +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(13,1,1) = {" +iY +gu +mR +dO +Nb +GA +GA +GA +qB +GA +GA +GA +Nb +zd +zA +gu +iY +fB +em +PK +mp +Yy +ji +UA +"} +(14,1,1) = {" +Wb +aj +mR +ym +lO +lO +lO +lO +lO +lO +lO +lO +lO +DA +zA +gu +hb +em +em +PK +mp +iY +ji +UA +"} +(15,1,1) = {" +Yy +Yy +ll +vD +HY +HY +vD +Sd +Sd +Sd +vD +vD +vD +vD +De +gu +iY +oU +em +PK +nP +iY +ji +UA +"} +(16,1,1) = {" +Mw +Yy +Yy +Yy +oY +Od +tw +oY +oY +fg +KW +KW +aj +gu +aj +aj +Yy +dC +em +PK +bh +Yy +ji +UA +"} +(17,1,1) = {" +Mw +Mw +Mw +Yy +Yy +iY +iY +iY +Yy +Yy +iY +iY +iY +Wb +Wb +Wb +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Mw +"} diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm index dc6202d1d3531..2da5315a11a63 100644 --- a/code/datums/shuttles.dm +++ b/code/datums/shuttles.dm @@ -627,6 +627,15 @@ admin_notes = "Has an on-board experimental cloner that creates copies of its user, alien surgery tools, and a void core that provides unlimited power." credit_cost = 8000 +/datum/map_template/shuttle/emergency/ragecage + suffix = "ragecage" + name = "THE RAGE CAGE" + description = "An abandoned underground electrified fight arena turned into a shuttle. Comes with a Brig, Medbay and Cockpit included." + admin_notes = "It's a normal shuttle but it has a rage cage with baseball bats in the middle powered by a PACMAN, plasma included." + credit_cost = 7500 + danger_level = SHUTTLE_DANGER_SUBPAR + + /datum/map_template/shuttle/emergency/zeta/prerequisites_met() if(SHUTTLE_UNLOCK_ALIENTECH in SSshuttle.shuttle_purchase_requirements_met) return TRUE