From 173b5054b8291e5445839bb2c34b89265b9667a2 Mon Sep 17 00:00:00 2001 From: Markus Date: Thu, 26 Sep 2024 20:43:27 +0200 Subject: [PATCH 01/13] shuttle radification! --- .../shuttles/emergency/emergency_asteroid.dmm | 910 +++++++--- _maps/shuttles/emergency/emergency_bar.dmm | 523 ++++-- .../shuttles/emergency/emergency_birdboat.dmm | 271 +-- _maps/shuttles/emergency/emergency_delta.dmm | 1582 ++++++++++++----- _maps/shuttles/emergency/emergency_meta.dmm | 599 ++++--- _maps/shuttles/emergency/emergency_tiny.dmm | 145 +- 6 files changed, 2790 insertions(+), 1240 deletions(-) diff --git a/_maps/shuttles/emergency/emergency_asteroid.dmm b/_maps/shuttles/emergency/emergency_asteroid.dmm index e3bb8df900f06..924382b3b2d00 100644 --- a/_maps/shuttles/emergency/emergency_asteroid.dmm +++ b/_maps/shuttles/emergency/emergency_asteroid.dmm @@ -15,6 +15,9 @@ /obj/structure/shuttle/engine/heater{ dir = 8 }, +/obj/structure/window/reinforced/survival_pod{ + dir = 8 + }, /turf/open/floor/plating/airless, /area/shuttle/escape) "ap" = ( @@ -29,7 +32,10 @@ /turf/open/floor/mineral/titanium/yellow, /area/shuttle/escape) "at" = ( -/turf/open/floor/mineral/titanium, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 10 + }, +/turf/open/floor/iron, /area/shuttle/escape) "av" = ( /obj/structure/chair/fancy/shuttle{ @@ -44,6 +50,8 @@ /obj/structure/chair/fancy/shuttle{ dir = 8 }, +/obj/machinery/camera/autoname/directional/east, +/obj/machinery/status_display/evac/directional/east, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "az" = ( @@ -56,11 +64,7 @@ /obj/structure/chair/fancy/shuttle{ dir = 4 }, -/obj/item/radio/intercom{ - dir = 8; - name = "Station Intercom (General)"; - pixel_x = -28 - }, +/obj/item/radio/intercom/directional/west, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "aF" = ( @@ -68,137 +72,177 @@ /turf/open/floor/mineral/titanium/yellow, /area/shuttle/escape) "aH" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = 30 +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 9 }, -/turf/open/floor/mineral/titanium, +/turf/open/floor/iron, /area/shuttle/escape) "aI" = ( -/obj/structure/closet, -/turf/open/floor/mineral/titanium/blue, +/obj/structure/closet/firecloset, +/obj/effect/turf_decal/bot, +/obj/item/radio/intercom/directional/south, +/obj/effect/turf_decal/trimline/neutral/filled/line, +/obj/machinery/light, +/turf/open/floor/iron/edge{ + dir = 1 + }, /area/shuttle/escape) "aJ" = ( -/obj/structure/table, -/obj/item/extinguisher, -/obj/item/crowbar, -/turf/open/floor/mineral/titanium/blue, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/bot, +/obj/structure/extinguisher_cabinet/directional/north, +/turf/open/floor/iron/edge, /area/shuttle/escape) "aK" = ( /obj/structure/chair/fancy/shuttle, -/turf/open/floor/mineral/titanium/blue, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/turf/open/floor/iron/edge, /area/shuttle/escape) "aL" = ( -/obj/structure/table, -/obj/item/storage/firstaid/fire, -/obj/item/storage/firstaid/regular{ - pixel_x = 2; - pixel_y = 3 +/obj/machinery/camera/autoname/directional/south, +/obj/structure/chair/fancy/shuttle{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line, +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/iron/edge{ + dir = 1 }, -/turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "aM" = ( +/obj/effect/turf_decal/bot, /obj/structure/closet/emcloset, -/obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = 23 +/obj/item/radio/intercom/directional/north, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/obj/machinery/light{ + dir = 1 }, -/turf/open/floor/mineral/titanium/blue, +/turf/open/floor/iron/edge, /area/shuttle/escape) "aN" = ( -/obj/structure/bed/roller, -/turf/open/floor/mineral/titanium/blue, +/obj/structure/closet/emcloset, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 6 + }, +/turf/open/floor/iron, /area/shuttle/escape) "aQ" = ( /obj/structure/bed, +/obj/machinery/newscaster/directional/east, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/item/book/manual/wiki/security_space_law{ + pixel_x = -4; + pixel_y = 4 + }, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "aR" = ( -/obj/machinery/computer/station_alert{ +/obj/machinery/computer/crew{ dir = 4 }, -/turf/open/floor/mineral/titanium/blue, +/turf/open/floor/iron/large, /area/shuttle/escape) "aS" = ( -/turf/open/floor/mineral/titanium/blue, +/turf/open/floor/circuit/green{ + luminosity = 2 + }, /area/shuttle/escape) "aT" = ( -/obj/structure/chair/office/light{ - name = "Chief Engineer" +/obj/structure/chair/fancy/shuttle, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 1 }, -/turf/open/floor/mineral/titanium/blue, +/obj/effect/turf_decal/siding/thinplating_new/dark, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/carpet/blue, /area/shuttle/escape) "aU" = ( -/obj/structure/chair/office/light{ - name = "Captain" - }, -/obj/machinery/light{ +/obj/structure/chair/fancy/shuttle, +/obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 1 }, -/turf/open/floor/mineral/titanium/blue, +/obj/effect/turf_decal/siding/thinplating_new/dark, +/turf/open/floor/carpet/blue, /area/shuttle/escape) "aV" = ( -/obj/structure/chair/office/light{ - name = "Head of Security" +/obj/structure/chair/fancy/shuttle, +/obj/item/radio/intercom/directional/north, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 1 }, -/turf/open/floor/mineral/titanium/blue, +/obj/effect/turf_decal/siding/thinplating_new/dark, +/turf/open/floor/carpet/blue, /area/shuttle/escape) "aW" = ( -/obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = 23 +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 5 }, -/turf/open/floor/mineral/titanium, -/area/shuttle/escape) -"aX" = ( -/obj/machinery/status_display/ai, -/turf/closed/wall/mineral/titanium, -/area/shuttle/escape) -"aY" = ( -/obj/structure/chair/fancy/shuttle{ +/obj/effect/turf_decal/siding/thinplating_new/dark/corner{ dir = 8 }, -/turf/open/floor/mineral/titanium/blue, +/obj/machinery/status_display/ai/directional/east, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/carpet/blue, +/area/shuttle/escape) +"aY" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/ai_slipper, +/turf/open/floor/iron/large, /area/shuttle/escape) "aZ" = ( /obj/structure/chair/fancy/shuttle{ dir = 1 }, -/turf/open/floor/mineral/titanium/blue, -/area/shuttle/escape) -"ba" = ( -/obj/structure/chair/fancy/shuttle{ - dir = 4 +/obj/effect/turf_decal/trimline/neutral/filled/line, +/turf/open/floor/iron/edge{ + dir = 1 }, -/turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "bb" = ( -/obj/machinery/computer/security{ - dir = 4 - }, +/obj/item/kirbyplants/random, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "bc" = ( /obj/structure/table, /obj/item/paper_bin{ - pixel_x = -1; - pixel_y = 6 + pixel_y = 4 + }, +/obj/item/pen, +/obj/item/folder/blue{ + pixel_y = 4 }, -/turf/open/floor/mineral/titanium, +/turf/open/floor/iron/large, /area/shuttle/escape) "bd" = ( /obj/machinery/computer/emergency_shuttle, -/turf/open/floor/mineral/titanium, +/turf/open/floor/iron/large, /area/shuttle/escape) "be" = ( /obj/structure/table, -/obj/item/folder/blue, -/obj/item/pen, /obj/machinery/recharger, -/turf/open/floor/mineral/titanium, +/obj/item/storage/fancy/donut_box, +/turf/open/floor/iron/large, /area/shuttle/escape) "bf" = ( /obj/machinery/ai_slipper, -/turf/open/floor/mineral/titanium, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 8 + }, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 4 + }, +/turf/open/floor/carpet/blue, /area/shuttle/escape) "bi" = ( /obj/machinery/status_display/evac, @@ -208,101 +252,119 @@ /obj/machinery/computer/communications{ dir = 4 }, -/turf/open/floor/mineral/titanium/blue, +/turf/open/floor/iron/large, /area/shuttle/escape) "bk" = ( -/obj/structure/chair/office/light{ - dir = 1; - name = "Research Director" +/obj/structure/chair/fancy/shuttle{ + dir = 1 + }, +/obj/machinery/camera/autoname/directional/south, +/obj/effect/turf_decal/siding/thinplating_new/dark, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 1 }, -/turf/open/floor/mineral/titanium/blue, +/obj/machinery/newscaster/directional/south, +/obj/machinery/light, +/turf/open/floor/carpet/blue, /area/shuttle/escape) "bl" = ( -/obj/structure/chair/office/light{ - dir = 1; - name = "Head of Personnel" +/obj/structure/chair/fancy/shuttle{ + dir = 1 }, -/turf/open/floor/mineral/titanium/blue, +/obj/effect/turf_decal/siding/thinplating_new/dark, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 1 + }, +/turf/open/floor/carpet/blue, /area/shuttle/escape) "bm" = ( -/obj/structure/chair/office/light{ - dir = 1; - name = "Chief Medical Officer" +/obj/structure/chair/fancy/shuttle{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating_new/dark, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 1 }, -/turf/open/floor/mineral/titanium/blue, +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/carpet/blue, /area/shuttle/escape) "bn" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = -30 +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 6 + }, +/obj/effect/turf_decal/siding/thinplating_new/dark/corner{ + dir = 1 }, -/turf/open/floor/mineral/titanium, +/obj/machinery/status_display/evac/directional/east, +/turf/open/floor/carpet/blue, /area/shuttle/escape) "bp" = ( /obj/machinery/computer/crew{ dir = 4 }, -/turf/open/floor/mineral/titanium/white, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 9 + }, +/turf/open/floor/iron, /area/shuttle/escape) "bs" = ( /obj/structure/bed, +/obj/machinery/light/small, /turf/open/floor/mineral/titanium/white, /area/shuttle/escape) "bt" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, -/obj/structure/mirror{ - pixel_x = -30 - }, -/turf/open/floor/mineral/titanium/white, -/area/shuttle/escape) -"bv" = ( /obj/structure/closet/emcloset, -/turf/open/floor/mineral/titanium/blue, +/obj/structure/extinguisher_cabinet/directional/west, +/turf/open/floor/iron/large, /area/shuttle/escape) -"bw" = ( -/obj/structure/chair/fancy/shuttle{ +"bv" = ( +/obj/item/radio/intercom/directional/south, +/obj/effect/turf_decal/trimline/neutral/filled/line, +/obj/item/kirbyplants/random, +/obj/machinery/light, +/turf/open/floor/iron/edge{ dir = 1 }, -/obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = -29 - }, -/turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) -"bx" = ( +"bw" = ( /obj/structure/chair/fancy/shuttle{ dir = 1 }, -/obj/structure/extinguisher_cabinet{ - pixel_y = -30 +/obj/effect/turf_decal/trimline/neutral/filled/line, +/obj/machinery/newscaster/directional/south, +/turf/open/floor/iron/edge{ + dir = 1 }, -/turf/open/floor/mineral/titanium/blue, -/area/shuttle/escape) -"by" = ( -/obj/structure/table, -/obj/item/extinguisher, -/obj/item/crowbar, -/obj/machinery/recharger, -/turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "bz" = ( /obj/machinery/stasis, -/turf/open/floor/mineral/titanium/white, +/obj/machinery/camera/autoname/directional/east, +/obj/machinery/status_display/evac/directional/east, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/turf/open/floor/iron/edge{ + dir = 8 + }, /area/shuttle/escape) "bC" = ( -/obj/item/radio/intercom{ - dir = 8; - name = "Station Intercom (General)"; - pixel_x = -28 +/obj/item/radio/intercom/directional/west, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/turf/open/floor/iron/edge{ + dir = 4 }, -/turf/open/floor/mineral/titanium/white, /area/shuttle/escape) "bD" = ( /obj/structure/closet/secure_closet/medical2, -/turf/open/floor/mineral/titanium/white, +/obj/machinery/newscaster/directional/east, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/turf/open/floor/iron/edge{ + dir = 8 + }, /area/shuttle/escape) "bE" = ( /obj/structure/toilet{ @@ -311,28 +373,48 @@ /obj/machinery/light/small{ dir = 4 }, +/obj/machinery/newscaster/directional/west, +/obj/item/radio/intercom/directional/east, /turf/open/floor/mineral/titanium/white, /area/shuttle/escape) "bF" = ( /obj/structure/table, -/obj/item/retractor, /obj/item/hemostat, /obj/item/scalpel, -/obj/item/surgicaldrill, -/turf/open/floor/mineral/titanium/white, +/obj/item/cautery{ + pixel_x = 4 + }, +/obj/item/clothing/gloves/color/latex, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 10 + }, +/turf/open/floor/iron, /area/shuttle/escape) "bG" = ( /obj/structure/table/optable, -/turf/open/floor/mineral/titanium/white, +/obj/item/surgical_drapes, +/obj/effect/turf_decal/trimline/blue/filled/line, +/turf/open/floor/iron/edge{ + dir = 1 + }, /area/shuttle/escape) "bH" = ( +/obj/item/storage/firstaid/regular{ + pixel_x = 2; + pixel_y = 5 + }, +/obj/item/storage/firstaid/fire{ + pixel_y = 2 + }, /obj/structure/table, -/obj/item/circular_saw, -/obj/item/cautery{ - pixel_x = 4 +/obj/item/storage/firstaid/brute{ + pixel_x = -2; + pixel_y = -1 }, -/obj/item/surgical_drapes, -/turf/open/floor/mineral/titanium/white, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 6 + }, +/turf/open/floor/iron, /area/shuttle/escape) "bJ" = ( /obj/machinery/light, @@ -340,24 +422,88 @@ /area/shuttle/escape) "bK" = ( /obj/structure/chair/fancy/shuttle, -/obj/machinery/light{ +/obj/machinery/camera/autoname/directional/north, +/obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 1 }, -/turf/open/floor/mineral/titanium/blue, +/turf/open/floor/iron/edge, /area/shuttle/escape) "bM" = ( /obj/machinery/light, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "bN" = ( +/obj/structure/mirror/directional/north{ + pixel_y = 32 + }, +/obj/structure/sink{ + dir = 1; + pixel_y = 24; + layer = 3.3 + }, +/turf/open/floor/iron/large, +/area/shuttle/escape) +"bP" = ( +/obj/structure/chair/fancy/shuttle{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line, +/obj/machinery/status_display/ai/directional/south, +/turf/open/floor/iron/edge{ + dir = 1 + }, +/area/shuttle/escape) +"cl" = ( /obj/machinery/light{ dir = 1 }, -/turf/open/floor/mineral/titanium/white, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/turf/open/floor/iron/edge, /area/shuttle/escape) -"bP" = ( -/obj/machinery/light, -/turf/open/floor/mineral/titanium/blue, +"cB" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 8 + }, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 4 + }, +/obj/effect/turf_decal/box, +/turf/open/floor/carpet/blue, +/area/shuttle/escape) +"dD" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/holopad, +/obj/effect/turf_decal/box, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/iron/large, +/area/shuttle/escape) +"fh" = ( +/obj/machinery/vending/wallmed, +/turf/closed/wall/mineral/titanium/interior, +/area/shuttle/escape) +"iU" = ( +/obj/structure/closet/firecloset, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 5 + }, +/turf/open/floor/iron/edge, +/area/shuttle/escape) +"iZ" = ( +/obj/item/radio/intercom/directional/north, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/obj/item/kirbyplants/random, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/iron/edge, /area/shuttle/escape) "jj" = ( /obj/machinery/door/airlock/titanium{ @@ -367,41 +513,167 @@ /obj/structure/fans/tiny, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) -"qg" = ( -/obj/structure/window/shuttle, -/obj/structure/grille, -/turf/open/floor/mineral/titanium/blue, +"lL" = ( +/turf/open/floor/iron/large, +/area/shuttle/escape) +"mB" = ( +/obj/structure/extinguisher_cabinet/directional/east, +/turf/open/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) +"qf" = ( +/obj/machinery/ai_slipper, +/turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "qO" = ( -/obj/structure/window/shuttle, -/obj/structure/grille, +/obj/effect/spawner/structure/window/shuttle, +/obj/machinery/door/firedoor/window, /turf/open/floor/plating, /area/shuttle/escape) -"rp" = ( -/obj/machinery/door/airlock/medical/glass{ - name = "Escape Shuttle Infirmary"; - req_access_txt = "5" +"sV" = ( +/obj/structure/toilet{ + dir = 1 }, -/obj/machinery/door/firedoor, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/item/radio/intercom/directional/west, +/obj/machinery/newscaster/directional/east, /turf/open/floor/mineral/titanium/white, /area/shuttle/escape) +"ta" = ( +/obj/machinery/computer/security{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) +"uc" = ( +/obj/machinery/status_display/evac, +/turf/closed/wall/mineral/titanium/interior, +/area/shuttle/escape) +"uM" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/box, +/turf/open/floor/iron/large, +/area/shuttle/escape) +"uQ" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 8 + }, +/turf/open/floor/iron/edge{ + dir = 4 + }, +/area/shuttle/escape) +"uW" = ( +/obj/machinery/ai_slipper, +/turf/open/floor/iron/large, +/area/shuttle/escape) +"ve" = ( +/obj/structure/closet, +/obj/structure/extinguisher_cabinet/directional/west, +/turf/open/floor/mineral/titanium/yellow, +/area/shuttle/escape) +"xr" = ( +/obj/structure/extinguisher_cabinet/directional/north, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 5 + }, +/turf/open/floor/iron, +/area/shuttle/escape) "xE" = ( /obj/machinery/door/airlock/titanium{ name = "Emergency Shuttle Airlock" }, /obj/structure/fans/tiny, +/obj/effect/turf_decal/stripes/closeup, +/turf/open/floor/iron/white, +/area/shuttle/escape) +"yg" = ( +/obj/effect/turf_decal/trimline/neutral/filled/warning{ + dir = 4 + }, +/turf/open/floor/iron/edge{ + dir = 8 + }, +/area/shuttle/escape) +"yT" = ( +/obj/machinery/ai_slipper, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/mineral/titanium/yellow, +/area/shuttle/escape) +"Af" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/box, /turf/open/floor/mineral/titanium/yellow, /area/shuttle/escape) +"Ca" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/edge{ + dir = 1 + }, +/area/shuttle/escape) +"CC" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/turf/open/floor/iron/edge{ + dir = 8 + }, +/area/shuttle/escape) +"Dx" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/bot, +/obj/machinery/newscaster/directional/north, +/turf/open/floor/iron/edge, +/area/shuttle/escape) +"El" = ( +/obj/machinery/door/airlock{ + name = "Emergency Shuttle Restroom" + }, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/turf/open/floor/iron, +/area/shuttle/escape) +"Em" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 10 + }, +/obj/effect/turf_decal/siding/thinplating_new/dark/corner{ + dir = 4 + }, +/turf/open/floor/carpet/blue, +/area/shuttle/escape) "ED" = ( /obj/machinery/door/airlock/mining{ name = "Emergency Shuttle Storage" }, /obj/machinery/door/firedoor, -/turf/open/floor/mineral/titanium/yellow, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/turf/open/floor/iron, +/area/shuttle/escape) +"Fk" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 9 + }, +/obj/effect/turf_decal/siding/thinplating_new/dark/corner, +/turf/open/floor/carpet/blue, /area/shuttle/escape) "Gw" = ( /obj/machinery/door/firedoor, -/turf/open/floor/mineral/titanium, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/stripes/closeup, +/turf/open/floor/iron/large, +/area/shuttle/escape) +"IQ" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/box, +/turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "Jx" = ( /turf/open/floor/mineral/titanium/white, @@ -412,28 +684,64 @@ req_access_txt = "2" }, /obj/machinery/door/firedoor, -/turf/open/floor/mineral/plastitanium/red/brig, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/turf/open/floor/iron, /area/shuttle/escape) -"JM" = ( -/obj/machinery/vending/wallmed{ - name = "Emergency NanoMed"; - use_power = 0 +"Lj" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 }, -/turf/closed/wall/mineral/titanium, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/edge, /area/shuttle/escape) -"QG" = ( -/obj/machinery/door/airlock/titanium{ - name = "Emergency Shuttle Airlock" +"LA" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 }, -/obj/structure/fans/tiny, -/turf/open/floor/mineral/titanium, +/turf/open/floor/iron/edge{ + dir = 4 + }, +/area/shuttle/escape) +"Mo" = ( +/obj/effect/turf_decal/trimline/neutral/filled/warning{ + dir = 8 + }, +/turf/open/floor/iron/edge{ + dir = 4 + }, +/area/shuttle/escape) +"NA" = ( +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 8 + }, +/turf/open/floor/iron/edge{ + dir = 4 + }, +/area/shuttle/escape) +"Oc" = ( +/obj/structure/chair/fancy/shuttle{ + dir = 8 + }, +/obj/machinery/newscaster/directional/east, +/turf/open/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) +"OP" = ( +/obj/machinery/recharger, +/obj/structure/table, +/obj/item/restraints/handcuffs{ + pixel_y = 3 + }, +/turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "RT" = ( /obj/machinery/door/airlock{ name = "Emergency Shuttle Restroom" }, /obj/machinery/door/firedoor, -/turf/open/floor/mineral/titanium/white, +/obj/effect/turf_decal/stripes/closeup, +/turf/open/floor/iron, /area/shuttle/escape) "RU" = ( /obj/machinery/door/airlock/titanium{ @@ -447,26 +755,78 @@ width = 28 }, /obj/structure/fans/tiny, -/turf/open/floor/mineral/titanium, +/obj/effect/turf_decal/stripes/closeup, +/turf/open/floor/iron/white, +/area/shuttle/escape) +"TP" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/edge{ + dir = 8 + }, +/area/shuttle/escape) +"Vz" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, /area/shuttle/escape) "VO" = ( /obj/effect/spawner/structure/window/shuttle, /turf/open/floor/plating, /area/shuttle/escape) +"Wg" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 8 + }, +/obj/structure/sign/nanotrasen{ + pixel_x = -32 + }, +/turf/open/floor/iron/edge{ + dir = 4 + }, +/area/shuttle/escape) +"WD" = ( +/obj/machinery/status_display/evac/directional/east, +/turf/open/floor/mineral/titanium/yellow, +/area/shuttle/escape) +"XM" = ( +/obj/machinery/iv_drip, +/obj/structure/bed/roller, +/obj/machinery/vending/wallmed/directional/east, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/turf/open/floor/iron/edge{ + dir = 8 + }, +/area/shuttle/escape) "YJ" = ( -/obj/machinery/door/airlock/command/glass{ +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/obj/machinery/door/airlock/command{ name = "Emergency Shuttle Cockpit"; req_access_txt = "19" }, -/obj/machinery/door/firedoor, -/turf/open/floor/mineral/titanium, +/turf/open/floor/iron, /area/shuttle/escape) "Zz" = ( /obj/machinery/door/airlock/medical/glass{ name = "Escape Shuttle Infirmary" }, /obj/machinery/door/firedoor, -/turf/open/floor/mineral/titanium/white, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/turf/open/floor/iron, +/area/shuttle/escape) +"ZD" = ( +/obj/machinery/light/small, +/obj/machinery/ai_slipper, +/obj/machinery/status_display/evac/directional/south, +/turf/open/floor/iron/large, /area/shuttle/escape) (1,1,1) = {" @@ -477,7 +837,7 @@ am ac qO qO -qg +qO ac am ac @@ -505,9 +865,9 @@ an ac ac ac -at -at -at +Fk +cB +Em ac ac ac @@ -518,21 +878,21 @@ ac ac ac az -aF +ap ac aT bc bk ac bt -az +ac ac ac "} (5,1,1) = {" qO -ap -aq +aF +ve bJ ac aU @@ -547,14 +907,14 @@ qO (6,1,1) = {" xE aq -aq -aq +Af +yT ac aV be bm ac -Jx +ZD ac ac ac @@ -562,16 +922,16 @@ ac (7,1,1) = {" qO ar -aq +WD aq ac aW bf bn ac -Jx +bN RT -bE +sV qO "} (8,1,1) = {" @@ -580,12 +940,12 @@ ac ac ED ac -aX +ac YJ -bi -az -RT -az +ac +ac +El +ac ac ac "} @@ -594,11 +954,11 @@ aa ac ac aH -at -at -at -at -at +Wg +uQ +Mo +uQ +Wg at ac ac @@ -608,57 +968,57 @@ aa aa aa ac -aI -at -aY -aY +iZ +Vz +Vz aY -at +Vz +Vz bv ac aa aa "} (11,1,1) = {" -VO -VO +qO +qO aB aJ -at +Vz aZ -VO +uc aK -at +Vz aL ac aa aa "} (12,1,1) = {" -QG -at +xE +Vz Gw -at -at +Vz +Vz aZ VO aK -at +Vz bP ac aa aa "} (13,1,1) = {" -VO -VO +qO +qO aB -bK -at +aK +Vz aZ VO aK -at +Vz bw ac aa @@ -669,11 +1029,11 @@ aa aa qO aK -at +Vz aZ -VO +fh aK -at +Vz aZ qO aa @@ -683,13 +1043,13 @@ aa aa aa qO -aK -at -at -at -at -at -aZ +Lj +Vz +Vz +dD +Vz +Vz +Ca qO aa aa @@ -699,57 +1059,57 @@ aa aa qO aK -at +Vz aZ -VO +uc aK -at +Vz aZ qO aa aa "} (17,1,1) = {" -VO -VO +qO +qO aB bK -at +Vz aZ VO aK -at -bx +Vz +aZ ac aa aa "} (18,1,1) = {" RU -at +Vz Gw -at -at +Vz +Vz aZ VO aK -at +Vz bP ac aa aa "} (19,1,1) = {" -VO -VO +qO +qO aB -aL -at +Dx +Vz aZ -VO +fh aK -at -by +Vz +bw ac aa aa @@ -759,11 +1119,11 @@ aa aa ac aM -at -ba -ba -ba -at +Vz +Vz +aY +Vz +Vz aI ac aa @@ -773,12 +1133,12 @@ aa aa ac ac -aN -at -at -at -at -at +iU +yg +CC +TP +CC +yg aN ac ac @@ -801,15 +1161,15 @@ ac "} (23,1,1) = {" ac -av +OP aE av aw bb ac bp -Jx -Jx +NA +LA bC bF ac @@ -817,28 +1177,28 @@ ac (24,1,1) = {" jj aw +qf aw -aw -aw -aw -qO -Jx -Jx -Jx -Jx +IQ +bM +ac +cl +uM +lL +uW bG qO "} (25,1,1) = {" ac +ta +Oc ax -ax -ax +mB aw -bM ac -bN -Jx +xr +XM bz bD bH @@ -849,12 +1209,12 @@ ac ac ac ac -qO +ac JJ ac -rp -qO -JM +Zz +ac +ac ac ac ac @@ -866,7 +1226,7 @@ ac ac aQ aw -qO +ac Jx bs ac diff --git a/_maps/shuttles/emergency/emergency_bar.dmm b/_maps/shuttles/emergency/emergency_bar.dmm index 872d81fee2707..41c7140145d58 100644 --- a/_maps/shuttles/emergency/emergency_bar.dmm +++ b/_maps/shuttles/emergency/emergency_bar.dmm @@ -15,6 +15,7 @@ "af" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp/green, +/obj/machinery/newscaster/directional/west, /turf/open/floor/carpet, /area/shuttle/escape) "ag" = ( @@ -36,19 +37,11 @@ }, /turf/open/floor/carpet, /area/shuttle/escape) -"ak" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = 30 - }, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/iron/freezer, -/area/shuttle/escape) "al" = ( /obj/machinery/computer/atmos_alert{ dir = 4 }, +/obj/machinery/status_display/evac/directional/west, /turf/open/floor/carpet, /area/shuttle/escape) "am" = ( @@ -70,6 +63,7 @@ /obj/machinery/computer/security{ dir = 8 }, +/obj/machinery/status_display/ai/directional/east, /turf/open/floor/carpet, /area/shuttle/escape) "aq" = ( @@ -79,27 +73,17 @@ /turf/open/floor/carpet, /area/shuttle/escape) "ar" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = -30 - }, /obj/structure/chair/fancy/comfy{ dir = 8 }, +/obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/carpet, /area/shuttle/escape) "as" = ( -/obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = -29 - }, +/obj/item/radio/intercom/directional/south, /turf/open/floor/carpet, /area/shuttle/escape) "at" = ( -/obj/machinery/button/flasher{ - id = "cockpit_flasher"; - pixel_x = 6; - pixel_y = -24 - }, /obj/structure/table/wood/poker, /obj/item/storage/box/drinkingglasses, /obj/item/reagent_containers/food/drinks/bottle/whiskey, @@ -110,12 +94,9 @@ /obj/machinery/computer/communications{ dir = 8 }, +/obj/machinery/camera/autoname/directional/east, /turf/open/floor/carpet, /area/shuttle/escape) -"aA" = ( -/obj/machinery/status_display/evac, -/turf/closed/wall/mineral/titanium, -/area/shuttle/escape) "aC" = ( /obj/structure/chair/fancy/shuttle, /turf/open/floor/mineral/plastitanium/red/brig, @@ -124,11 +105,19 @@ /obj/structure/musician/piano{ icon_state = "piano" }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/structure/sign/nanotrasen{ + pixel_y = 32 + }, /turf/open/floor/carpet/grimy, /area/shuttle/escape) "aG" = ( -/obj/structure/chair/stool/directional/west{ - can_buckle = 1 +/obj/structure/chair/stool{ + desc = "Apply butt, this one has a belt."; + can_buckle = 1; + dir = 8 }, /turf/open/floor/carpet/grimy, /area/shuttle/escape) @@ -166,11 +155,16 @@ /area/shuttle/escape) "aW" = ( /obj/structure/chair/wood/normal, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/open/floor/carpet/grimy, /area/shuttle/escape) "aY" = ( /obj/machinery/vending/boozeomat, -/turf/closed/wall/mineral/titanium, +/obj/machinery/status_display/evac/directional/east, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, /area/shuttle/escape) "aZ" = ( /obj/structure/chair/wood/normal{ @@ -192,18 +186,17 @@ /turf/open/floor/carpet/grimy, /area/shuttle/escape) "bi" = ( +/obj/machinery/ai_slipper, /turf/open/floor/mineral/titanium, /area/shuttle/escape) -"bn" = ( -/obj/effect/spawner/structure/window/shuttle, -/obj/structure/sign/departments/medbay/alt, -/turf/closed/wall/mineral/titanium, -/area/shuttle/escape) "bp" = ( +/obj/effect/decal/cleanable/oil, +/obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron/freezer, /area/shuttle/escape) "br" = ( -/obj/machinery/stasis, +/obj/machinery/iv_drip, +/obj/structure/bed/roller, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "bw" = ( @@ -213,50 +206,39 @@ brightness = 3; dir = 8 }, +/obj/machinery/camera/autoname/directional/west, +/obj/machinery/newscaster/directional/west, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "bx" = ( -/obj/structure/toilet{ - dir = 4 - }, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/iron/freezer, -/area/shuttle/escape) -"by" = ( /obj/machinery/recharge_station, /obj/machinery/light/small{ dir = 4 }, +/obj/item/radio/intercom/directional/west, +/obj/machinery/newscaster/directional/east, /turf/open/floor/iron/freezer, /area/shuttle/escape) "bz" = ( /obj/structure/table, -/obj/item/circular_saw, /obj/item/hemostat, -/obj/item/retractor, /obj/item/scalpel, -/obj/item/surgicaldrill, /obj/item/cautery, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "bC" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/structure/shuttle/engine/heater, +/obj/effect/spawner/structure/window/shuttle, +/obj/machinery/door/firedoor/window, /turf/open/floor/plating/airless, /area/shuttle/escape) "bE" = ( /obj/structure/shuttle/engine/propulsion, /turf/open/floor/plating/airless, /area/shuttle/escape) -"bF" = ( -/obj/effect/spawner/structure/window/shuttle, -/turf/open/floor/iron/freezer, -/area/shuttle/escape) "bH" = ( +/obj/machinery/status_display/evac/directional/west, +/obj/effect/turf_decal/siding/wood, /turf/open/floor/carpet/grimy, /area/shuttle/escape) "bJ" = ( @@ -268,6 +250,9 @@ /obj/structure/chair/wood/normal{ dir = 8 }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/open/floor/carpet/grimy, /area/shuttle/escape) "bL" = ( @@ -297,6 +282,7 @@ /obj/structure/chair/wood/normal{ dir = 1 }, +/obj/effect/turf_decal/siding/wood, /turf/open/floor/carpet/grimy, /area/shuttle/escape) "bS" = ( @@ -315,12 +301,14 @@ pixel_x = 4; pixel_y = 4 }, +/obj/item/radio/intercom/directional/south, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "bW" = ( /obj/machinery/light/small{ dir = 4 }, +/obj/machinery/status_display/ai/directional/east, /turf/open/floor/carpet/grimy, /area/shuttle/escape) "cb" = ( @@ -328,8 +316,16 @@ dir = 4 }, /obj/machinery/stasis, +/obj/machinery/status_display/evac/directional/east, /turf/open/floor/mineral/titanium, /area/shuttle/escape) +"cS" = ( +/obj/machinery/status_display/evac/directional/west, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/carpet/grimy, +/area/shuttle/escape) "ek" = ( /obj/structure/table, /obj/machinery/chem_dispenser/drinks{ @@ -338,12 +334,32 @@ /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/shuttle/escape) +"ft" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/machinery/holopad, +/turf/open/floor/carpet/grimy, +/area/shuttle/escape) +"gl" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, +/turf/open/floor/carpet/grimy, +/area/shuttle/escape) +"gr" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/turf/open/floor/carpet/grimy, +/area/shuttle/escape) "hb" = ( /obj/machinery/door/airlock{ - name = "Unit B" + name = "Unit 1" }, /obj/machinery/door/firedoor, -/turf/open/floor/iron/freezer, +/obj/effect/turf_decal/stripes/closeup, +/turf/open/floor/iron, /area/shuttle/escape) "hk" = ( /obj/structure/table/wood/bar{ @@ -353,12 +369,25 @@ group_name = "bar staff on the Emergency Escape Bar" }, /obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/open/floor/iron, /area/shuttle/escape) "hI" = ( -/obj/structure/chair/stool/bar/directional/west, -/obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron, +/obj/structure/chair/stool/bar{ + dir = 4; + can_buckle = 1; + desc = "The apex of the bar experience, this one comes with a belt." + }, +/turf/open/floor/wood, +/area/shuttle/escape) +"hM" = ( +/obj/structure/chair/fancy/shuttle{ + dir = 1 + }, +/obj/machinery/status_display/ai/directional/south, +/turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "hS" = ( /obj/structure/table, @@ -368,24 +397,31 @@ /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/shuttle/escape) +"jv" = ( +/obj/machinery/status_display/evac/directional/north, +/obj/machinery/light/small, +/turf/open/floor/iron/freezer, +/area/shuttle/escape) "kj" = ( /obj/machinery/vending/cigarette, -/obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron, +/turf/open/floor/wood, /area/shuttle/escape) "kK" = ( /obj/machinery/door/airlock/titanium{ name = "Emergency Shuttle Airlock" }, /obj/structure/fans/tiny, -/turf/open/floor/iron/freezer, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/turf/open/floor/iron/white, /area/shuttle/escape) "kS" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = -30 - }, -/obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron, +/turf/open/floor/wood, +/area/shuttle/escape) +"mB" = ( +/obj/machinery/holopad, +/turf/open/floor/carpet, /area/shuttle/escape) "oh" = ( /obj/item/kirbyplants{ @@ -393,8 +429,7 @@ pixel_x = -3; pixel_y = 3 }, -/obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron, +/turf/open/floor/wood, /area/shuttle/escape) "ox" = ( /obj/effect/turf_decal/tile/bar/opposingcorners, @@ -404,42 +439,51 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron, -/area/shuttle/escape) -"qm" = ( -/obj/machinery/door/airlock/titanium{ - name = "Emergency Shuttle Airlock" - }, -/obj/structure/fans/tiny, -/obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron, +/turf/open/floor/wood, /area/shuttle/escape) "rb" = ( /obj/machinery/door/airlock{ name = "Unit 2" }, /obj/machinery/door/firedoor, -/turf/open/floor/iron/freezer, +/obj/effect/turf_decal/stripes/closeup, +/turf/open/floor/iron, +/area/shuttle/escape) +"rp" = ( +/obj/machinery/camera/autoname/directional/south, +/turf/open/floor/wood, /area/shuttle/escape) "rs" = ( /mob/living/simple_animal/hostile/alien/maid/barmaid, /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/shuttle/escape) +"tB" = ( +/obj/machinery/vending/wallmed/directional/west, +/turf/open/floor/mineral/titanium, +/area/shuttle/escape) +"tV" = ( +/obj/structure/table/wood/bar{ + boot_dir = 8 + }, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/item/radio/intercom, +/turf/open/floor/iron, +/area/shuttle/escape) "up" = ( /obj/structure/table/wood/bar{ boot_dir = 10 }, /obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, /turf/open/floor/iron, /area/shuttle/escape) "wI" = ( -/obj/machinery/flasher{ - id = "cockpit_flasher"; - pixel_x = 6; - pixel_y = 24 - }, /obj/item/kirbyplants{ icon_state = "plant-21"; pixel_x = -3; @@ -448,34 +492,73 @@ /obj/machinery/light{ dir = 1 }, -/obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron, +/turf/open/floor/wood, /area/shuttle/escape) "xh" = ( /obj/item/kirbyplants{ icon_state = "plant-10" }, -/obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron, +/obj/machinery/status_display/evac/directional/east, +/turf/open/floor/wood, /area/shuttle/escape) "ys" = ( /obj/structure/table/wood/bar{ boot_dir = 9 }, /obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, /turf/open/floor/iron, /area/shuttle/escape) "zE" = ( /obj/machinery/light, -/obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron, +/obj/machinery/newscaster/directional/south, +/turf/open/floor/wood, +/area/shuttle/escape) +"zZ" = ( +/obj/structure/chair/fancy/shuttle, +/obj/machinery/camera/autoname/directional/west, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) +"As" = ( +/obj/machinery/newscaster/directional/north, +/turf/open/floor/wood, +/area/shuttle/escape) +"AJ" = ( +/obj/machinery/ai_slipper, +/turf/open/floor/wood, /area/shuttle/escape) "AX" = ( /obj/structure/chair/stool/bar{ + dir = 1; can_buckle = 1; - name = "buckleable bar stool" + desc = "The apex of the bar experience, this one comes with a belt." + }, +/turf/open/floor/wood, +/area/shuttle/escape) +"Cv" = ( +/obj/machinery/flasher{ + id = "cockpit_flasher"; + pixel_x = -25; + pixel_y = 25 + }, +/turf/open/floor/wood, +/area/shuttle/escape) +"DY" = ( +/obj/machinery/holopad, +/turf/open/floor/mineral/titanium, +/area/shuttle/escape) +"Fm" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 }, +/turf/open/floor/carpet/grimy, +/area/shuttle/escape) +"Fy" = ( /obj/effect/turf_decal/tile/bar/opposingcorners, +/mob/living/simple_animal/drone/snowflake/bardrone, /turf/open/floor/iron, /area/shuttle/escape) "FR" = ( @@ -483,7 +566,8 @@ name = "Medbay" }, /obj/machinery/door/firedoor, -/turf/open/floor/mineral/titanium, +/obj/effect/turf_decal/stripes/closeup, +/turf/open/floor/iron, /area/shuttle/escape) "Ge" = ( /obj/structure/table, @@ -491,26 +575,54 @@ dir = 8 }, /obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/machinery/camera/autoname/directional/east, +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/newscaster/directional/east, /turf/open/floor/iron, /area/shuttle/escape) +"Gr" = ( +/obj/machinery/button/flasher{ + id = "cockpit_flasher"; + pixel_x = -25; + pixel_y = -25 + }, +/turf/open/floor/carpet, +/area/shuttle/escape) +"GA" = ( +/obj/item/radio/intercom/directional/east, +/turf/open/floor/iron/freezer, +/area/shuttle/escape) "GY" = ( /obj/machinery/door/airlock/public/glass{ name = "Emergency Shuttle Cockpit"; req_access_txt = "19" }, /obj/machinery/door/firedoor, -/turf/open/floor/carpet, +/obj/effect/turf_decal/stripes/closeup, +/turf/open/floor/iron, /area/shuttle/escape) "JC" = ( /obj/structure/table/wood/bar, /obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/open/floor/iron, /area/shuttle/escape) +"JI" = ( +/obj/machinery/holopad, +/turf/open/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) "Lq" = ( /obj/structure/table/wood/bar{ boot_dir = 8 }, /obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/open/floor/iron, /area/shuttle/escape) "LQ" = ( @@ -519,7 +631,17 @@ req_access_txt = "2" }, /obj/structure/fans/tiny, -/turf/open/floor/mineral/plastitanium/red/brig, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/shuttle/escape) +"NU" = ( +/obj/structure/chair/fancy/comfy{ + dir = 4 + }, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/carpet, /area/shuttle/escape) "Py" = ( /obj/machinery/door/airlock/titanium{ @@ -529,8 +651,21 @@ name = "The Emergency Escape Bar" }, /obj/structure/fans/tiny, -/obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/shuttle/escape) +"PN" = ( +/obj/structure/mirror/directional/north{ + pixel_y = 32 + }, +/obj/structure/sink{ + dir = 1; + pixel_y = 24; + layer = 3.3 + }, +/turf/open/floor/iron/freezer, /area/shuttle/escape) "Qu" = ( /obj/structure/extinguisher_cabinet{ @@ -547,7 +682,8 @@ name = "Unisex Restrooms" }, /obj/machinery/door/firedoor, -/turf/open/floor/iron/freezer, +/obj/effect/turf_decal/stripes/closeup, +/turf/open/floor/iron, /area/shuttle/escape) "Rk" = ( /obj/machinery/door/airlock/public/glass{ @@ -555,47 +691,73 @@ req_access_txt = "2" }, /obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, /turf/open/floor/iron, /area/shuttle/escape) +"Rl" = ( +/obj/structure/chair/fancy/shuttle, +/obj/machinery/status_display/evac/directional/north, +/turf/open/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) +"Sq" = ( +/obj/structure/sign/departments/medbay/alt{ + pixel_y = -32 + }, +/turf/open/floor/wood, +/area/shuttle/escape) +"Vu" = ( +/obj/machinery/ai_slipper, +/turf/open/floor/carpet, +/area/shuttle/escape) "Vx" = ( /obj/machinery/light{ dir = 8 }, -/obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron, +/turf/open/floor/wood, +/area/shuttle/escape) +"Xg" = ( +/obj/structure/toilet{ + dir = 4 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/newscaster/directional/east, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/iron/freezer, /area/shuttle/escape) "Xz" = ( /obj/machinery/light/small, -/obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron, -/area/shuttle/escape) -"Yn" = ( -/obj/machinery/vending/wallmed{ - name = "Emergency NanoMed"; - use_power = 0 - }, -/turf/closed/wall/mineral/titanium/nodiagonal, +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/wood, /area/shuttle/escape) "YJ" = ( /obj/machinery/door/airlock{ - name = "Unit 1" + name = "Unit B" }, /obj/machinery/door/firedoor, -/turf/open/floor/iron/freezer, +/obj/effect/turf_decal/stripes/closeup, +/turf/open/floor/iron, /area/shuttle/escape) "Zm" = ( /obj/structure/table/wood/bar, /obj/item/instrument/guitar, /obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/open/floor/iron, /area/shuttle/escape) +"Zp" = ( +/obj/effect/spawner/structure/window/shuttle, +/obj/machinery/door/firedoor/window, +/turf/open/floor/plating, +/area/shuttle/escape) "Zq" = ( -/obj/machinery/light{ - dir = 4 - }, -/mob/living/simple_animal/drone/snowflake/bardrone, /obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/machinery/holopad, /turf/open/floor/iron, /area/shuttle/escape) "Zw" = ( @@ -603,6 +765,7 @@ boot_dir = 2 }, /obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/effect/turf_decal/siding/wood, /turf/open/floor/iron, /area/shuttle/escape) @@ -618,11 +781,11 @@ LQ ab Py ab -ac -ac -ac +Zp +Zp +Zp ab -qm +kK ab kK ab @@ -636,12 +799,12 @@ ab ab ab ab -aC +zZ aH aL ab oF -bH +cS aZ bc aZ @@ -660,11 +823,11 @@ ae al aq ab -aC -aI -aM +Rl +JI +hM ab -ox +kS aW ba bL @@ -672,14 +835,14 @@ bO bQ kS ab -bp +PN ab ab bC bE "} (4,1,1) = {" -ac +Zp af am ar @@ -688,76 +851,76 @@ aC aI aM ab -ox +As aW bJ bM bP bQ -ox +rp ab -ak +PN rb -bx +Xg bC bE "} (5,1,1) = {" -ac +Zp ag -an +Vu as ab ac Rk ac ae -ox -bH +kS +gl bK -bH +ft bK -bH -ox -aA -bp +gr +kS +ab +jv ab ab bC bE "} (6,1,1) = {" -ac +Zp ah an at ab wI -ox -ox +kS +kS Vx -ox -ox -ox -ox -ox -ox -ox +kS +kS +kS +kS +kS +kS +kS QE -bp +GA hb -by +Xg bC bE "} (7,1,1) = {" -ac +Zp ag -an -an +mB +Gr GY -ox -ox +Cv +AJ hI hI hI @@ -765,9 +928,9 @@ hI hI hI hI -ox +AJ zE -Yn +ae ab ab ab @@ -775,24 +938,24 @@ bC bE "} (8,1,1) = {" -ac +Zp ai ao -ao -aA +NU +ab oh -ox +kS ys -Lq +tV hk Lq Lq Lq up AX -ox -bn -bi +Sq +ab +tB bw bz bC @@ -805,18 +968,18 @@ ap au ab aF -bH +Fm JC ox rs Zq -ox +Fy ox Zw -ox -ox +kS +kS FR -bi +DY bi bS bC @@ -839,7 +1002,7 @@ hS Zw xh kj -bF +Zp br cb bU @@ -852,21 +1015,21 @@ aa aa aa ab -ac +Zp ab -ac +Zp ab ab ab -ac -ac -ac +Zp +Zp +Zp ab ab ab -ac +Zp ab -ac +Zp ab aa "} diff --git a/_maps/shuttles/emergency/emergency_birdboat.dmm b/_maps/shuttles/emergency/emergency_birdboat.dmm index 7307074e8a6f7..aa0a92edbcc10 100644 --- a/_maps/shuttles/emergency/emergency_birdboat.dmm +++ b/_maps/shuttles/emergency/emergency_birdboat.dmm @@ -35,12 +35,9 @@ "ah" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/shuttle/escape) -"ai" = ( -/obj/machinery/computer/emergency_shuttle, -/turf/open/floor/mineral/titanium/blue, -/area/shuttle/escape) "aj" = ( -/turf/open/floor/mineral/titanium/blue, +/obj/structure/chair/fancy/shuttle, +/turf/open/floor/mineral/titanium, /area/shuttle/escape) "ak" = ( /obj/item/kirbyplants{ @@ -52,24 +49,11 @@ /obj/structure/chair/fancy/shuttle, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) -"am" = ( -/obj/structure/chair/fancy/shuttle, -/obj/machinery/light{ - dir = 1 - }, -/turf/open/floor/mineral/plastitanium/red/brig, -/area/shuttle/escape) "an" = ( /obj/structure/table/optable, /obj/item/surgical_drapes, /turf/open/floor/mineral/titanium/white, /area/shuttle/escape) -"ao" = ( -/obj/machinery/light{ - dir = 4 - }, -/turf/open/floor/mineral/titanium/white, -/area/shuttle/escape) "ap" = ( /obj/structure/shuttle/engine/propulsion{ dir = 4 @@ -141,13 +125,6 @@ }, /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) -"aF" = ( -/obj/structure/table, -/obj/machinery/light{ - dir = 1 - }, -/turf/open/floor/mineral/plastitanium, -/area/shuttle/escape) "aH" = ( /obj/structure/chair/fancy/shuttle{ dir = 8 @@ -236,9 +213,6 @@ pixel_y = 5 }, /obj/item/storage/firstaid/brute, -/obj/machinery/light{ - dir = 4 - }, /turf/open/floor/mineral/titanium/white, /area/shuttle/escape) "aV" = ( @@ -247,10 +221,6 @@ }, /turf/open/floor/mineral/titanium, /area/shuttle/escape) -"aW" = ( -/obj/structure/chair/fancy/shuttle, -/turf/open/floor/mineral/plastitanium, -/area/shuttle/escape) "aX" = ( /obj/machinery/stasis, /turf/open/floor/mineral/titanium/white, @@ -260,17 +230,72 @@ /obj/item/defibrillator/loaded, /turf/open/floor/mineral/titanium/white, /area/shuttle/escape) -"xJ" = ( +"jz" = ( +/obj/machinery/door/airlock/public/glass, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/closeup, +/turf/open/floor/mineral/titanium/white, +/area/shuttle/escape) +"lL" = ( +/turf/closed/wall/mineral/titanium, +/area/template_noop) +"mr" = ( /obj/machinery/door/airlock/command/glass{ name = "bridge Door"; req_access_txt = "19" }, /obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/turf/open/floor/mineral/titanium, +/area/shuttle/escape) +"oq" = ( +/obj/machinery/computer/emergency_shuttle{ + dir = 4 + }, +/turf/open/floor/mineral/titanium/blue, +/area/shuttle/escape) +"ru" = ( +/obj/structure/chair/fancy/shuttle{ + dir = 1 + }, +/turf/open/floor/mineral/titanium, +/area/shuttle/escape) +"ta" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/mineral/titanium, +/area/shuttle/escape) +"xQ" = ( +/obj/structure/shuttle/engine/heater{ + dir = 8 + }, +/obj/effect/spawner/structure/window/shuttle, +/obj/machinery/door/firedoor/window, +/turf/open/floor/plating/airless, +/area/shuttle/escape) +"zf" = ( +/obj/structure/table, /turf/open/floor/mineral/titanium, /area/shuttle/escape) +"EQ" = ( +/obj/structure/chair/fancy/shuttle{ + dir = 1 + }, +/turf/open/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) +"Fg" = ( +/obj/machinery/computer/secure_data, +/turf/open/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) "Hy" = ( /obj/machinery/door/airlock/public/glass, /obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, /turf/open/floor/mineral/titanium/white, /area/shuttle/escape) "Mg" = ( @@ -284,23 +309,61 @@ width = 14 }, /obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "MN" = ( /obj/effect/spawner/structure/window/shuttle, +/obj/machinery/door/firedoor/window, /turf/open/floor/plating, /area/shuttle/escape) +"Ok" = ( +/obj/machinery/computer/security, +/turf/open/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) +"RD" = ( +/obj/machinery/door/airlock/command/glass{ + name = "bridge Door"; + req_access_txt = "19" + }, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/closeup, +/turf/open/floor/mineral/titanium, +/area/shuttle/escape) "Ti" = ( /obj/machinery/door/airlock/titanium, /obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, /turf/open/floor/mineral/titanium, /area/shuttle/escape) +"UE" = ( +/obj/machinery/computer/crew{ + dir = 4 + }, +/turf/open/floor/mineral/titanium/blue, +/area/shuttle/escape) +"Vg" = ( +/obj/effect/spawner/structure/window/shuttle, +/obj/machinery/door/firedoor/window, +/turf/open/floor/plating, +/area/template_noop) "Wn" = ( /obj/machinery/door/airlock/security/glass{ name = "security Airlock"; req_access_txt = "63" }, /obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/closeup, +/turf/open/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) +"Xi" = ( +/obj/machinery/light{ + dir = 4 + }, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) @@ -310,13 +373,13 @@ aa ab ab MN -ab -MN MN +ab MN MN MN ab +ab aa aa "} @@ -325,9 +388,9 @@ aa ab ah aq -ak -MN -aB +oq +UE +ab aH aH aH @@ -339,12 +402,12 @@ aa (3,1,1) = {" aa ab -ai +ak ar aC -xJ -aC -aC +av +ab +ta aC aC aC @@ -356,58 +419,58 @@ aa aa MN aj +zf +ru +aC +RD +aC aC -av -ab -aD -aD -aL aC aC aS -ab +MN aa "} (5,1,1) = {" aa MN aj -aC +zf +ru aV ab aE aE aM aC -aC aS -ab +MN aa "} (6,1,1) = {" -aa +lL +ab +ab +mr +MN ab -ak -aC -ak ab -aF +aL aI aL aC -aC aT ah ab "} (7,1,1) = {" -aa -ab -ab -xJ -MN +lL +Ok +at +at +ax ab -aC +aB aC aC aC @@ -417,13 +480,13 @@ aB ab "} (8,1,1) = {" -aa -ab -al +lL +Fg +at at at MN -aB +aC aC aC aC @@ -433,9 +496,9 @@ aV ab "} (9,1,1) = {" -aa -ab -al +Vg +at +at at at Wn @@ -444,47 +507,47 @@ aC aN aP aC -aC -aW +aE +aE MN "} (10,1,1) = {" -aa -ab -am +Vg +al at at +EQ MN aC aC aN aP aC -aC -aW +aD +aD MN "} (11,1,1) = {" -aa -ab +Vg al at -ax +at +EQ ab aC aC aN aP aC -aC -aW +aH +aH MN "} (12,1,1) = {" -aa -ab +lL al at +Xi ay ab aC @@ -518,10 +581,10 @@ ad an af af -Hy +jz aC aC -Hy +jz aQ af af @@ -534,10 +597,10 @@ ae af af af -Hy +jz aC aC -Hy +jz af af af @@ -547,14 +610,14 @@ ab (16,1,1) = {" ab af -ao +af +af af ab +aC +aJ ab -Ti -Ti -ab -ab +af aR aU aY @@ -562,18 +625,18 @@ ab "} (17,1,1) = {" ab -ab -ab -ab -ab +xQ +xQ +xQ +xQ ab aC -aJ -ab -ab -ab -ab +aC ab +xQ +xQ +xQ +xQ ab "} (18,1,1) = {" @@ -581,12 +644,12 @@ ab ag ap au -ab +ag ab Ti Mg ab -ab +ag ag ap au diff --git a/_maps/shuttles/emergency/emergency_delta.dmm b/_maps/shuttles/emergency/emergency_delta.dmm index c67ec5cea34cf..664261a5faf3a 100644 --- a/_maps/shuttles/emergency/emergency_delta.dmm +++ b/_maps/shuttles/emergency/emergency_delta.dmm @@ -15,13 +15,15 @@ /turf/closed/wall/mineral/plastitanium, /area/shuttle/escape) "ad" = ( -/obj/structure/window/reinforced, /obj/structure/shuttle/engine/heater{ dir = 1 }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/structure/window/reinforced/survival_pod{ + dir = 1 + }, /turf/open/floor/plating/airless, /area/shuttle/escape) "ae" = ( @@ -30,90 +32,28 @@ "af" = ( /turf/closed/wall/mineral/titanium, /area/shuttle/escape) -"ag" = ( -/obj/structure/window/shuttle, -/obj/structure/grille, -/turf/open/floor/plating, -/area/shuttle/escape) "ah" = ( -/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/structure/chair/fancy/shuttle, +/obj/effect/turf_decal/bot, +/obj/machinery/newscaster/directional/north, +/turf/open/floor/iron, +/area/shuttle/escape) +"ap" = ( +/obj/structure/flora/ausbushes/grassybush, +/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/ausbushes/brflowers, +/obj/structure/flora/ausbushes/leafybush, +/obj/structure/window/reinforced{ + dir = 1; + pixel_y = 1 }, -/obj/item/clothing/head/utility/hardhat/orange{ - name = "protective hat"; - pixel_y = 9 +/obj/structure/window/reinforced{ + dir = 8 }, -/obj/item/clothing/head/utility/hardhat/orange{ - name = "protective hat"; - pixel_y = 9 +/obj/structure/window/reinforced{ + dir = 4 }, -/obj/structure/closet/crate/internals, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, +/turf/open/floor/grass, /area/shuttle/escape) "aq" = ( /obj/machinery/status_display/evac, @@ -124,23 +64,47 @@ dir = 4 }, /obj/effect/turf_decal/bot, -/turf/open/floor/iron, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 8 + }, +/turf/open/floor/iron/edge{ + dir = 4 + }, /area/shuttle/escape) "aw" = ( /obj/structure/chair/fancy/shuttle{ dir = 8 }, /obj/effect/turf_decal/bot, -/turf/open/floor/iron, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/turf/open/floor/iron/edge{ + dir = 8 + }, /area/shuttle/escape) "ax" = ( /obj/structure/flora/ausbushes/grassybush, /obj/structure/flora/ausbushes/lavendergrass, /obj/structure/flora/ausbushes/brflowers, /obj/structure/flora/ausbushes/leafybush, -/obj/structure/window/shuttle, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced, /turf/open/floor/grass, /area/shuttle/escape) +"az" = ( +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 8 + }, +/turf/open/floor/iron/white/smooth_edge{ + dir = 4 + }, +/area/shuttle/escape) "aC" = ( /obj/machinery/status_display/ai, /turf/closed/wall/mineral/titanium/nodiagonal, @@ -150,26 +114,35 @@ /turf/closed/wall/mineral/titanium/nodiagonal, /area/shuttle/escape) "aE" = ( -/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 10 + }, /turf/open/floor/iron, /area/shuttle/escape) "aH" = ( /obj/structure/chair/fancy/shuttle{ dir = 4 }, -/obj/item/radio/intercom{ - name = "Station Intercom"; - pixel_x = -26 - }, /obj/effect/turf_decal/bot, -/turf/open/floor/iron, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 8 + }, +/obj/machinery/camera/autoname/directional/west, +/turf/open/floor/iron/edge{ + dir = 4 + }, /area/shuttle/escape) "aI" = ( /obj/structure/flora/ausbushes/grassybush, /obj/structure/flora/ausbushes/lavendergrass, /obj/structure/flora/ausbushes/ywflowers, /obj/structure/flora/ausbushes/genericbush, -/obj/structure/window/shuttle, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, /turf/open/floor/grass, /area/shuttle/escape) "aK" = ( @@ -189,22 +162,34 @@ /obj/machinery/light{ dir = 8 }, -/turf/open/floor/iron, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 8 + }, +/turf/open/floor/iron/edge{ + dir = 4 + }, /area/shuttle/escape) "aX" = ( /obj/structure/flora/ausbushes/grassybush, /obj/structure/flora/ausbushes/lavendergrass, /obj/structure/flora/ausbushes/ppflowers, /obj/structure/flora/ausbushes/sunnybush, -/obj/structure/window/shuttle, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced, /turf/open/floor/grass, /area/shuttle/escape) "aY" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = -26 - }, /obj/machinery/shieldgen, /obj/effect/turf_decal/bot, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 9 + }, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron, /area/shuttle/escape) "aZ" = ( @@ -224,28 +209,34 @@ /obj/machinery/light/small{ dir = 1 }, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 5 + }, /turf/open/floor/iron, /area/shuttle/escape) "ba" = ( /obj/structure/reagent_dispensers/fueltank, -/obj/item/radio/intercom{ - name = "Station Intercom"; - pixel_x = -26 - }, /obj/effect/turf_decal/bot, -/turf/open/floor/iron, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 8 + }, +/turf/open/floor/iron/edge{ + dir = 4 + }, /area/shuttle/escape) "bb" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/turf/open/floor/iron, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, /area/shuttle/escape) "bc" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/turf/open/floor/iron, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, /area/shuttle/escape) "bd" = ( /obj/structure/closet/crate/medical, @@ -269,32 +260,50 @@ pixel_x = -3; pixel_y = 2 }, -/turf/open/floor/iron, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 4 + }, +/turf/open/floor/iron/edge{ + dir = 8 + }, /area/shuttle/escape) "be" = ( /obj/structure/flora/ausbushes/grassybush, /obj/structure/flora/ausbushes/lavendergrass, /obj/structure/flora/ausbushes/ywflowers, /obj/structure/flora/ausbushes/fernybush, -/obj/structure/window/shuttle, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, /turf/open/floor/grass, /area/shuttle/escape) "bf" = ( /obj/structure/reagent_dispensers/watertank, /obj/effect/turf_decal/bot, -/turf/open/floor/iron, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 8 + }, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/iron/edge{ + dir = 4 + }, /area/shuttle/escape) "bg" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/turf/open/floor/iron, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, /area/shuttle/escape) "bh" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/iron, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, /area/shuttle/escape) "bi" = ( /obj/structure/closet/crate{ @@ -314,7 +323,12 @@ /obj/item/wrench, /obj/item/radio, /obj/effect/turf_decal/bot, -/turf/open/floor/iron, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 4 + }, +/turf/open/floor/iron/edge{ + dir = 8 + }, /area/shuttle/escape) "bj" = ( /obj/machinery/vending/wallmed{ @@ -333,19 +347,26 @@ /obj/machinery/light{ dir = 8 }, -/turf/open/floor/iron, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 8 + }, +/turf/open/floor/iron/edge{ + dir = 4 + }, /area/shuttle/escape) "bm" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/turf/open/floor/iron, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, /area/shuttle/escape) "bn" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/turf/open/floor/iron, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, /area/shuttle/escape) "bq" = ( /obj/structure/table, @@ -354,18 +375,28 @@ /obj/item/pen, /obj/item/hand_labeler_refill, /obj/effect/turf_decal/bot, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 10 + }, /turf/open/floor/iron, /area/shuttle/escape) "br" = ( /obj/machinery/recharge_station, /obj/effect/turf_decal/delivery, -/turf/open/floor/iron, +/obj/effect/turf_decal/trimline/yellow/filled/line, +/obj/machinery/status_display/evac/directional/south, +/turf/open/floor/iron/edge{ + dir = 1 + }, /area/shuttle/escape) "bs" = ( /obj/structure/table, /obj/machinery/cell_charger, /obj/item/stock_parts/cell/high, /obj/effect/turf_decal/bot, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 6 + }, /turf/open/floor/iron, /area/shuttle/escape) "bw" = ( @@ -389,8 +420,8 @@ pixel_x = -26; pixel_y = 24 }, -/obj/effect/turf_decal/tile/red{ - dir = 1 +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 9 }, /turf/open/floor/iron, /area/shuttle/escape) @@ -398,16 +429,33 @@ /obj/item/kirbyplants{ icon_state = "plant-21" }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 5 + }, +/obj/structure/sign/nanotrasen{ + pixel_x = 32 }, /turf/open/floor/iron, /area/shuttle/escape) "bB" = ( -/obj/structure/table, -/obj/item/clipboard, -/obj/item/toy/figure/ninja, +/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/effect/turf_decal/bot, +/obj/machinery/atmospherics/components/unary/tank/air, /turf/open/floor/iron, /area/shuttle/escape) "bC" = ( @@ -415,57 +463,57 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/shuttle/escape) -"bD" = ( -/obj/structure/chair/fancy/shuttle, -/obj/machinery/status_display/evac{ - pixel_y = 32 - }, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, -/area/shuttle/escape) "bE" = ( /obj/structure/chair/fancy/shuttle{ dir = 4 }, +/obj/structure/reagent_dispensers/peppertank/directional/west, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "bF" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 +/obj/effect/turf_decal/trimline/dark_blue/filled/warning{ + dir = 8 + }, +/turf/open/floor/iron/edge{ + dir = 4 }, -/turf/open/floor/iron, /area/shuttle/escape) "bG" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 26 - }, /obj/machinery/light{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 4 }, -/turf/open/floor/iron, +/obj/structure/extinguisher_cabinet/directional/east, +/turf/open/floor/iron/edge{ + dir = 8 + }, /area/shuttle/escape) "bH" = ( +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 5 + }, /turf/open/floor/iron, /area/shuttle/escape) "bI" = ( -/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 6 + }, /turf/open/floor/iron, /area/shuttle/escape) "bK" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 10 }, -/turf/open/floor/iron, +/turf/open/floor/catwalk_floor/iron, /area/shuttle/escape) "bL" = ( /obj/machinery/door/airlock/external{ name = "Emergency Recovery Airlock" }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 }, /turf/open/floor/iron, /area/shuttle/escape) @@ -492,36 +540,43 @@ "bP" = ( /obj/structure/table/reinforced, /obj/machinery/recharger, -/obj/effect/turf_decal/tile/red{ +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 8 }, -/turf/open/floor/iron, +/turf/open/floor/iron/edge{ + dir = 4 + }, /area/shuttle/escape) "bQ" = ( /obj/structure/fireaxecabinet{ pixel_x = 32 }, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron, +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 4 + }, +/obj/machinery/camera/autoname/directional/east, +/turf/open/floor/iron/edge{ + dir = 8 + }, /area/shuttle/escape) "bR" = ( /obj/machinery/door/airlock/external{ name = "Emergency Recovery Airlock" }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron, /area/shuttle/escape) "bS" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 5 }, -/turf/open/floor/iron, +/turf/open/floor/catwalk_floor/iron, /area/shuttle/escape) "bT" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 9 }, -/turf/open/floor/iron, +/turf/open/floor/catwalk_floor/iron, /area/shuttle/escape) "bU" = ( /obj/structure/chair/fancy/shuttle{ @@ -532,18 +587,17 @@ "bV" = ( /obj/structure/table/reinforced, /obj/item/storage/box/zipties, -/obj/item/radio/intercom{ - name = "Station Intercom"; - pixel_y = -26 - }, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "bW" = ( /obj/structure/table/reinforced, /obj/item/paper_bin, /obj/item/pen, -/obj/effect/turf_decal/tile/red{ - dir = 8 +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 10 + }, +/obj/structure/sign/nanotrasen{ + pixel_x = -32 }, /turf/open/floor/iron, /area/shuttle/escape) @@ -553,10 +607,10 @@ /turf/open/floor/iron, /area/shuttle/escape) "co" = ( -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 8 +/obj/effect/turf_decal/trimline/dark_blue/filled/warning, +/turf/open/floor/iron/edge{ + dir = 1 }, -/turf/open/floor/iron, /area/shuttle/escape) "cB" = ( /obj/structure/chair/fancy/shuttle{ @@ -566,14 +620,30 @@ /obj/machinery/light{ dir = 4 }, -/turf/open/floor/iron, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/obj/machinery/camera/autoname/directional/east, +/turf/open/floor/iron/edge{ + dir = 8 + }, /area/shuttle/escape) "cC" = ( /obj/effect/turf_decal/bot, -/turf/open/floor/iron, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 4 + }, +/turf/open/floor/iron/edge{ + dir = 8 + }, /area/shuttle/escape) "cF" = ( /obj/machinery/light, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 4 + }, +/obj/machinery/ai_slipper, +/obj/machinery/status_display/evac/directional/south, /turf/open/floor/iron, /area/shuttle/escape) "cG" = ( @@ -581,6 +651,7 @@ dir = 1 }, /obj/machinery/light, +/obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "cH" = ( @@ -588,106 +659,251 @@ /obj/machinery/light/small, /turf/open/floor/iron, /area/shuttle/escape) +"dg" = ( +/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/internals, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 6 + }, +/turf/open/floor/iron, +/area/shuttle/escape) "dr" = ( /obj/machinery/computer/communications{ dir = 1 }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + alpha = 180; dir = 8 }, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, /area/shuttle/escape) "dX" = ( /obj/machinery/computer/operating, -/obj/effect/turf_decal/tile/blue/opposingcorners{ +/obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 }, -/turf/open/floor/iron/white, +/turf/open/floor/iron/white/smooth_edge, /area/shuttle/escape) "eY" = ( /obj/machinery/door/airlock/medical/glass{ name = "Escape Shuttle Infirmary" }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, /turf/open/floor/iron, /area/shuttle/escape) -"hB" = ( -/obj/effect/spawner/structure/window/shuttle, -/turf/open/floor/plating, +"gv" = ( +/obj/effect/turf_decal/trimline/dark_blue/filled/warning{ + dir = 1 + }, +/turf/open/floor/iron/edge, +/area/shuttle/escape) +"iz" = ( +/obj/structure/chair/fancy/shuttle, +/obj/machinery/camera/autoname/directional/north, +/turf/open/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) +"iG" = ( +/obj/effect/turf_decal/trimline/neutral/filled/warning{ + dir = 8 + }, +/turf/open/floor/iron/edge{ + dir = 4 + }, /area/shuttle/escape) "jP" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger, /obj/item/stock_parts/cell/high, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, /area/shuttle/escape) "kc" = ( -/obj/effect/turf_decal/tile/blue/half/contrasted{ +/turf/open/floor/iron/white/smooth_large, +/area/shuttle/escape) +"kS" = ( +/obj/structure/flora/ausbushes/grassybush, +/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/flora/ausbushes/sunnybush, +/obj/structure/window/reinforced{ dir = 8 }, -/turf/open/floor/iron/white, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 1; + pixel_y = 1 + }, +/turf/open/floor/grass, /area/shuttle/escape) "nv" = ( /obj/machinery/computer/crew{ dir = 1 }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + alpha = 180; + dir = 8 + }, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/shuttle/escape) +"nz" = ( +/obj/structure/chair/fancy/shuttle{ + dir = 8 + }, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/iron/edge{ dir = 8 }, -/turf/open/floor/iron/dark, /area/shuttle/escape) "oq" = ( /obj/structure/bed/roller, /obj/machinery/iv_drip, -/obj/effect/turf_decal/tile/blue/half/contrasted{ +/obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 }, -/turf/open/floor/iron/white, +/turf/open/floor/iron/white/smooth_edge{ + dir = 4 + }, /area/shuttle/escape) "pa" = ( -/obj/item/radio/intercom{ - name = "Station Intercom"; - pixel_y = 58 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 +/obj/machinery/atmospherics/components/binary/dp_vent_pump{ + dir = 4 }, -/turf/open/floor/iron, +/turf/open/floor/catwalk_floor/iron, /area/shuttle/escape) -"qL" = ( -/obj/item/radio/intercom{ - name = "Station Intercom"; - pixel_x = 26; - pixel_y = 58 +"pk" = ( +/obj/effect/turf_decal/tile/blue/anticorner, +/obj/machinery/holopad{ + pixel_x = 16; + pixel_y = -16 }, -/obj/effect/turf_decal/tile/blue/opposingcorners{ +/turf/open/floor/iron/white/smooth_corner{ dir = 1 }, -/turf/open/floor/iron/white, +/area/shuttle/escape) +"pw" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/turf/open/floor/iron/edge, +/area/shuttle/escape) +"qU" = ( +/obj/machinery/camera/autoname/directional/north, +/obj/machinery/status_display/ai/directional/north, +/turf/open/floor/carpet/blue, /area/shuttle/escape) "rY" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 4 }, -/turf/open/floor/iron, +/turf/open/floor/catwalk_floor/iron, /area/shuttle/escape) "sc" = ( /obj/structure/chair/office, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/siding/thinplating_new/dark, +/turf/open/floor/carpet/blue, /area/shuttle/escape) "sN" = ( /obj/machinery/computer/security{ dir = 4 }, -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ +/obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, -/turf/open/floor/iron/dark, +/obj/structure/sign/nanotrasen{ + pixel_x = -32 + }, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, /area/shuttle/escape) "sU" = ( /obj/item/kirbyplants{ @@ -698,32 +914,58 @@ /obj/machinery/light{ dir = 1 }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 8 + }, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/carpet/blue, /area/shuttle/escape) "tw" = ( /obj/machinery/computer/secure_data{ dir = 4 }, -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - dir = 8 +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark/side{ + dir = 4 }, -/turf/open/floor/iron/dark, /area/shuttle/escape) "uc" = ( /obj/structure/chair/office/light{ dir = 1 }, -/obj/effect/turf_decal/tile/blue/opposingcorners{ +/turf/open/floor/iron/white/smooth_large, +/area/shuttle/escape) +"ue" = ( +/obj/effect/turf_decal/tile/blue/anticorner{ dir = 1 }, -/turf/open/floor/iron/white, +/turf/open/floor/iron/white/smooth_corner, +/area/shuttle/escape) +"uA" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Holding Area"; + req_access_txt = "2" + }, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/closeup, +/turf/open/floor/iron, +/area/shuttle/escape) +"vi" = ( +/obj/effect/turf_decal/tile/blue/anticorner{ + dir = 8 + }, +/turf/open/floor/iron/white/smooth_corner{ + dir = 4 + }, /area/shuttle/escape) "vm" = ( /obj/machinery/stasis, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 10 }, +/obj/machinery/vending/wallmed/directional/south, /turf/open/floor/iron/white, /area/shuttle/escape) "vA" = ( @@ -731,24 +973,70 @@ dir = 8; name = "emergency shower" }, -/obj/effect/turf_decal/tile/blue/half/contrasted, -/turf/open/floor/iron/white, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/turf/open/floor/iron/white/smooth_edge{ + dir = 8 + }, /area/shuttle/escape) "wW" = ( /obj/structure/table/reinforced, /obj/machinery/recharger, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/shuttle/escape) +"xg" = ( +/obj/machinery/status_display/evac/directional/north, +/turf/open/floor/carpet/blue, +/area/shuttle/escape) +"xi" = ( +/obj/structure/flora/ausbushes/grassybush, +/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/ausbushes/brflowers, +/obj/structure/flora/ausbushes/leafybush, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 1; + pixel_y = 1 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/open/floor/grass, +/area/shuttle/escape) +"xn" = ( +/obj/machinery/recharge_station, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/trimline/yellow/filled/line, +/turf/open/floor/iron/edge{ + dir = 1 + }, +/area/shuttle/escape) +"xB" = ( +/obj/structure/table, +/obj/item/clipboard, +/obj/item/toy/figure/ninja, +/obj/effect/turf_decal/bot, +/obj/structure/extinguisher_cabinet/directional/north, +/turf/open/floor/iron, +/area/shuttle/escape) +"xX" = ( +/obj/machinery/holopad, +/turf/open/floor/carpet/blue, /area/shuttle/escape) "zd" = ( /obj/machinery/door/airlock/command{ name = "Emergency Recovery Airlock"; req_access_txt = "19" }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, /turf/open/floor/iron, /area/shuttle/escape) "zl" = ( @@ -760,62 +1048,114 @@ /obj/machinery/light{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/turf/open/floor/iron/edge{ + dir = 8 + }, /area/shuttle/escape) "zr" = ( /obj/structure/table/reinforced, /obj/item/folder/red, /obj/item/restraints/handcuffs, /obj/item/assembly/flash/handheld, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/shuttle/escape) +"zu" = ( +/obj/machinery/ai_slipper, +/turf/open/floor/carpet/blue, /area/shuttle/escape) "zW" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, +/area/shuttle/escape) +"zZ" = ( +/obj/structure/chair/office{ + dir = 8 + }, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 8 + }, +/turf/open/floor/carpet/blue, +/area/shuttle/escape) +"Ab" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line, +/obj/machinery/newscaster/directional/south, +/turf/open/floor/iron/edge{ + dir = 1 + }, /area/shuttle/escape) "Af" = ( /obj/structure/table/optable, /obj/item/surgical_drapes, -/obj/effect/turf_decal/tile/blue/opposingcorners{ +/obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 }, -/turf/open/floor/iron/white, +/turf/open/floor/iron/white/smooth_edge, /area/shuttle/escape) "Ay" = ( /obj/machinery/door/airlock/shuttle{ name = "Emergency Shuttle Airlock" }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /obj/structure/fans/tiny, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, /turf/open/floor/iron/white, /area/shuttle/escape) "AG" = ( /obj/machinery/computer/med_data{ dir = 4 }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/turf/open/floor/iron/white/smooth_edge{ dir = 4 }, -/turf/open/floor/iron/white, /area/shuttle/escape) -"Cl" = ( -/obj/effect/turf_decal/tile/blue/half/contrasted{ +"AP" = ( +/obj/structure/flora/ausbushes/grassybush, +/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/ausbushes/brflowers, +/obj/structure/flora/ausbushes/leafybush, +/obj/structure/window/reinforced{ dir = 4 }, -/turf/open/floor/iron/white, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/open/floor/grass, +/area/shuttle/escape) +"AZ" = ( +/obj/effect/turf_decal/trimline/yellow/filled/warning{ + dir = 1 + }, +/turf/open/floor/iron/edge, +/area/shuttle/escape) +"CS" = ( +/obj/machinery/holopad, +/turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "Dx" = ( /obj/machinery/computer/station_alert{ dir = 8 }, -/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ - dir = 4 +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/structure/sign/nanotrasen{ + pixel_x = 32 + }, +/turf/open/floor/iron/dark/side{ + dir = 8 }, -/turf/open/floor/iron/dark, +/area/shuttle/escape) +"DG" = ( +/obj/machinery/ai_slipper, +/turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "Ec" = ( /obj/item/scalpel{ @@ -833,9 +1173,12 @@ /obj/structure/table/reinforced, /obj/item/surgicaldrill, /obj/item/cautery, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 5 }, +/obj/machinery/camera/autoname/directional/north, +/obj/machinery/status_display/evac/directional/east, +/obj/machinery/newscaster/directional/north, /turf/open/floor/iron/white, /area/shuttle/escape) "Ej" = ( @@ -844,24 +1187,40 @@ req_access_txt = "2" }, /obj/machinery/door/firedoor, -/turf/open/floor/mineral/plastitanium/red/brig, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/turf/open/floor/iron, /area/shuttle/escape) "Eu" = ( /obj/structure/table/reinforced, /obj/item/storage/firstaid/regular, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/siding/thinplating_new/dark, +/turf/open/floor/carpet/blue, /area/shuttle/escape) "Ey" = ( /obj/machinery/door/airlock/shuttle{ name = "Emergency Shuttle Cargo" }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, /turf/open/floor/iron, /area/shuttle/escape) +"EJ" = ( +/obj/structure/chair/fancy/shuttle{ + dir = 1 + }, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) +"FO" = ( +/obj/structure/sign/nanotrasen{ + pixel_x = 32 + }, +/turf/template_noop, +/area/template_noop) "Gd" = ( /obj/item/reagent_containers/glass/bottle/epinephrine{ pixel_x = 6 @@ -897,44 +1256,93 @@ /obj/machinery/light{ dir = 8 }, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/turf/open/floor/iron/white/smooth_edge{ + dir = 4 }, -/turf/open/floor/iron/white, /area/shuttle/escape) "Gg" = ( /obj/structure/chair/office{ dir = 8 }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 10 + }, +/turf/open/floor/carpet/blue, +/area/shuttle/escape) +"GG" = ( +/obj/structure/chair/fancy/shuttle{ + dir = 1 + }, +/obj/machinery/newscaster/directional/south, +/turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "Hh" = ( /obj/machinery/door/airlock/command/glass{ name = "Cockpit"; req_access_txt = "19" }, -/obj/effect/turf_decal/stripes/line, /obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron, /area/shuttle/escape) +"Ho" = ( +/obj/effect/turf_decal/trimline/neutral/filled/warning{ + dir = 4 + }, +/turf/open/floor/iron/edge{ + dir = 8 + }, +/area/shuttle/escape) +"Hv" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/holopad, +/turf/open/floor/iron/large, +/area/shuttle/escape) +"Hz" = ( +/obj/structure/sign/nanotrasen{ + pixel_x = -32 + }, +/turf/template_noop, +/area/template_noop) +"HH" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line, +/turf/open/floor/iron/edge{ + dir = 1 + }, +/area/shuttle/escape) "IG" = ( /obj/item/kirbyplants{ icon_state = "plant-21"; pixel_x = -3; pixel_y = 3 }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 8 }, -/turf/open/floor/iron, +/obj/machinery/newscaster/directional/west, +/turf/open/floor/iron/edge{ + dir = 4 + }, +/area/shuttle/escape) +"JW" = ( +/obj/machinery/stasis, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 6 + }, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/iron/white, /area/shuttle/escape) "Kr" = ( /obj/structure/table/reinforced, /obj/item/paper_bin, /obj/item/pen, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, +/obj/machinery/newscaster/directional/south, +/turf/open/floor/iron/dark/corner{ + dir = 4 + }, /area/shuttle/escape) "Ky" = ( /obj/effect/spawner/structure/window/shuttle, @@ -946,24 +1354,197 @@ name = "Emergency Shuttle Airlock"; req_access_txt = "2" }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /obj/structure/fans/tiny, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, /turf/open/floor/iron/white, /area/shuttle/escape) +"KN" = ( +/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/internals, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 9 + }, +/turf/open/floor/iron, +/area/shuttle/escape) "LM" = ( /obj/machinery/light{ dir = 1 }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/turf/open/floor/iron/edge, +/area/shuttle/escape) +"Mb" = ( +/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/internals, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 5 }, /turf/open/floor/iron, /area/shuttle/escape) +"Mi" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/ai_slipper, +/turf/open/floor/iron/large, +/area/shuttle/escape) "Ml" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, +/turf/open/floor/carpet/blue, /area/shuttle/escape) "Mo" = ( /obj/item/kirbyplants{ @@ -974,20 +1555,39 @@ /obj/machinery/light{ dir = 8 }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 8 + }, +/obj/machinery/camera/autoname/directional/west, +/turf/open/floor/iron/edge{ + dir = 4 + }, +/area/shuttle/escape) +"Mq" = ( +/obj/item/kirbyplants{ + icon_state = "plant-21"; + pixel_x = -3; + pixel_y = 3 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 8 + }, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/iron/edge{ + dir = 4 }, -/turf/open/floor/iron, /area/shuttle/escape) "MY" = ( /obj/structure/sink{ dir = 4; pixel_x = 11 }, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/turf/open/floor/iron/white/smooth_edge{ + dir = 8 }, -/turf/open/floor/iron/white, /area/shuttle/escape) "Np" = ( /obj/item/storage/firstaid/toxin, @@ -996,17 +1596,29 @@ pixel_y = 3 }, /obj/structure/table/reinforced, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ +/obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 }, -/turf/open/floor/iron/white, +/turf/open/floor/iron/white/smooth_edge{ + dir = 8 + }, +/area/shuttle/escape) +"OM" = ( +/obj/effect/turf_decal/tile/blue/anticorner{ + dir = 4 + }, +/turf/open/floor/iron/white/smooth_corner{ + dir = 8 + }, /area/shuttle/escape) "Pe" = ( /obj/structure/chair/office{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 6 + }, +/turf/open/floor/carpet/blue, /area/shuttle/escape) "Pm" = ( /obj/item/storage/firstaid/fire, @@ -1015,8 +1627,18 @@ pixel_y = 3 }, /obj/structure/table/reinforced, -/obj/effect/turf_decal/tile/blue/half/contrasted, -/turf/open/floor/iron/white, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/turf/open/floor/iron/white/smooth_edge{ + dir = 8 + }, +/area/shuttle/escape) +"PN" = ( +/obj/structure/chair/fancy/shuttle, +/obj/effect/turf_decal/bot, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron, /area/shuttle/escape) "Qa" = ( /obj/machinery/flasher{ @@ -1024,44 +1646,135 @@ pixel_y = -26 }, /obj/machinery/light, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 +/obj/effect/turf_decal/trimline/neutral/filled/line, +/turf/open/floor/iron/edge{ + dir = 1 }, -/turf/open/floor/iron, /area/shuttle/escape) "Qc" = ( /obj/structure/table/reinforced, /obj/item/storage/toolbox/mechanical, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, /area/shuttle/escape) "Qw" = ( /obj/structure/chair/office/light{ dir = 8 }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/white, +/turf/open/floor/iron/white/smooth_large, /area/shuttle/escape) "QW" = ( /obj/structure/table/reinforced, /obj/item/storage/fancy/donut_box, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, /area/shuttle/escape) "Rn" = ( /obj/machinery/computer/atmos_alert{ dir = 8 }, -/obj/effect/turf_decal/tile/yellow/anticorner/contrasted, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/shuttle/escape) +"RY" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/ai_slipper, +/turf/open/floor/iron/large, /area/shuttle/escape) "Ss" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners{ +/obj/effect/turf_decal/trimline/blue/filled/warning, +/turf/open/floor/iron/white/smooth_edge{ dir = 1 }, -/turf/open/floor/iron/white, +/area/shuttle/escape) +"TJ" = ( +/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/internals, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 4 + }, +/turf/open/floor/iron/edge{ + dir = 8 + }, /area/shuttle/escape) "TQ" = ( /obj/machinery/door/airlock/shuttle{ @@ -1076,74 +1789,141 @@ width = 29 }, /obj/structure/fans/tiny, -/turf/open/floor/plating, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/turf/open/floor/iron/white, /area/shuttle/escape) -"Vu" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ +"TS" = ( +/obj/structure/chair/office{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 4 + }, +/turf/open/floor/carpet/blue, +/area/shuttle/escape) +"Ua" = ( +/obj/effect/turf_decal/trimline/yellow/filled/warning{ dir = 8 }, -/turf/open/floor/iron, +/turf/open/floor/iron/edge{ + dir = 4 + }, +/area/shuttle/escape) +"Vu" = ( +/obj/effect/turf_decal/trimline/neutral/filled/warning, +/turf/open/floor/iron/edge{ + dir = 1 + }, /area/shuttle/escape) "VI" = ( /obj/structure/bed/roller, /obj/machinery/iv_drip, -/obj/structure/extinguisher_cabinet{ - pixel_x = 26 - }, /obj/machinery/light/small{ dir = 4 }, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted, -/turf/open/floor/iron/white, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/obj/structure/extinguisher_cabinet/directional/east, +/turf/open/floor/iron/white/smooth_edge{ + dir = 8 + }, /area/shuttle/escape) "Wk" = ( /obj/machinery/computer/emergency_shuttle{ dir = 1 }, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + alpha = 180; dir = 8 }, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, /area/shuttle/escape) "WL" = ( /obj/structure/table/reinforced, /obj/item/folder/blue, /obj/item/pen, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/siding/thinplating_new/dark, +/turf/open/floor/carpet/blue, +/area/shuttle/escape) +"WV" = ( +/obj/machinery/atmospherics/pipe/manifold/orange/hidden{ + dir = 1 + }, +/turf/open/floor/catwalk_floor/iron, +/area/shuttle/escape) +"WW" = ( +/obj/item/kirbyplants{ + icon_state = "plant-21"; + pixel_x = -3; + pixel_y = 3 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 8 + }, +/obj/machinery/newscaster/directional/west, +/turf/open/floor/iron/edge{ + dir = 4 + }, /area/shuttle/escape) "Xq" = ( /obj/machinery/computer/med_data{ dir = 1 }, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + alpha = 180; + dir = 8 + }, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/shuttle/escape) +"Yf" = ( +/obj/item/kirbyplants{ + icon_state = "plant-21"; + pixel_x = -3; + pixel_y = 3 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/item/radio/intercom/directional/north, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 4 + }, +/turf/open/floor/carpet/blue, +/area/shuttle/escape) +"Yn" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/holopad, +/turf/open/floor/iron/large, /area/shuttle/escape) "Yt" = ( /obj/machinery/door/airlock/medical/glass{ name = "Escape Shuttle Infirmary" }, -/obj/effect/turf_decal/stripes/line, /obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron, /area/shuttle/escape) "Zl" = ( /obj/item/defibrillator/loaded, /obj/structure/table/reinforced, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 9 }, /turf/open/floor/iron/white, /area/shuttle/escape) -"ZB" = ( -/obj/item/radio/intercom{ - name = "Station Intercom"; - pixel_x = 26; - pixel_y = 58 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/shuttle/escape) (1,1,1) = {" aa @@ -1180,15 +1960,15 @@ aa ab ad af -ah -Mo +KN +WW av av aH -IG -aE +Mq +iG aU -aE +iG IG av av @@ -1199,7 +1979,7 @@ af bw bE bM -bU +GG af aa aa @@ -1211,7 +1991,7 @@ aa ab ad Ky -rY +pw zW zW zW @@ -1226,9 +2006,9 @@ zW zW zW Vu -Ej -bw +uA bw +CS bw bU Ky @@ -1242,7 +2022,7 @@ aa ab ad Ky -rY +pw zW aw aw @@ -1256,46 +2036,46 @@ aw aw aw zW -Vu +HH af -bx -bw +iz bw +DG cG af aa aa aa -aa +FO aa "} (5,1,1) = {" ac ac af -rY +pw zW -ax -aC +ap +bj aI -aK +aC ax zW -aX +kS aK be aD aX zW -Vu -hB +HH +Ky bx bw bN -bU +EJ +af af af -aT Ky af af @@ -1318,7 +2098,7 @@ av av av zW -Vu +Ab af by bw @@ -1335,14 +2115,14 @@ af ab ad Ky -rY -zW +pw zW zW zW zW zW zW +Hv zW zW zW @@ -1353,11 +2133,11 @@ Qa af af Ej -hB -aT +Ky +af af sU -Gg +zZ Gg zr Ky @@ -1380,14 +2160,14 @@ aw aw aw zW -Vu -hB +HH +Ky bz bF bP bW -aq -Ml +af +xg Ml sc nv @@ -1397,15 +2177,15 @@ Ky ab ad Ky -rY +pw zW -ax +xi aD aI aK -ax +AP zW -aX +kS aC be bj @@ -1413,13 +2193,13 @@ aX zW Vu Hh -rY -zW +gv +RY zW co Hh Ml -Ml +xX Eu Xq Ky @@ -1428,7 +2208,7 @@ Ky ab ad Ky -rY +pw zW av av @@ -1444,13 +2224,13 @@ av zW Vu Hh -rY -zW +gv zW +Hv co Hh Ml -Ml +zu WL Wk Ky @@ -1459,7 +2239,7 @@ Ky ac ac af -rY +pw zW zW zW @@ -1473,15 +2253,15 @@ zW zW zW zW -Vu -hB +HH +Ky bA bG bQ bI -aq +af +qU Ml -ZB sc dr Ky @@ -1490,29 +2270,29 @@ Ky ab ad Ky -ah +Mb zl aw -aE -aE +Ho +Ho aw aw cB aw aw -aw -aE -aE +nz +Ho +Ho zl -ah +dg +af af -aT af af zd af -sU -Pe +Yf +TS Pe Qc Ky @@ -1523,10 +2303,10 @@ ad af af aq -ag +Ky eY eY -ag +Ky aP af af @@ -1555,26 +2335,26 @@ af Zl Gd AG -aE -aE +az +az oq vm af aY ba bf -aE -aE +Ua +Ua bl bq af -bC +xB cF ae af af af -aT +af Ky af af @@ -1586,28 +2366,28 @@ Ky dX uc Qw -zW -zW +pk +OM kc Ss Yt -aE +AZ bb bg -bg +Mi bg bm br af -bD -bI +bC +WV bS bZ af aa aa aa -aa +Hz aa "} (16,1,1) = {" @@ -1615,22 +2395,22 @@ ab ad Ky Af -qL -Cl -zW -zW +kc +kc +vi +ue kc Ss Yt -aE +AZ bc bh -bh +Yn bh bn -br +xn af -bC +PN pa rY bZ @@ -1651,14 +2431,14 @@ Np Pm vA VI -vm +JW aP aZ bd bi cC cC -ah +TJ bs af ah diff --git a/_maps/shuttles/emergency/emergency_meta.dmm b/_maps/shuttles/emergency/emergency_meta.dmm index 2cd54480bb07b..f17055ccf8b14 100644 --- a/_maps/shuttles/emergency/emergency_meta.dmm +++ b/_maps/shuttles/emergency/emergency_meta.dmm @@ -9,13 +9,10 @@ "ad" = ( /turf/closed/wall/mineral/titanium, /area/shuttle/escape) -"ag" = ( -/obj/structure/sign/warning/nosmoking, -/turf/closed/wall/mineral/titanium, -/area/shuttle/escape) "al" = ( /obj/structure/table, /obj/item/storage/fancy/donut_box, +/obj/machinery/newscaster/directional/west, /turf/open/floor/iron/dark/side{ dir = 4 }, @@ -54,6 +51,7 @@ }, /obj/structure/closet/firecloset, /obj/effect/turf_decal/box, +/obj/machinery/status_display/evac/directional/west, /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) "aq" = ( @@ -72,9 +70,7 @@ /area/shuttle/escape) "as" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/holopad{ - pixel_x = 16 - }, +/obj/machinery/holopad, /turf/open/floor/iron, /area/shuttle/escape) "at" = ( @@ -94,8 +90,8 @@ /obj/structure/shuttle/engine/heater{ dir = 8 }, -/obj/structure/window/reinforced{ - dir = 4 +/obj/structure/window/reinforced/survival_pod{ + dir = 8 }, /turf/open/floor/plating/airless, /area/shuttle/escape) @@ -103,6 +99,10 @@ /obj/machinery/computer/communications{ dir = 4 }, +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + alpha = 180; + dir = 1 + }, /turf/open/floor/iron/dark/side{ dir = 4 }, @@ -110,10 +110,6 @@ "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/effect/turf_decal/box, /obj/structure/tank_dispenser/oxygen, @@ -123,6 +119,10 @@ /obj/machinery/computer/emergency_shuttle{ dir = 4 }, +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + alpha = 180; + dir = 1 + }, /turf/open/floor/iron/dark/side{ dir = 4 }, @@ -130,10 +130,7 @@ "aC" = ( /obj/structure/table, /obj/item/folder/blue, -/obj/structure/extinguisher_cabinet{ - dir = 4; - pixel_y = -27 - }, +/obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron/dark/side{ dir = 1 }, @@ -143,19 +140,51 @@ /obj/structure/flora/ausbushes/lavendergrass, /obj/structure/flora/ausbushes/brflowers, /obj/structure/flora/ausbushes/leafybush, -/obj/structure/window/shuttle, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1; + pixel_y = 1 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/open/floor/grass, /area/shuttle/escape) "aF" = ( /obj/machinery/computer/station_alert{ dir = 4 }, +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + alpha = 180; + dir = 1 + }, /turf/open/floor/iron/dark/side{ dir = 4 }, /area/shuttle/escape) "aG" = ( -/obj/machinery/recharge_station, +/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/item/radio, +/obj/item/flashlight/flare{ + pixel_x = -6; + pixel_y = -2 + }, +/obj/item/flashlight/flare{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/radio/intercom/directional/east, /obj/effect/turf_decal/delivery, /obj/machinery/light{ dir = 1 @@ -182,16 +211,6 @@ dir = 4 }, /area/shuttle/escape) -"aN" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/machinery/door/airlock/medical/glass{ - name = "Escape Shuttle Infirmary" - }, -/turf/open/floor/iron/white, -/area/shuttle/escape) "aO" = ( /obj/structure/table, /obj/machinery/recharger{ @@ -212,15 +231,12 @@ /turf/open/floor/carpet/blue, /area/shuttle/escape) "aS" = ( -/obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = -31 - }, /obj/structure/chair/fancy/shuttle{ dir = 1 }, /obj/machinery/light, /obj/effect/turf_decal/bot, +/obj/item/radio/intercom/directional/south, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "aT" = ( @@ -237,6 +253,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron, /area/shuttle/escape) "be" = ( @@ -261,9 +278,8 @@ /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "bj" = ( -/obj/item/defibrillator/loaded, -/obj/structure/table, -/obj/effect/turf_decal/bot, +/obj/machinery/stasis, +/obj/effect/turf_decal/box, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "bk" = ( @@ -274,13 +290,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "bl" = ( -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/white, -/area/shuttle/escape) -"bm" = ( -/obj/effect/turf_decal/siding/thinplating_new/light, -/obj/structure/closet/crate/freezer/blood, -/turf/open/floor/mineral/titanium/blue, +/turf/open/floor/iron/white/smooth_large, /area/shuttle/escape) "bn" = ( /obj/effect/turf_decal/delivery, @@ -288,30 +298,11 @@ /turf/open/floor/iron, /area/shuttle/escape) "bo" = ( -/obj/structure/rack, +/obj/machinery/recharge_station, +/obj/effect/turf_decal/delivery, /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) "bp" = ( @@ -329,22 +320,26 @@ }, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) -"bt" = ( -/obj/structure/reagent_dispensers/peppertank, -/turf/closed/wall/mineral/titanium, -/area/shuttle/escape) "bu" = ( -/obj/machinery/stasis, /obj/effect/turf_decal/siding/thinplating_new/light, -/obj/effect/turf_decal/box, +/obj/structure/table, +/obj/item/clothing/gloves/color/latex, +/obj/item/cautery, +/obj/item/hemostat{ + pixel_x = -4 + }, +/obj/item/scalpel{ + pixel_y = 5 + }, +/obj/item/surgical_drapes, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "bv" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/effect/turf_decal/tile/blue{ - dir = 4 +/obj/effect/turf_decal/tile/blue/anticorner{ + dir = 1 }, -/turf/open/floor/iron/white, +/turf/open/floor/iron/white/smooth_corner, /area/shuttle/escape) "bw" = ( /obj/item/cigbutt, @@ -354,18 +349,21 @@ "by" = ( /obj/machinery/suit_storage_unit/standard_unit, /obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/shuttle/escape) "bz" = ( -/obj/machinery/computer/crew{ - dir = 4 +/obj/structure/sink{ + dir = 8; + pixel_x = -12 }, -/turf/open/floor/iron/white, +/turf/open/floor/iron/white/smooth_large, /area/shuttle/escape) "bA" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/shuttle/escape) "bD" = ( @@ -377,14 +375,11 @@ pixel_x = -4; pixel_y = 2 }, -/obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = -31 - }, /obj/item/book/manual/wiki/security_space_law{ pixel_x = -4; pixel_y = 4 }, +/obj/item/radio/intercom/directional/south, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "bE" = ( @@ -412,29 +407,18 @@ /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "bH" = ( -/obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_x = -27 - }, /obj/machinery/shower{ dir = 4 }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, /obj/effect/turf_decal/bot, +/obj/machinery/newscaster/directional/south, /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/iron/white, +/turf/open/floor/iron/white/smooth_large, /area/shuttle/escape) "bJ" = ( /obj/structure/table, @@ -483,6 +467,7 @@ /obj/effect/turf_decal/siding/thinplating_new/light{ dir = 1 }, +/obj/machinery/status_display/evac/directional/south, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "bL" = ( @@ -493,11 +478,14 @@ /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 }, +/mob/living/simple_animal/bot/medbot{ + name = "\improper emergency medibot"; + pixel_x = -3; + pixel_y = 2 + }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "bN" = ( @@ -516,10 +504,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/structure/extinguisher_cabinet{ - dir = 4; - pixel_y = -27 - }, +/obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron, /area/shuttle/escape) "bP" = ( @@ -539,20 +524,17 @@ }, /obj/item/lazarus_injector, /obj/effect/turf_decal/bot, -/mob/living/simple_animal/bot/medbot{ - name = "\improper emergency medibot"; - pixel_x = -3; - pixel_y = 2 - }, /turf/open/floor/iron, /area/shuttle/escape) "bQ" = ( /obj/machinery/advanced_airlock_controller{ pixel_y = 24 }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 10 + }, +/turf/open/floor/catwalk_floor/iron, /area/shuttle/escape) "bR" = ( /obj/structure/table, @@ -659,6 +641,10 @@ "bY" = ( /turf/open/floor/iron/dark/corner, /area/shuttle/escape) +"bZ" = ( +/obj/machinery/firealarm/directional/east, +/turf/open/floor/carpet/blue, +/area/shuttle/escape) "ca" = ( /obj/machinery/space_heater, /obj/effect/turf_decal/bot, @@ -678,13 +664,11 @@ /obj/machinery/light{ dir = 4 }, +/obj/structure/reagent_dispensers/peppertank/directional/east, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "cl" = ( -/obj/machinery/holopad{ - pixel_x = 16; - pixel_y = -16 - }, +/obj/machinery/holopad, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "cO" = ( @@ -695,9 +679,6 @@ /obj/effect/turf_decal/siding/thinplating_new/light{ dir = 8 }, -/obj/item/storage/backpack/duffelbag/med/surgery{ - pixel_y = 7 - }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "dy" = ( @@ -720,7 +701,8 @@ req_access_txt = "2" }, /obj/machinery/door/firedoor, -/turf/open/floor/mineral/plastitanium/red/brig, +/obj/effect/turf_decal/stripes/closeup, +/turf/open/floor/iron, /area/shuttle/escape) "eB" = ( /turf/open/floor/iron/dark/corner{ @@ -737,6 +719,7 @@ }, /obj/machinery/light, /obj/effect/turf_decal/bot, +/obj/machinery/newscaster/directional/south, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "fr" = ( @@ -744,6 +727,14 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 9 }, +/turf/open/floor/catwalk_floor/iron, +/area/shuttle/escape) +"fH" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/tank/air{ + dir = 4 + }, +/obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/shuttle/escape) "gU" = ( @@ -752,20 +743,51 @@ req_access_txt = "19" }, /obj/machinery/door/firedoor, -/turf/open/floor/carpet/blue, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/turf/open/floor/iron, /area/shuttle/escape) "hJ" = ( /obj/machinery/light{ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 6 - }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, /turf/open/floor/iron, /area/shuttle/escape) +"ig" = ( +/obj/machinery/camera/autoname/directional/east, +/turf/open/floor/carpet/blue, +/area/shuttle/escape) +"ja" = ( +/obj/structure/chair/fancy/shuttle{ + dir = 1 + }, +/obj/effect/turf_decal/bot, +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/mineral/titanium, +/area/shuttle/escape) "jb" = ( -/turf/open/floor/iron/white, +/obj/effect/turf_decal/tile/blue/anticorner{ + dir = 4 + }, +/turf/open/floor/iron/white/smooth_corner{ + dir = 8 + }, +/area/shuttle/escape) +"jg" = ( +/obj/structure/chair/fancy/shuttle{ + dir = 4 + }, +/obj/machinery/status_display/evac/directional/west, +/turf/open/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) +"mg" = ( +/obj/structure/chair/fancy/shuttle, +/obj/effect/turf_decal/bot, +/obj/machinery/newscaster/directional/north, +/turf/open/floor/mineral/titanium, /area/shuttle/escape) "mw" = ( /obj/effect/turf_decal/siding/thinplating_new/dark, @@ -778,6 +800,21 @@ }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) +"ph" = ( +/obj/structure/flora/ausbushes/grassybush, +/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/ausbushes/brflowers, +/obj/structure/flora/ausbushes/leafybush, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 1; + pixel_y = 1 + }, +/turf/open/floor/grass, +/area/shuttle/escape) "pq" = ( /obj/machinery/door/airlock/command{ name = "Emergency Recovery Airlock"; @@ -785,6 +822,12 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/closeup, +/turf/open/floor/iron, +/area/shuttle/escape) +"re" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/ai_slipper, /turf/open/floor/iron, /area/shuttle/escape) "rl" = ( @@ -792,19 +835,16 @@ name = "Emergency Shuttle Airlock" }, /obj/structure/fans/tiny, +/obj/effect/turf_decal/stripes/closeup, /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, +/obj/item/radio/intercom/directional/north, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "sb" = ( @@ -813,38 +853,88 @@ }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) +"uw" = ( +/obj/structure/chair/fancy/shuttle{ + dir = 1 + }, +/obj/effect/turf_decal/bot, +/obj/machinery/camera/autoname/directional/south, +/turf/open/floor/mineral/titanium, +/area/shuttle/escape) "uD" = ( /obj/structure/chair/fancy/shuttle, /obj/machinery/light{ dir = 1 }, /obj/effect/turf_decal/bot, +/obj/machinery/camera/autoname/directional/north, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "ve" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, +/obj/effect/turf_decal/tile/blue/anticorner, /obj/machinery/holopad{ pixel_x = 16; pixel_y = -16 }, -/turf/open/floor/iron/white, +/turf/open/floor/iron/white/smooth_corner{ + dir = 1 + }, +/area/shuttle/escape) +"wj" = ( +/obj/effect/turf_decal/tile/blue/anticorner{ + dir = 8 + }, +/turf/open/floor/iron/white/smooth_corner{ + dir = 4 + }, /area/shuttle/escape) "wu" = ( /obj/effect/turf_decal/siding/thinplating_new/light, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) +"wY" = ( +/obj/machinery/status_display/evac/directional/east, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/shuttle/escape) +"yj" = ( +/obj/structure/chair/fancy/shuttle{ + dir = 8 + }, +/obj/machinery/status_display/evac/directional/east, +/turf/open/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) +"yL" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/turf/open/floor/catwalk_floor/iron, +/area/shuttle/escape) +"AF" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/radio/intercom/directional/north, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 10 + }, +/turf/open/floor/iron, +/area/shuttle/escape) +"AG" = ( +/obj/structure/chair/fancy/shuttle{ + dir = 4 + }, +/obj/machinery/camera/autoname/directional/west{ + network = list("ss13","engine") + }, +/obj/machinery/newscaster/directional/west, +/turf/open/floor/mineral/plastitanium/red/brig, +/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 - }, +/obj/item/radio/intercom/directional/south, /turf/open/floor/iron/dark/side{ dir = 1 }, @@ -862,23 +952,25 @@ /area/shuttle/escape) "BN" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/binary/dp_vent_pump, -/turf/open/floor/iron, +/obj/machinery/atmospherics/pipe/manifold/orange/hidden{ + dir = 8 + }, +/turf/open/floor/catwalk_floor/iron, /area/shuttle/escape) "Ce" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 10 - }, /turf/closed/wall/mineral/titanium/nodiagonal, /area/shuttle/escape) "CQ" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/turf/open/floor/iron, +/obj/machinery/atmospherics/components/binary/dp_vent_pump, +/turf/open/floor/catwalk_floor/iron, /area/shuttle/escape) "DK" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/tank/air, +/obj/structure/chair/fancy/shuttle{ + dir = 4 + }, +/obj/machinery/newscaster/directional/west, /turf/open/floor/iron, /area/shuttle/escape) "Eg" = ( @@ -910,6 +1002,10 @@ /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/iron, /area/shuttle/escape) +"Ib" = ( +/obj/machinery/ai_slipper, +/turf/open/floor/carpet/blue, +/area/shuttle/escape) "Kc" = ( /obj/machinery/light{ dir = 4 @@ -919,6 +1015,10 @@ }, /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) +"Ki" = ( +/obj/machinery/ai_slipper, +/turf/open/floor/iron/white/smooth_large, +/area/shuttle/escape) "Kk" = ( /turf/open/floor/iron/dark/side{ dir = 8 @@ -935,43 +1035,80 @@ }, /area/shuttle/escape) "Ml" = ( -/obj/machinery/stasis, -/obj/effect/turf_decal/box, /obj/machinery/light{ dir = 1 }, +/obj/item/radio/intercom/directional/west, +/obj/machinery/computer/crew{ + dir = 4 + }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) +"MO" = ( +/obj/structure/flora/ausbushes/grassybush, +/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/ausbushes/brflowers, +/obj/structure/flora/ausbushes/leafybush, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced, +/turf/open/floor/grass, +/area/shuttle/escape) +"Ns" = ( +/obj/machinery/door/airlock/external{ + name = "Emergency Recovery Airlock" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/turf/open/floor/iron, +/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, +/obj/effect/turf_decal/stripes/closeup, +/turf/open/floor/iron, /area/shuttle/escape) "Qj" = ( /obj/machinery/computer/security, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, /turf/open/floor/iron/dark/side, /area/shuttle/escape) -"Rb" = ( -/obj/structure/table/optable, -/obj/item/surgical_drapes, -/turf/open/floor/mineral/titanium/blue, +"QP" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/item/kirbyplants{ + icon_state = "plant-10" + }, +/obj/structure/sign/warning/nosmoking{ + pixel_y = -32 + }, +/turf/open/floor/mineral/plastitanium, /area/shuttle/escape) "Rg" = ( /obj/structure/table, /obj/item/storage/firstaid/regular, +/obj/machinery/status_display/evac/directional/east, /turf/open/floor/iron/dark/side, /area/shuttle/escape) "Ro" = ( /obj/structure/flora/ausbushes/grassybush, /obj/structure/flora/ausbushes/brflowers, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1; + pixel_y = 1 + }, /turf/open/floor/grass, /area/shuttle/escape) "RM" = ( @@ -986,12 +1123,26 @@ /obj/machinery/door/airlock/medical/glass{ name = "Escape Shuttle Infirmary" }, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, /turf/open/floor/iron/white, /area/shuttle/escape) +"SV" = ( +/obj/machinery/ai_slipper, +/turf/open/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) "TI" = ( /obj/machinery/computer/crew, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, /turf/open/floor/iron/dark/side, /area/shuttle/escape) +"Uh" = ( +/obj/machinery/ai_slipper, +/turf/open/floor/iron, +/area/shuttle/escape) "Ui" = ( /turf/open/floor/iron/dark/corner{ dir = 1 @@ -1009,6 +1160,7 @@ width = 25 }, /obj/structure/fans/tiny, +/obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/white, /area/shuttle/escape) "Vs" = ( @@ -1032,14 +1184,28 @@ /obj/machinery/door/airlock/titanium{ name = "Emergency Shuttle Cargo Bay Airlock" }, -/obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron, /area/shuttle/escape) +"Xr" = ( +/obj/structure/flora/ausbushes/grassybush, +/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/ausbushes/brflowers, +/obj/structure/flora/ausbushes/leafybush, +/obj/structure/window/reinforced{ + dir = 1; + pixel_y = 1 + }, +/obj/structure/window/reinforced, +/turf/open/floor/grass, +/area/shuttle/escape) "Yo" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/orange/hidden, -/turf/open/floor/iron, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 5 + }, +/turf/open/floor/catwalk_floor/iron, /area/shuttle/escape) "Yp" = ( /obj/item/kirbyplants{ @@ -1048,22 +1214,33 @@ /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) "YP" = ( -/obj/machinery/computer/operating{ - dir = 8 - }, /obj/machinery/light{ dir = 1 }, +/obj/machinery/iv_drip, +/obj/machinery/camera/autoname/directional/north, +/obj/structure/bed/roller, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) +"Zo" = ( +/obj/structure/chair/fancy/shuttle{ + dir = 4 + }, +/obj/structure/extinguisher_cabinet/directional/west, +/turf/open/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) "ZP" = ( /obj/structure/chair/fancy/shuttle, /obj/effect/turf_decal/bot, -/turf/open/floor/carpet/grimy, +/obj/structure/sign/warning/nosmoking{ + pixel_y = 32 + }, +/turf/open/floor/mineral/titanium, /area/shuttle/escape) "ZQ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/suit_storage_unit/standard_unit, +/obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/shuttle/escape) @@ -1127,9 +1304,9 @@ aB aF aL aO -aJ -bd -bd +ad +fH +be RM bd DK @@ -1145,7 +1322,7 @@ aq Bg AT ad -be +AF hJ BN CQ @@ -1162,10 +1339,10 @@ ax mw aC ad -bf +Ns Ce bQ -CQ +yL fr bf "} @@ -1173,11 +1350,11 @@ bf Li Rg ao -ax -ax -ax +bZ +Ib +ig dE -ar +wY pq cb ad @@ -1189,17 +1366,17 @@ Li (8,1,1) = {" ad ad -az +ad ad gU ad -az ad ad ad ad ad -az +ad +ad ad ad "} @@ -1208,15 +1385,15 @@ ad bX ap Yp -cO +Uh Yp ap bX ad bh -bh -bh -bh +AG +Zo +jg bD ad "} @@ -1239,17 +1416,17 @@ Li "} (11,1,1) = {" ad -aT +mg bV bN aE aT ar bN -ac +Li bi bU -bU +SV bU bF Li @@ -1267,7 +1444,7 @@ ad bs cd bs -bs +yj bG ad "} @@ -1282,9 +1459,9 @@ ar aS ad ad -bt ad -az +ad +ad ad ad "} @@ -1306,15 +1483,15 @@ bH ad "} (15,1,1) = {" -ag +ad ZP bV bN -aE +ph aT ar bN -ac +Li sb bk Vs @@ -1332,8 +1509,8 @@ aP ar cO PE -PV -jb +bl +Ki ve jb bJ @@ -1344,14 +1521,14 @@ Li aT bV bN -aE +MO aT ar bN -ac +Li cW mV -bl +wj bv bK ad @@ -1365,11 +1542,11 @@ bL aT ar bN -ac -Rb +Li +bj wu -jb -PV +bl +bl Eg ac "} @@ -1378,14 +1555,14 @@ ad rp bV bN -aE +Ro aT ar fi ad YP -bm -bv +wu +bl bl bM ac @@ -1394,15 +1571,15 @@ ac Vh cO bV -aP -aP -aP -ar bN +aI +aT +ar +uw ba ad ac -aN +Sy Sy ba ad @@ -1412,11 +1589,11 @@ ad aT bV bN -aE +Xr aT ar -bN -aJ +ja +ad VU bo bA @@ -1446,14 +1623,14 @@ ad LY LY LY -cO +Uh LY LY LY Xm bp be -be +re be bP Li @@ -1466,8 +1643,8 @@ aA at dy bW -Kc -ag +QP +ad aG bq Gk diff --git a/_maps/shuttles/emergency/emergency_tiny.dmm b/_maps/shuttles/emergency/emergency_tiny.dmm index 4a215e9df7590..b494a70238e3b 100644 --- a/_maps/shuttles/emergency/emergency_tiny.dmm +++ b/_maps/shuttles/emergency/emergency_tiny.dmm @@ -27,6 +27,10 @@ /obj/effect/turf_decal/trimline/dark/corner{ dir = 1 }, +/obj/machinery/holopad{ + pixel_x = 16; + pixel_y = -16 + }, /turf/open/floor/mineral/titanium/white, /area/shuttle/escape) "ci" = ( @@ -37,6 +41,10 @@ }, /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) +"cm" = ( +/obj/machinery/holopad, +/turf/open/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) "cq" = ( /obj/machinery/computer/communications{ dir = 8 @@ -62,10 +70,6 @@ pixel_y = 32 }, /obj/structure/table/reinforced, -/obj/structure/extinguisher_cabinet{ - pixel_x = -32; - pixel_y = 31 - }, /obj/item/flashlight/lamp/green{ pixel_x = -4; pixel_y = 11 @@ -76,10 +80,6 @@ }, /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) -"dM" = ( -/obj/effect/spawner/structure/window/shuttle, -/turf/open/floor/plating, -/area/shuttle/escape) "gg" = ( /obj/effect/turf_decal/trimline/dark/warning, /turf/open/floor/mineral/titanium/white, @@ -122,17 +122,13 @@ /turf/open/floor/iron/white, /area/shuttle/escape) "iw" = ( -/obj/structure/grille, /obj/effect/spawner/structure/window/shuttle, +/obj/machinery/door/firedoor/window, /obj/structure/curtain/directional{ dir = 4 }, /turf/open/floor/plating, /area/shuttle/escape) -"jH" = ( -/obj/structure/sign/departments/medbay/alt, -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/shuttle/escape) "jK" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -140,7 +136,7 @@ /obj/effect/turf_decal/caution/stand_clear{ dir = 4 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape) "kF" = ( /obj/structure/flora/ausbushes/grassybush, @@ -162,27 +158,23 @@ /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) "mb" = ( -/obj/effect/turf_decal/delivery, /obj/machinery/door/airlock/medical/glass{ name = "Shuttle Infirmary" }, /obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/blue/opposingcorners{ +/obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/turf/open/floor/iron/white, +/turf/open/floor/iron, /area/shuttle/escape) "mi" = ( /obj/structure/chair/fancy/shuttle, /obj/effect/turf_decal/bot, -/obj/structure/extinguisher_cabinet{ - pixel_x = 32; - pixel_y = -1 - }, /obj/item/storage/pod{ pixel_x = 5; pixel_y = 31 }, +/obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) "mC" = ( @@ -190,6 +182,7 @@ /obj/structure/flora/ausbushes/grassybush, /obj/structure/flora/ausbushes/lavendergrass, /obj/structure/flora/ausbushes/ywflowers, +/obj/machinery/door/firedoor/window, /turf/open/floor/grass/no_border, /area/shuttle/escape) "nL" = ( @@ -200,7 +193,6 @@ id = "tinyflash"; pixel_y = 27 }, -/obj/structure/chair/fancy/shuttle, /obj/effect/turf_decal/stripes/line{ dir = 10 }, @@ -208,6 +200,11 @@ /obj/machinery/camera/directional/north{ network = list("evac") }, +/obj/structure/closet/firecloset/full, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/escape) +"oK" = ( +/obj/machinery/ai_slipper, /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) "pJ" = ( @@ -230,7 +227,7 @@ name = "Cockpit"; req_access_txt = "19" }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/iron, /area/shuttle/escape) "rc" = ( /obj/effect/turf_decal/stripes/line{ @@ -273,9 +270,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/storage/toolbox/mechanical{ - pixel_y = -1 - }, +/obj/item/storage/fancy/donut_box, /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) "sv" = ( @@ -287,6 +282,13 @@ }, /turf/open/floor/mineral/titanium/white, /area/shuttle/escape) +"tF" = ( +/obj/effect/turf_decal/trimline/dark/warning{ + dir = 8 + }, +/obj/machinery/ai_slipper, +/turf/open/floor/mineral/titanium/white, +/area/shuttle/escape) "tQ" = ( /obj/structure/chair/fancy/shuttle{ dir = 4 @@ -305,6 +307,7 @@ /obj/structure/sign/poster/official/state_laws{ pixel_y = -32 }, +/obj/machinery/holopad, /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) "wh" = ( @@ -329,7 +332,7 @@ name = "Echo emergency shuttle"; width = 16 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/iron/white, /area/shuttle/escape) "xB" = ( /obj/structure/table, @@ -368,6 +371,7 @@ /obj/effect/spawner/structure/window/shuttle, /obj/structure/grille, /obj/structure/shuttle/engine/heater, +/obj/machinery/door/firedoor/window, /turf/open/floor/plating, /area/shuttle/escape) "xX" = ( @@ -385,6 +389,7 @@ /obj/structure/flora/ausbushes/grassybush, /obj/structure/flora/ausbushes/lavendergrass, /obj/structure/flora/ausbushes/palebush, +/obj/machinery/door/firedoor/window, /turf/open/floor/grass/no_border, /area/shuttle/escape) "Ae" = ( @@ -402,14 +407,11 @@ /obj/machinery/door/airlock/shuttle{ name = "Emergency Shuttle Airlock" }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, /obj/structure/fans/tiny, -/turf/open/floor/mineral/plastitanium, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/turf/open/floor/iron/white, /area/shuttle/escape) "Bi" = ( /obj/effect/turf_decal/trimline/dark/warning{ @@ -418,6 +420,9 @@ /obj/effect/turf_decal/trimline/dark/corner{ dir = 8 }, +/obj/structure/sign/departments/medbay/alt{ + pixel_x = 32 + }, /turf/open/floor/mineral/titanium/white, /area/shuttle/escape) "BB" = ( @@ -441,6 +446,7 @@ pixel_x = 26; pixel_y = -25 }, +/obj/machinery/ai_slipper, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "CU" = ( @@ -456,6 +462,20 @@ }, /turf/open/floor/plating/airless, /area/shuttle/escape) +"GQ" = ( +/obj/structure/flora/ausbushes/grassybush, +/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/flora/ausbushes/fernybush, +/obj/structure/window/shuttle, +/obj/machinery/door/firedoor/window, +/turf/open/floor/grass/no_border, +/area/shuttle/escape) +"GT" = ( +/obj/effect/spawner/structure/window/shuttle, +/obj/machinery/door/firedoor/window, +/turf/open/floor/plating, +/area/shuttle/escape) "Ho" = ( /obj/structure/table/reinforced, /obj/item/restraints/handcuffs{ @@ -483,11 +503,6 @@ }, /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) -"Kb" = ( -/obj/structure/grille, -/obj/effect/spawner/structure/window/shuttle, -/turf/open/floor/plating, -/area/shuttle/escape) "KD" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -512,6 +527,7 @@ /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, +/obj/machinery/ai_slipper, /turf/open/floor/iron/white, /area/shuttle/escape) "Mi" = ( @@ -519,6 +535,7 @@ /obj/structure/flora/ausbushes/grassybush, /obj/structure/flora/ausbushes/lavendergrass, /obj/structure/flora/ausbushes/brflowers, +/obj/machinery/door/firedoor/window, /turf/open/floor/grass/no_border, /area/shuttle/escape) "MJ" = ( @@ -526,28 +543,21 @@ /obj/structure/chair/fancy/shuttle{ dir = 1 }, -/obj/item/radio/intercom{ - name = "Station Intercom"; - pixel_x = 1; - pixel_y = -30 - }, /obj/machinery/computer/security/telescreen/entertainment{ network = list("evac"); pixel_x = 32; pixel_y = -1 }, +/obj/item/radio/intercom/directional/south, /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) "No" = ( /obj/effect/turf_decal/delivery, /obj/machinery/stasis, -/obj/machinery/defibrillator_mount/loaded{ - pixel_x = 31; - pixel_y = -1 - }, /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, +/obj/machinery/defibrillator_mount/loaded/directional/east, /turf/open/floor/iron/white, /area/shuttle/escape) "Ns" = ( @@ -595,7 +605,6 @@ /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) "Pw" = ( -/obj/effect/turf_decal/delivery, /obj/machinery/light{ dir = 8 }, @@ -621,10 +630,6 @@ /obj/effect/turf_decal/trimline/dark/warning{ dir = 8 }, -/obj/structure/extinguisher_cabinet{ - pixel_x = 32; - pixel_y = -1 - }, /obj/item/lazarus_injector, /mob/living/simple_animal/bot/medbot{ name = "\improper emergency medibot"; @@ -634,6 +639,7 @@ /obj/structure/sign/poster/official/help_others{ pixel_y = -32 }, +/obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/mineral/titanium/white, /area/shuttle/escape) "Up" = ( @@ -652,7 +658,7 @@ req_one_access_txt = "2;19" }, /obj/effect/turf_decal/stripes/closeup, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/iron, /area/shuttle/escape) "Ys" = ( /obj/structure/shuttle/engine/large, @@ -679,6 +685,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, +/obj/item/radio/intercom/directional/north, /turf/open/floor/noslip/dark, /area/shuttle/escape) @@ -686,7 +693,7 @@ xX wR xg -Kb +GT nL zK Mi @@ -695,7 +702,7 @@ Aq Aq mC zK -kF +GQ vi Vn xX @@ -719,31 +726,31 @@ pJ Ys "} (3,1,1) = {" -Up +GT bV -UW +cm wh -Kb +GT Ns Yt lm Ow gg Ae -HD +oK hT xQ EA rc "} (4,1,1) = {" -Kb +GT Ho UW Co Xn gy -gy +tF gy cc gg @@ -773,17 +780,17 @@ nL xX "} (6,1,1) = {" -Kb +GT Pw -HD +oK vN nL gk KD OV rX -jH -dM +nL +GT mb nL nL @@ -791,7 +798,7 @@ wR xX "} (7,1,1) = {" -Kb +GT se CU tQ @@ -837,8 +844,8 @@ kF NC nL nL -Up -Up +GT +GT nL vi Vn From 98ec786270942ae3efb6794df6887427299f8177 Mon Sep 17 00:00:00 2001 From: Markus Date: Fri, 27 Sep 2024 10:58:52 +0200 Subject: [PATCH 02/13] merge conflicts + camera issues --- .../shuttles/emergency/emergency_asteroid.dmm | 114 +++++++++++++----- _maps/shuttles/emergency/emergency_bar.dmm | 10 +- _maps/shuttles/emergency/emergency_delta.dmm | 14 +-- _maps/shuttles/emergency/emergency_meta.dmm | 12 +- _maps/shuttles/emergency/emergency_tiny.dmm | 54 +-------- 5 files changed, 107 insertions(+), 97 deletions(-) diff --git a/_maps/shuttles/emergency/emergency_asteroid.dmm b/_maps/shuttles/emergency/emergency_asteroid.dmm index 924382b3b2d00..7ba1d6eabe820 100644 --- a/_maps/shuttles/emergency/emergency_asteroid.dmm +++ b/_maps/shuttles/emergency/emergency_asteroid.dmm @@ -22,14 +22,20 @@ /area/shuttle/escape) "ap" = ( /obj/structure/ore_box, -/turf/open/floor/mineral/titanium/yellow, +/turf/open/floor/iron/dark, /area/shuttle/escape) "aq" = ( -/turf/open/floor/mineral/titanium/yellow, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 6 + }, +/turf/open/floor/iron, /area/shuttle/escape) "ar" = ( /obj/machinery/recharge_station, -/turf/open/floor/mineral/titanium/yellow, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 5 + }, +/turf/open/floor/iron, /area/shuttle/escape) "at" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -50,7 +56,7 @@ /obj/structure/chair/fancy/shuttle{ dir = 8 }, -/obj/machinery/camera/autoname/directional/east, +/obj/machinery/camera/directional/east, /obj/machinery/status_display/evac/directional/east, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) @@ -69,7 +75,10 @@ /area/shuttle/escape) "aF" = ( /obj/machinery/suit_storage_unit, -/turf/open/floor/mineral/titanium/yellow, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 9 + }, +/turf/open/floor/iron, /area/shuttle/escape) "aH" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -103,7 +112,7 @@ /turf/open/floor/iron/edge, /area/shuttle/escape) "aL" = ( -/obj/machinery/camera/autoname/directional/south, +/obj/machinery/camera/directional/south, /obj/structure/chair/fancy/shuttle{ dir = 1 }, @@ -258,7 +267,7 @@ /obj/structure/chair/fancy/shuttle{ dir = 1 }, -/obj/machinery/camera/autoname/directional/south, +/obj/machinery/camera/directional/south, /obj/effect/turf_decal/siding/thinplating_new/dark, /obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 1 @@ -315,7 +324,11 @@ "bt" = ( /obj/structure/closet/emcloset, /obj/structure/extinguisher_cabinet/directional/west, -/turf/open/floor/iron/large, +/obj/effect/turf_decal/trimline/neutral/filled/end{ + dir = 8 + }, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron, /area/shuttle/escape) "bv" = ( /obj/item/radio/intercom/directional/south, @@ -338,7 +351,7 @@ /area/shuttle/escape) "bz" = ( /obj/machinery/stasis, -/obj/machinery/camera/autoname/directional/east, +/obj/machinery/camera/directional/east, /obj/machinery/status_display/evac/directional/east, /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 @@ -418,11 +431,14 @@ /area/shuttle/escape) "bJ" = ( /obj/machinery/light, -/turf/open/floor/mineral/titanium/yellow, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 10 + }, +/turf/open/floor/iron, /area/shuttle/escape) "bK" = ( /obj/structure/chair/fancy/shuttle, -/obj/machinery/camera/autoname/directional/north, +/obj/machinery/camera/directional/north, /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 1 }, @@ -441,7 +457,11 @@ pixel_y = 24; layer = 3.3 }, -/turf/open/floor/iron/large, +/obj/effect/turf_decal/trimline/neutral/filled/line, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/turf/open/floor/iron, /area/shuttle/escape) "bP" = ( /obj/structure/chair/fancy/shuttle{ @@ -570,7 +590,12 @@ "ve" = ( /obj/structure/closet, /obj/structure/extinguisher_cabinet/directional/west, -/turf/open/floor/mineral/titanium/yellow, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 8 + }, +/turf/open/floor/iron/edge{ + dir = 4 + }, /area/shuttle/escape) "xr" = ( /obj/structure/extinguisher_cabinet/directional/north, @@ -598,12 +623,10 @@ "yT" = ( /obj/machinery/ai_slipper, /obj/item/radio/intercom/directional/south, -/turf/open/floor/mineral/titanium/yellow, -/area/shuttle/escape) -"Af" = ( -/obj/machinery/holopad, -/obj/effect/turf_decal/box, -/turf/open/floor/mineral/titanium/yellow, +/obj/effect/turf_decal/trimline/yellow/filled/line, +/turf/open/floor/iron/edge{ + dir = 1 + }, /area/shuttle/escape) "Ca" = ( /obj/effect/turf_decal/trimline/neutral/filled/line, @@ -612,6 +635,20 @@ dir = 1 }, /area/shuttle/escape) +"Cf" = ( +/obj/structure/mirror/directional/north{ + pixel_y = 32 + }, +/obj/structure/sink{ + dir = 1; + pixel_y = 24; + layer = 3.3 + }, +/obj/effect/turf_decal/trimline/neutral/filled/end{ + dir = 4 + }, +/turf/open/floor/iron, +/area/shuttle/escape) "CC" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 4 @@ -630,7 +667,7 @@ /area/shuttle/escape) "El" = ( /obj/machinery/door/airlock{ - name = "Emergency Shuttle Restroom" + name = "Emergency Restroom" }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup{ @@ -670,6 +707,12 @@ /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/large, /area/shuttle/escape) +"Gy" = ( +/obj/effect/turf_decal/trimline/yellow/filled/warning{ + dir = 1 + }, +/turf/open/floor/iron/edge, +/area/shuttle/escape) "IQ" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box, @@ -737,7 +780,7 @@ /area/shuttle/escape) "RT" = ( /obj/machinery/door/airlock{ - name = "Emergency Shuttle Restroom" + name = "Unit 2" }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, @@ -788,7 +831,12 @@ /area/shuttle/escape) "WD" = ( /obj/machinery/status_display/evac/directional/east, -/turf/open/floor/mineral/titanium/yellow, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 4 + }, +/turf/open/floor/iron/edge{ + dir = 8 + }, /area/shuttle/escape) "XM" = ( /obj/machinery/iv_drip, @@ -801,6 +849,14 @@ dir = 8 }, /area/shuttle/escape) +"Ym" = ( +/obj/machinery/door/airlock{ + name = "Unit 1" + }, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/closeup, +/turf/open/floor/iron, +/area/shuttle/escape) "YJ" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup{ @@ -826,7 +882,11 @@ /obj/machinery/light/small, /obj/machinery/ai_slipper, /obj/machinery/status_display/evac/directional/south, -/turf/open/floor/iron/large, +/obj/effect/turf_decal/trimline/neutral/filled/line, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/turf/open/floor/iron, /area/shuttle/escape) (1,1,1) = {" @@ -906,8 +966,8 @@ qO "} (6,1,1) = {" xE -aq -Af +Gy +uM yT ac aV @@ -929,8 +989,8 @@ aW bf bn ac -bN -RT +Cf +Ym sV qO "} diff --git a/_maps/shuttles/emergency/emergency_bar.dmm b/_maps/shuttles/emergency/emergency_bar.dmm index 41c7140145d58..abfa6dcb6a59c 100644 --- a/_maps/shuttles/emergency/emergency_bar.dmm +++ b/_maps/shuttles/emergency/emergency_bar.dmm @@ -94,7 +94,7 @@ /obj/machinery/computer/communications{ dir = 8 }, -/obj/machinery/camera/autoname/directional/east, +/obj/machinery/camera/directional/east, /turf/open/floor/carpet, /area/shuttle/escape) "aC" = ( @@ -206,7 +206,7 @@ brightness = 3; dir = 8 }, -/obj/machinery/camera/autoname/directional/west, +/obj/machinery/camera/directional/west, /obj/machinery/newscaster/directional/west, /turf/open/floor/mineral/titanium, /area/shuttle/escape) @@ -450,7 +450,7 @@ /turf/open/floor/iron, /area/shuttle/escape) "rp" = ( -/obj/machinery/camera/autoname/directional/south, +/obj/machinery/camera/directional/south, /turf/open/floor/wood, /area/shuttle/escape) "rs" = ( @@ -518,7 +518,7 @@ /area/shuttle/escape) "zZ" = ( /obj/structure/chair/fancy/shuttle, -/obj/machinery/camera/autoname/directional/west, +/obj/machinery/camera/directional/west, /obj/item/radio/intercom/directional/west, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) @@ -575,7 +575,7 @@ dir = 8 }, /obj/effect/turf_decal/tile/bar/opposingcorners, -/obj/machinery/camera/autoname/directional/east, +/obj/machinery/camera/directional/east, /obj/machinery/light{ dir = 4 }, diff --git a/_maps/shuttles/emergency/emergency_delta.dmm b/_maps/shuttles/emergency/emergency_delta.dmm index 664261a5faf3a..1fb7c30b9f8b2 100644 --- a/_maps/shuttles/emergency/emergency_delta.dmm +++ b/_maps/shuttles/emergency/emergency_delta.dmm @@ -127,7 +127,7 @@ /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 8 }, -/obj/machinery/camera/autoname/directional/west, +/obj/machinery/camera/directional/west, /turf/open/floor/iron/edge{ dir = 4 }, @@ -554,7 +554,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 4 }, -/obj/machinery/camera/autoname/directional/east, +/obj/machinery/camera/directional/east, /turf/open/floor/iron/edge{ dir = 8 }, @@ -623,7 +623,7 @@ /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 4 }, -/obj/machinery/camera/autoname/directional/east, +/obj/machinery/camera/directional/east, /turf/open/floor/iron/edge{ dir = 8 }, @@ -779,7 +779,7 @@ /area/shuttle/escape) "iz" = ( /obj/structure/chair/fancy/shuttle, -/obj/machinery/camera/autoname/directional/north, +/obj/machinery/camera/directional/north, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "iG" = ( @@ -876,7 +876,7 @@ /turf/open/floor/iron/edge, /area/shuttle/escape) "qU" = ( -/obj/machinery/camera/autoname/directional/north, +/obj/machinery/camera/directional/north, /obj/machinery/status_display/ai/directional/north, /turf/open/floor/carpet/blue, /area/shuttle/escape) @@ -1176,7 +1176,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 5 }, -/obj/machinery/camera/autoname/directional/north, +/obj/machinery/camera/directional/north, /obj/machinery/status_display/evac/directional/east, /obj/machinery/newscaster/directional/north, /turf/open/floor/iron/white, @@ -1558,7 +1558,7 @@ /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 8 }, -/obj/machinery/camera/autoname/directional/west, +/obj/machinery/camera/directional/west, /turf/open/floor/iron/edge{ dir = 4 }, diff --git a/_maps/shuttles/emergency/emergency_meta.dmm b/_maps/shuttles/emergency/emergency_meta.dmm index f17055ccf8b14..360b7561af4fd 100644 --- a/_maps/shuttles/emergency/emergency_meta.dmm +++ b/_maps/shuttles/emergency/emergency_meta.dmm @@ -757,7 +757,7 @@ /turf/open/floor/iron, /area/shuttle/escape) "ig" = ( -/obj/machinery/camera/autoname/directional/east, +/obj/machinery/camera/directional/east, /turf/open/floor/carpet/blue, /area/shuttle/escape) "ja" = ( @@ -858,7 +858,7 @@ dir = 1 }, /obj/effect/turf_decal/bot, -/obj/machinery/camera/autoname/directional/south, +/obj/machinery/camera/directional/south, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "uD" = ( @@ -867,7 +867,7 @@ dir = 1 }, /obj/effect/turf_decal/bot, -/obj/machinery/camera/autoname/directional/north, +/obj/machinery/camera/directional/north, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "ve" = ( @@ -922,9 +922,7 @@ /obj/structure/chair/fancy/shuttle{ dir = 4 }, -/obj/machinery/camera/autoname/directional/west{ - network = list("ss13","engine") - }, +/obj/machinery/camera/directional/west, /obj/machinery/newscaster/directional/west, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) @@ -1218,7 +1216,7 @@ dir = 1 }, /obj/machinery/iv_drip, -/obj/machinery/camera/autoname/directional/north, +/obj/machinery/camera/directional/north, /obj/structure/bed/roller, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) diff --git a/_maps/shuttles/emergency/emergency_tiny.dmm b/_maps/shuttles/emergency/emergency_tiny.dmm index 9ff7cbc73b571..98f3d414ae195 100644 --- a/_maps/shuttles/emergency/emergency_tiny.dmm +++ b/_maps/shuttles/emergency/emergency_tiny.dmm @@ -76,18 +76,6 @@ /turf/open/floor/grass/no_border, /area/shuttle/escape) "ec" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/camera/autoname/directional/west{ - network = list("evac") - }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, -/obj/effect/turf_decal/delivery, /obj/machinery/light{ dir = 8 }, @@ -163,30 +151,11 @@ /obj/structure/chair/fancy/shuttle{ dir = 1 }, -/obj/machinery/computer/security/telescreen/entertainment{ - network = list("evac"); - pixel_x = 32; - pixel_y = -1 - }, -/obj/item/radio/intercom/directional/south, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, -/obj/effect/turf_decal/bot, -/obj/structure/chair/fancy/shuttle{ - dir = 1 - }, -/obj/item/radio/intercom{ - name = "Station Intercom"; - pixel_x = 1; - pixel_y = -30 - }, /obj/machinery/computer/security/telescreen/evac{ pixel_x = 32; - pixel_y = -1 + dir = 8 }, +/obj/item/radio/intercom/directional/south, /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) "nL" = ( @@ -658,25 +627,8 @@ dir = 10 }, /obj/effect/turf_decal/bot, -/obj/machinery/camera/directional/north{ - network = list("evac") - }, -/obj/structure/closet/firecloset/full, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, -/obj/machinery/flasher{ - id = "tinyflash"; - pixel_y = 27 - }, -/obj/structure/chair/fancy/shuttle, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/effect/turf_decal/bot, /obj/machinery/camera/directional/north, +/obj/structure/closet/firecloset/full, /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) "TL" = ( From 7dd43320c64db76c12e0aa8423de67a738aad074 Mon Sep 17 00:00:00 2001 From: Markus Date: Fri, 27 Sep 2024 11:41:19 +0200 Subject: [PATCH 03/13] minor fixes --- _maps/shuttles/emergency/emergency_meta.dmm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/_maps/shuttles/emergency/emergency_meta.dmm b/_maps/shuttles/emergency/emergency_meta.dmm index 360b7561af4fd..9324c642199d0 100644 --- a/_maps/shuttles/emergency/emergency_meta.dmm +++ b/_maps/shuttles/emergency/emergency_meta.dmm @@ -148,7 +148,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/turf/open/floor/grass, +/turf/open/floor/grass/no_border, /area/shuttle/escape) "aF" = ( /obj/machinery/computer/station_alert{ @@ -813,7 +813,7 @@ dir = 1; pixel_y = 1 }, -/turf/open/floor/grass, +/turf/open/floor/grass/no_border, /area/shuttle/escape) "pq" = ( /obj/machinery/door/airlock/command{ @@ -1054,7 +1054,7 @@ dir = 1 }, /obj/structure/window/reinforced, -/turf/open/floor/grass, +/turf/open/floor/grass/no_border, /area/shuttle/escape) "Ns" = ( /obj/machinery/door/airlock/external{ @@ -1107,7 +1107,7 @@ dir = 1; pixel_y = 1 }, -/turf/open/floor/grass, +/turf/open/floor/grass/no_border, /area/shuttle/escape) "RM" = ( /obj/effect/decal/cleanable/dirt, @@ -1196,7 +1196,10 @@ pixel_y = 1 }, /obj/structure/window/reinforced, -/turf/open/floor/grass, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/open/floor/grass/no_border, /area/shuttle/escape) "Yo" = ( /obj/effect/decal/cleanable/dirt, From 1189aa6bfc6598e23589b664c73034538fd01a60 Mon Sep 17 00:00:00 2001 From: Markus Date: Fri, 27 Sep 2024 11:48:17 +0200 Subject: [PATCH 04/13] changed bar bridge carpet --- _maps/shuttles/emergency/emergency_bar.dmm | 71 ++++++++++++++++------ 1 file changed, 53 insertions(+), 18 deletions(-) diff --git a/_maps/shuttles/emergency/emergency_bar.dmm b/_maps/shuttles/emergency/emergency_bar.dmm index abfa6dcb6a59c..31c846fae76e2 100644 --- a/_maps/shuttles/emergency/emergency_bar.dmm +++ b/_maps/shuttles/emergency/emergency_bar.dmm @@ -16,17 +16,26 @@ /obj/structure/table/wood, /obj/item/flashlight/lamp/green, /obj/machinery/newscaster/directional/west, -/turf/open/floor/carpet, +/obj/effect/turf_decal/siding/dark{ + dir = 9 + }, +/turf/open/floor/carpet/royalblue, /area/shuttle/escape) "ag" = ( /obj/structure/chair/fancy/comfy{ dir = 1 }, -/turf/open/floor/carpet, +/obj/effect/turf_decal/siding/dark{ + dir = 1 + }, +/turf/open/floor/carpet/royalblue, /area/shuttle/escape) "ah" = ( /obj/machinery/computer/emergency_shuttle, -/turf/open/floor/carpet, +/obj/effect/turf_decal/siding/dark{ + dir = 1 + }, +/turf/open/floor/carpet/royalblue, /area/shuttle/escape) "ai" = ( /obj/structure/table/wood, @@ -35,67 +44,91 @@ pixel_x = -4; pixel_y = 6 }, -/turf/open/floor/carpet, +/obj/effect/turf_decal/siding/dark{ + dir = 5 + }, +/turf/open/floor/carpet/royalblue, /area/shuttle/escape) "al" = ( /obj/machinery/computer/atmos_alert{ dir = 4 }, /obj/machinery/status_display/evac/directional/west, -/turf/open/floor/carpet, +/obj/effect/turf_decal/siding/dark{ + dir = 9 + }, +/turf/open/floor/carpet/royalblue, /area/shuttle/escape) "am" = ( /obj/structure/chair/fancy/comfy{ dir = 8 }, -/turf/open/floor/carpet, +/obj/effect/turf_decal/siding/dark/corner{ + dir = 1 + }, +/turf/open/floor/carpet/royalblue, /area/shuttle/escape) "an" = ( -/turf/open/floor/carpet, +/turf/open/floor/carpet/royalblue, /area/shuttle/escape) "ao" = ( /obj/structure/chair/fancy/comfy{ dir = 4 }, -/turf/open/floor/carpet, +/obj/effect/turf_decal/siding/dark/corner{ + dir = 4 + }, +/turf/open/floor/carpet/royalblue, /area/shuttle/escape) "ap" = ( /obj/machinery/computer/security{ dir = 8 }, /obj/machinery/status_display/ai/directional/east, -/turf/open/floor/carpet, +/obj/effect/turf_decal/siding/dark{ + dir = 5 + }, +/turf/open/floor/carpet/royalblue, /area/shuttle/escape) "aq" = ( /obj/machinery/computer/crew{ dir = 4 }, -/turf/open/floor/carpet, +/obj/effect/turf_decal/siding/dark{ + dir = 10 + }, +/turf/open/floor/carpet/royalblue, /area/shuttle/escape) "ar" = ( /obj/structure/chair/fancy/comfy{ dir = 8 }, /obj/structure/extinguisher_cabinet/directional/south, -/turf/open/floor/carpet, +/obj/effect/turf_decal/siding/dark, +/turf/open/floor/carpet/royalblue, /area/shuttle/escape) "as" = ( /obj/item/radio/intercom/directional/south, -/turf/open/floor/carpet, +/obj/effect/turf_decal/siding/dark, +/turf/open/floor/carpet/royalblue, /area/shuttle/escape) "at" = ( /obj/structure/table/wood/poker, /obj/item/storage/box/drinkingglasses, /obj/item/reagent_containers/food/drinks/bottle/whiskey, /obj/machinery/light, -/turf/open/floor/carpet, +/obj/effect/turf_decal/siding/dark, +/turf/open/floor/carpet/royalblue, /area/shuttle/escape) "au" = ( /obj/machinery/computer/communications{ dir = 8 }, /obj/machinery/camera/directional/east, -/turf/open/floor/carpet, +/obj/effect/turf_decal/siding/dark{ + dir = 6 + }, +/turf/open/floor/carpet/royalblue, /area/shuttle/escape) "aC" = ( /obj/structure/chair/fancy/shuttle, @@ -421,7 +454,7 @@ /area/shuttle/escape) "mB" = ( /obj/machinery/holopad, -/turf/open/floor/carpet, +/turf/open/floor/carpet/royalblue, /area/shuttle/escape) "oh" = ( /obj/item/kirbyplants{ @@ -588,7 +621,8 @@ pixel_x = -25; pixel_y = -25 }, -/turf/open/floor/carpet, +/obj/effect/turf_decal/siding/dark, +/turf/open/floor/carpet/royalblue, /area/shuttle/escape) "GA" = ( /obj/item/radio/intercom/directional/east, @@ -641,7 +675,8 @@ dir = 4 }, /obj/machinery/firealarm/directional/south, -/turf/open/floor/carpet, +/obj/effect/turf_decal/siding/dark, +/turf/open/floor/carpet/royalblue, /area/shuttle/escape) "Py" = ( /obj/machinery/door/airlock/titanium{ @@ -709,7 +744,7 @@ /area/shuttle/escape) "Vu" = ( /obj/machinery/ai_slipper, -/turf/open/floor/carpet, +/turf/open/floor/carpet/royalblue, /area/shuttle/escape) "Vx" = ( /obj/machinery/light{ From 33ec3fed1399e26124bd7884ab8e552d023aaf98 Mon Sep 17 00:00:00 2001 From: Markus Date: Fri, 27 Sep 2024 12:54:04 +0200 Subject: [PATCH 05/13] finished! --- .../shuttles/emergency/emergency_asteroid.dmm | 44 +- _maps/shuttles/emergency/emergency_bar.dmm | 74 +- .../shuttles/emergency/emergency_birdboat.dmm | 775 ++++++++++++------ _maps/shuttles/emergency/emergency_box.dmm | 670 +++++++++------ _maps/shuttles/emergency/emergency_delta.dmm | 26 + _maps/shuttles/emergency/emergency_meta.dmm | 42 +- _maps/shuttles/emergency/emergency_tiny.dmm | 68 +- 7 files changed, 1153 insertions(+), 546 deletions(-) diff --git a/_maps/shuttles/emergency/emergency_asteroid.dmm b/_maps/shuttles/emergency/emergency_asteroid.dmm index 7ba1d6eabe820..1bf8b084ed9b9 100644 --- a/_maps/shuttles/emergency/emergency_asteroid.dmm +++ b/_maps/shuttles/emergency/emergency_asteroid.dmm @@ -314,7 +314,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 9 }, -/turf/open/floor/iron, +/turf/open/floor/iron/white, /area/shuttle/escape) "bs" = ( /obj/structure/bed, @@ -349,6 +349,11 @@ dir = 1 }, /area/shuttle/escape) +"by" = ( +/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/machinery/ai_slipper, +/turf/open/floor/iron/large, +/area/shuttle/escape) "bz" = ( /obj/machinery/stasis, /obj/machinery/camera/directional/east, @@ -356,7 +361,8 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 }, -/turf/open/floor/iron/edge{ +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/white/smooth_edge{ dir = 8 }, /area/shuttle/escape) @@ -365,7 +371,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 }, -/turf/open/floor/iron/edge{ +/turf/open/floor/iron/white/smooth_edge{ dir = 4 }, /area/shuttle/escape) @@ -375,7 +381,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 }, -/turf/open/floor/iron/edge{ +/turf/open/floor/iron/white/smooth_edge{ dir = 8 }, /area/shuttle/escape) @@ -401,13 +407,14 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 10 }, -/turf/open/floor/iron, +/turf/open/floor/iron/white, /area/shuttle/escape) "bG" = ( /obj/structure/table/optable, /obj/item/surgical_drapes, /obj/effect/turf_decal/trimline/blue/filled/line, -/turf/open/floor/iron/edge{ +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/white/smooth_edge{ dir = 1 }, /area/shuttle/escape) @@ -427,7 +434,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 6 }, -/turf/open/floor/iron, +/turf/open/floor/iron/white, /area/shuttle/escape) "bJ" = ( /obj/machinery/light, @@ -446,6 +453,7 @@ /area/shuttle/escape) "bM" = ( /obj/machinery/light, +/obj/structure/reagent_dispensers/peppertank/directional/south, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "bN" = ( @@ -480,7 +488,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 }, -/turf/open/floor/iron/edge, +/turf/open/floor/iron/white/smooth_edge, /area/shuttle/escape) "cB" = ( /obj/machinery/holopad, @@ -534,7 +542,8 @@ /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "lL" = ( -/turf/open/floor/iron/large, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/white/smooth_large, /area/shuttle/escape) "mB" = ( /obj/structure/extinguisher_cabinet/directional/east, @@ -573,7 +582,8 @@ "uM" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box, -/turf/open/floor/iron/large, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/white/smooth_large, /area/shuttle/escape) "uQ" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -585,7 +595,8 @@ /area/shuttle/escape) "uW" = ( /obj/machinery/ai_slipper, -/turf/open/floor/iron/large, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/white/smooth_large, /area/shuttle/escape) "ve" = ( /obj/structure/closet, @@ -602,7 +613,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 5 }, -/turf/open/floor/iron, +/turf/open/floor/iron/white, /area/shuttle/escape) "xE" = ( /obj/machinery/door/airlock/titanium{ @@ -621,7 +632,6 @@ }, /area/shuttle/escape) "yT" = ( -/obj/machinery/ai_slipper, /obj/item/radio/intercom/directional/south, /obj/effect/turf_decal/trimline/yellow/filled/line, /turf/open/floor/iron/edge{ @@ -743,7 +753,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 }, -/turf/open/floor/iron/edge{ +/turf/open/floor/iron/white/smooth_edge{ dir = 4 }, /area/shuttle/escape) @@ -759,7 +769,7 @@ /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 8 }, -/turf/open/floor/iron/edge{ +/turf/open/floor/iron/white/smooth_edge{ dir = 4 }, /area/shuttle/escape) @@ -845,7 +855,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 }, -/turf/open/floor/iron/edge{ +/turf/open/floor/iron/white/smooth_edge{ dir = 8 }, /area/shuttle/escape) @@ -967,7 +977,7 @@ qO (6,1,1) = {" xE Gy -uM +by yT ac aV diff --git a/_maps/shuttles/emergency/emergency_bar.dmm b/_maps/shuttles/emergency/emergency_bar.dmm index 31c846fae76e2..43eb5ea85623c 100644 --- a/_maps/shuttles/emergency/emergency_bar.dmm +++ b/_maps/shuttles/emergency/emergency_bar.dmm @@ -155,29 +155,18 @@ /turf/open/floor/carpet/grimy, /area/shuttle/escape) "aH" = ( -/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/machinery/light/small{ brightness = 3; dir = 8 }, +/obj/structure/reagent_dispensers/peppertank/directional/west, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "aI" = ( /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "aL" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = -30 - }, +/obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "aM" = ( @@ -219,8 +208,10 @@ /turf/open/floor/carpet/grimy, /area/shuttle/escape) "bi" = ( -/obj/machinery/ai_slipper, -/turf/open/floor/mineral/titanium, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/holopad, +/obj/effect/turf_decal/box, +/turf/open/floor/iron/white/smooth_large, /area/shuttle/escape) "bp" = ( /obj/effect/decal/cleanable/oil, @@ -230,7 +221,10 @@ "br" = ( /obj/machinery/iv_drip, /obj/structure/bed/roller, -/turf/open/floor/mineral/titanium, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 5 + }, +/turf/open/floor/iron/white, /area/shuttle/escape) "bw" = ( /obj/structure/table/optable, @@ -241,7 +235,13 @@ }, /obj/machinery/camera/directional/west, /obj/machinery/newscaster/directional/west, -/turf/open/floor/mineral/titanium, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/white/smooth_edge{ + dir = 4 + }, /area/shuttle/escape) "bx" = ( /obj/machinery/recharge_station, @@ -257,7 +257,10 @@ /obj/item/hemostat, /obj/item/scalpel, /obj/item/cautery, -/turf/open/floor/mineral/titanium, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 10 + }, +/turf/open/floor/iron/white, /area/shuttle/escape) "bC" = ( /obj/structure/shuttle/engine/heater, @@ -325,7 +328,10 @@ pixel_x = 4; pixel_y = 4 }, -/turf/open/floor/mineral/titanium, +/obj/effect/turf_decal/trimline/blue/filled/line, +/turf/open/floor/iron/white/smooth_edge{ + dir = 1 + }, /area/shuttle/escape) "bU" = ( /obj/structure/table, @@ -335,7 +341,10 @@ pixel_y = 4 }, /obj/item/radio/intercom/directional/south, -/turf/open/floor/mineral/titanium, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 6 + }, +/turf/open/floor/iron/white, /area/shuttle/escape) "bW" = ( /obj/machinery/light/small{ @@ -350,7 +359,13 @@ }, /obj/machinery/stasis, /obj/machinery/status_display/evac/directional/east, -/turf/open/floor/mineral/titanium, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/white/smooth_edge{ + dir = 8 + }, /area/shuttle/escape) "cS" = ( /obj/machinery/status_display/evac/directional/west, @@ -372,6 +387,7 @@ dir = 4 }, /obj/machinery/holopad, +/obj/effect/turf_decal/box, /turf/open/floor/carpet/grimy, /area/shuttle/escape) "gl" = ( @@ -433,6 +449,7 @@ "jv" = ( /obj/machinery/status_display/evac/directional/north, /obj/machinery/light/small, +/obj/machinery/ai_slipper, /turf/open/floor/iron/freezer, /area/shuttle/escape) "kj" = ( @@ -454,6 +471,7 @@ /area/shuttle/escape) "mB" = ( /obj/machinery/holopad, +/obj/effect/turf_decal/box, /turf/open/floor/carpet/royalblue, /area/shuttle/escape) "oh" = ( @@ -493,7 +511,10 @@ /area/shuttle/escape) "tB" = ( /obj/machinery/vending/wallmed/directional/west, -/turf/open/floor/mineral/titanium, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 9 + }, +/turf/open/floor/iron/white, /area/shuttle/escape) "tV" = ( /obj/structure/table/wood/bar{ @@ -580,8 +601,11 @@ /turf/open/floor/wood, /area/shuttle/escape) "DY" = ( -/obj/machinery/holopad, -/turf/open/floor/mineral/titanium, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 1 + }, +/obj/machinery/ai_slipper, +/turf/open/floor/iron/white/smooth_edge, /area/shuttle/escape) "Fm" = ( /obj/effect/turf_decal/siding/wood{ @@ -647,6 +671,7 @@ /area/shuttle/escape) "JI" = ( /obj/machinery/holopad, +/obj/effect/turf_decal/box, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "Lq" = ( @@ -793,6 +818,7 @@ "Zq" = ( /obj/effect/turf_decal/tile/bar/opposingcorners, /obj/machinery/holopad, +/obj/effect/turf_decal/box, /turf/open/floor/iron, /area/shuttle/escape) "Zw" = ( diff --git a/_maps/shuttles/emergency/emergency_birdboat.dmm b/_maps/shuttles/emergency/emergency_birdboat.dmm index aa0a92edbcc10..17cfb117d974c 100644 --- a/_maps/shuttles/emergency/emergency_birdboat.dmm +++ b/_maps/shuttles/emergency/emergency_birdboat.dmm @@ -6,25 +6,29 @@ /turf/closed/wall/mineral/titanium, /area/shuttle/escape) "ad" = ( -/obj/structure/table, -/obj/item/scalpel, -/obj/item/retractor{ - pixel_y = 5 +/obj/structure/extinguisher_cabinet/directional/north, +/obj/structure/closet, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 }, -/obj/item/hemostat, -/turf/open/floor/mineral/titanium/white, +/turf/open/floor/iron/edge, /area/shuttle/escape) "ae" = ( -/obj/structure/table, -/obj/item/cautery, -/obj/item/surgicaldrill, -/obj/item/circular_saw{ - pixel_y = 9 +/obj/structure/closet, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 }, -/turf/open/floor/mineral/titanium/white, +/turf/open/floor/iron/edge, /area/shuttle/escape) "af" = ( -/turf/open/floor/mineral/titanium/white, +/obj/machinery/vending/wallmed/directional/south, +/obj/machinery/computer/operating{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/blue/filled/line, +/turf/open/floor/iron/white/smooth_edge{ + dir = 1 + }, /area/shuttle/escape) "ag" = ( /obj/structure/shuttle/engine/propulsion/right{ @@ -35,24 +39,13 @@ "ah" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/shuttle/escape) -"aj" = ( -/obj/structure/chair/fancy/shuttle, -/turf/open/floor/mineral/titanium, -/area/shuttle/escape) -"ak" = ( -/obj/item/kirbyplants{ - icon_state = "plant-22" - }, -/turf/open/floor/mineral/titanium/blue, -/area/shuttle/escape) "al" = ( /obj/structure/chair/fancy/shuttle, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "an" = ( -/obj/structure/table/optable, -/obj/item/surgical_drapes, -/turf/open/floor/mineral/titanium/white, +/obj/effect/turf_decal/tile/yellow/fourcorners, +/turf/open/floor/iron/large, /area/shuttle/escape) "ap" = ( /obj/structure/shuttle/engine/propulsion{ @@ -61,9 +54,8 @@ /turf/open/floor/plating/airless, /area/shuttle/escape) "aq" = ( -/obj/machinery/computer/communications{ - dir = 4 - }, +/obj/machinery/computer/crew, +/obj/item/radio/intercom/directional/west, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "ar" = ( @@ -82,30 +74,19 @@ /turf/open/floor/plating/airless, /area/shuttle/escape) "av" = ( -/obj/machinery/light, -/turf/open/floor/mineral/titanium, -/area/shuttle/escape) -"aw" = ( -/obj/machinery/vending/wallmed{ - name = "Emergency NanoMed"; - use_power = 0 +/obj/machinery/computer/communications{ + dir = 1 }, -/turf/closed/wall/mineral/titanium/nodiagonal, +/turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) -"ax" = ( -/obj/structure/table, -/obj/machinery/recharger{ - active_power_usage = 0; - idle_power_usage = 0; - pixel_y = 4; - use_power = 0 +"aw" = ( +/obj/structure/closet/crate/bin, +/obj/item/radio/intercom/directional/south, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 10 }, -/turf/open/floor/mineral/plastitanium/red/brig, -/area/shuttle/escape) -"ay" = ( -/obj/structure/table, -/obj/item/storage/box/handcuffs, -/turf/open/floor/mineral/plastitanium/red/brig, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, /area/shuttle/escape) "aB" = ( /obj/item/kirbyplants{ @@ -116,9 +97,6 @@ "aC" = ( /turf/open/floor/mineral/titanium, /area/shuttle/escape) -"aD" = ( -/turf/open/floor/mineral/plastitanium, -/area/shuttle/escape) "aE" = ( /obj/structure/chair/fancy/shuttle{ dir = 4 @@ -140,10 +118,6 @@ }, /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) -"aJ" = ( -/obj/machinery/light/small, -/turf/open/floor/mineral/titanium, -/area/shuttle/escape) "aL" = ( /obj/structure/table, /turf/open/floor/mineral/plastitanium, @@ -160,38 +134,19 @@ /obj/structure/window/reinforced, /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) -"aO" = ( -/obj/structure/chair/fancy/shuttle{ - dir = 1 - }, -/obj/structure/window/reinforced, -/obj/machinery/light{ - dir = 4 - }, -/turf/open/floor/mineral/plastitanium, -/area/shuttle/escape) "aP" = ( /obj/structure/chair/fancy/shuttle, /obj/structure/window/reinforced{ - dir = 1; - pixel_y = 2 + dir = 1 }, /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) -"aQ" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = -27 - }, -/turf/open/floor/mineral/titanium/white, -/area/shuttle/escape) "aR" = ( -/obj/structure/table/glass, -/obj/item/storage/firstaid/fire{ - pixel_x = 5; - pixel_y = 5 +/obj/structure/extinguisher_cabinet/directional/north, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 5 }, -/obj/item/storage/firstaid/toxin, -/turf/open/floor/mineral/titanium/white, +/turf/open/floor/iron/white, /area/shuttle/escape) "aS" = ( /obj/structure/chair/fancy/shuttle{ @@ -200,67 +155,200 @@ /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) "aT" = ( +/obj/machinery/light, /obj/structure/chair/fancy/shuttle{ dir = 1 }, -/obj/machinery/light, +/obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) "aU" = ( -/obj/structure/table/glass, -/obj/item/storage/firstaid/brute{ - pixel_x = 5; - pixel_y = 5 +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/turf/open/floor/iron/white/smooth_edge{ + dir = 8 }, -/obj/item/storage/firstaid/brute, -/turf/open/floor/mineral/titanium/white, /area/shuttle/escape) "aV" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = -32 - }, +/obj/machinery/vending/cigarette, +/obj/effect/turf_decal/bot, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "aX" = ( /obj/machinery/stasis, -/turf/open/floor/mineral/titanium/white, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/machinery/camera/directional/south, +/turf/open/floor/iron/white/smooth_edge{ + dir = 1 + }, /area/shuttle/escape) "aY" = ( -/obj/structure/table/glass, -/obj/item/defibrillator/loaded, -/turf/open/floor/mineral/titanium/white, +/obj/structure/table/optable, +/obj/item/clothing/gloves/color/latex, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 6 + }, +/turf/open/floor/iron/white, /area/shuttle/escape) -"jz" = ( -/obj/machinery/door/airlock/public/glass, +"bS" = ( +/obj/structure/chair/fancy/shuttle, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/escape) +"cM" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/iron/edge, +/area/shuttle/escape) +"eF" = ( +/obj/effect/turf_decal/trimline/neutral/filled/warning{ + dir = 1 + }, +/turf/open/floor/iron/edge, +/area/shuttle/escape) +"ho" = ( +/obj/machinery/door/airlock/security/glass{ + name = "security Airlock"; + req_access_txt = "63" + }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, -/turf/open/floor/mineral/titanium/white, +/turf/open/floor/iron, +/area/shuttle/escape) +"hK" = ( +/obj/machinery/vending/sustenance, +/obj/effect/turf_decal/bot, +/turf/open/floor/mineral/titanium, +/area/shuttle/escape) +"im" = ( +/obj/machinery/computer/secure_data{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) +"ip" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/box, +/turf/open/floor/mineral/titanium, +/area/shuttle/escape) +"iH" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/ai_slipper, +/turf/open/floor/iron/large, +/area/shuttle/escape) +"jz" = ( +/obj/machinery/iv_drip, +/obj/structure/bed/roller, +/obj/effect/turf_decal/trimline/neutral/filled/line, +/turf/open/floor/iron/edge{ + dir = 1 + }, +/area/shuttle/escape) +"jD" = ( +/obj/machinery/button/flasher{ + id = "cockpit_flasher"; + pixel_x = 25; + pixel_y = -25 + }, +/turf/open/floor/mineral/titanium, +/area/shuttle/escape) +"jP" = ( +/mob/living/simple_animal/bot/medbot{ + name = "\improper emergency medibot"; + pixel_x = -3; + pixel_y = 2 + }, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 4 + }, +/turf/open/floor/iron/edge{ + dir = 8 + }, +/area/shuttle/escape) +"kh" = ( +/obj/effect/turf_decal/trimline/neutral/filled/warning{ + dir = 8 + }, +/turf/open/floor/iron/edge{ + dir = 4 + }, +/area/shuttle/escape) +"li" = ( +/obj/structure/table, +/obj/item/hemostat, +/obj/item/scalpel, +/obj/item/cautery, +/obj/item/surgical_drapes, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 10 + }, +/turf/open/floor/iron/white, /area/shuttle/escape) "lL" = ( /turf/closed/wall/mineral/titanium, /area/template_noop) -"mr" = ( -/obj/machinery/door/airlock/command/glass{ - name = "bridge Door"; - req_access_txt = "19" +"lO" = ( +/obj/effect/turf_decal/trimline/neutral/filled/warning{ + dir = 4 }, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 +/turf/open/floor/iron/edge{ + dir = 8 }, -/turf/open/floor/mineral/titanium, +/area/shuttle/escape) +"mk" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 10 + }, +/turf/open/floor/iron, +/area/shuttle/escape) +"mM" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 5 + }, +/turf/open/floor/iron, /area/shuttle/escape) "oq" = ( -/obj/machinery/computer/emergency_shuttle{ +/obj/structure/chair/fancy/shuttle, +/turf/open/floor/mineral/titanium/blue, +/area/shuttle/escape) +"ow" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 8 + }, +/turf/open/floor/iron/edge{ dir = 4 }, -/turf/open/floor/mineral/titanium/blue, +/area/shuttle/escape) +"ra" = ( +/obj/machinery/ai_slipper, +/turf/open/floor/mineral/titanium, /area/shuttle/escape) "ru" = ( -/obj/structure/chair/fancy/shuttle{ +/obj/machinery/firealarm/directional/east, +/obj/machinery/camera/directional/east, +/turf/open/floor/mineral/titanium, +/area/shuttle/escape) +"st" = ( +/obj/effect/turf_decal/trimline/neutral/filled/warning, +/turf/open/floor/iron/edge{ dir = 1 }, -/turf/open/floor/mineral/titanium, +/area/shuttle/escape) +"sK" = ( +/obj/machinery/ai_slipper, +/turf/open/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) +"sR" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 6 + }, +/turf/open/floor/iron, /area/shuttle/escape) "ta" = ( /obj/machinery/light{ @@ -268,6 +356,42 @@ }, /turf/open/floor/mineral/titanium, /area/shuttle/escape) +"uP" = ( +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/holopad, +/obj/effect/turf_decal/box, +/turf/open/floor/iron/white/smooth_large, +/area/shuttle/escape) +"vj" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/box, +/turf/open/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) +"vv" = ( +/obj/structure/chair/fancy/shuttle, +/obj/machinery/camera/directional/north, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/escape) +"vW" = ( +/obj/structure/chair/fancy/shuttle{ + dir = 4 + }, +/turf/open/floor/mineral/titanium, +/area/shuttle/escape) +"wJ" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/holopad, +/obj/effect/turf_decal/box, +/turf/open/floor/iron/large, +/area/shuttle/escape) +"xz" = ( +/obj/machinery/door/airlock/public/glass, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/turf/open/floor/iron, +/area/shuttle/escape) "xQ" = ( /obj/structure/shuttle/engine/heater{ dir = 8 @@ -276,10 +400,52 @@ /obj/machinery/door/firedoor/window, /turf/open/floor/plating/airless, /area/shuttle/escape) +"xV" = ( +/obj/structure/chair/fancy/shuttle{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet/directional/east, +/turf/open/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) "zf" = ( /obj/structure/table, /turf/open/floor/mineral/titanium, /area/shuttle/escape) +"zs" = ( +/obj/item/kirbyplants{ + icon_state = "plant-21" + }, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/mineral/titanium, +/area/shuttle/escape) +"AT" = ( +/obj/structure/chair/fancy/shuttle, +/obj/machinery/camera/directional/east, +/turf/open/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) +"Bm" = ( +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 1 + }, +/turf/open/floor/iron/white/smooth_edge, +/area/shuttle/escape) +"DU" = ( +/obj/structure/closet/firecloset, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 9 + }, +/obj/machinery/camera/directional/north, +/turf/open/floor/iron, +/area/shuttle/escape) +"Eg" = ( +/obj/structure/closet/emcloset, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/turf/open/floor/iron/edge, +/area/shuttle/escape) "EQ" = ( /obj/structure/chair/fancy/shuttle{ dir = 1 @@ -287,16 +453,62 @@ /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "Fg" = ( -/obj/machinery/computer/secure_data, +/obj/structure/chair/fancy/shuttle, +/obj/item/radio/intercom/directional/north, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) -"Hy" = ( -/obj/machinery/door/airlock/public/glass, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/stripes/closeup{ +"FV" = ( +/obj/effect/turf_decal/trimline/yellow/filled/warning, +/turf/open/floor/iron/edge{ dir = 1 }, -/turf/open/floor/mineral/titanium/white, +/area/shuttle/escape) +"GP" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, +/area/shuttle/escape) +"Hy" = ( +/obj/machinery/computer/crew{ + dir = 4 + }, +/obj/item/radio/intercom/directional/north, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 9 + }, +/turf/open/floor/iron/white, +/area/shuttle/escape) +"HU" = ( +/obj/item/radio/intercom/directional/east, +/turf/open/floor/mineral/titanium, +/area/shuttle/escape) +"Ke" = ( +/obj/structure/table, +/obj/item/storage/fancy/donut_box, +/turf/open/floor/mineral/titanium, +/area/shuttle/escape) +"Kr" = ( +/obj/structure/table, +/obj/structure/extinguisher_cabinet/directional/west, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/escape) +"KB" = ( +/obj/machinery/flasher{ + id = "cockpit_flasher"; + pixel_x = 25; + pixel_y = 25 + }, +/turf/open/floor/mineral/titanium, +/area/shuttle/escape) +"KP" = ( +/obj/structure/closet/crate/bin, +/obj/effect/turf_decal/bot, +/turf/open/floor/mineral/titanium, +/area/shuttle/escape) +"Lz" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 6 + }, +/turf/open/floor/iron, /area/shuttle/escape) "Mg" = ( /obj/machinery/door/airlock/titanium, @@ -312,6 +524,19 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, +/obj/structure/fans/tiny, +/turf/open/floor/iron/white, +/area/shuttle/escape) +"Ml" = ( +/obj/machinery/door/airlock/public/glass, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/closeup, +/turf/open/floor/iron, +/area/shuttle/escape) +"MM" = ( +/obj/item/kirbyplants{ + icon_state = "plant-22" + }, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "MN" = ( @@ -319,10 +544,69 @@ /obj/machinery/door/firedoor/window, /turf/open/floor/plating, /area/shuttle/escape) +"Nj" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/turf/open/floor/iron/white/smooth_edge, +/area/shuttle/escape) +"Nl" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/reagent_dispensers/peppertank/directional/east, +/turf/open/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) "Ok" = ( -/obj/machinery/computer/security, +/obj/structure/table, +/obj/machinery/recharger{ + active_power_usage = 0; + idle_power_usage = 0; + pixel_y = 4; + use_power = 0 + }, +/obj/item/restraints/handcuffs{ + pixel_y = 3 + }, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) +"OU" = ( +/obj/machinery/computer/security{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) +"PJ" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line, +/obj/machinery/light/small, +/turf/open/floor/iron/edge{ + dir = 1 + }, +/area/shuttle/escape) +"QI" = ( +/obj/item/storage/firstaid/fire{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/storage/firstaid/brute, +/obj/structure/table, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/turf/open/floor/iron/white/smooth_edge{ + dir = 4 + }, +/area/shuttle/escape) +"Re" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/chair/fancy/shuttle{ + dir = 8 + }, +/obj/structure/extinguisher_cabinet/directional/east, +/turf/open/floor/mineral/titanium, +/area/shuttle/escape) "RD" = ( /obj/machinery/door/airlock/command/glass{ name = "bridge Door"; @@ -330,7 +614,17 @@ }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, -/turf/open/floor/mineral/titanium, +/turf/open/floor/iron, +/area/shuttle/escape) +"SQ" = ( +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/ai_slipper, +/turf/open/floor/iron/white/smooth_large, +/area/shuttle/escape) +"Tf" = ( +/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/machinery/ai_slipper, +/turf/open/floor/iron/large, /area/shuttle/escape) "Ti" = ( /obj/machinery/door/airlock/titanium, @@ -338,11 +632,12 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/turf/open/floor/mineral/titanium, +/obj/structure/fans/tiny, +/turf/open/floor/iron/white, /area/shuttle/escape) "UE" = ( -/obj/machinery/computer/crew{ - dir = 4 +/obj/machinery/computer/emergency_shuttle{ + dir = 1 }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) @@ -351,20 +646,40 @@ /obj/machinery/door/firedoor/window, /turf/open/floor/plating, /area/template_noop) -"Wn" = ( -/obj/machinery/door/airlock/security/glass{ - name = "security Airlock"; - req_access_txt = "63" +"Yo" = ( +/obj/structure/closet/crate, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 9 }, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/stripes/closeup, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/iron, /area/shuttle/escape) -"Xi" = ( -/obj/machinery/light{ - dir = 4 +"YX" = ( +/obj/item/radio/intercom/directional/south, +/obj/effect/turf_decal/trimline/yellow/filled/line, +/turf/open/floor/iron/edge{ + dir = 1 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) +"ZR" = ( +/obj/structure/closet/crate/medical, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/o2{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/firstaid/toxin{ + pixel_x = -4; + pixel_y = 3 + }, +/obj/item/healthanalyzer{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/lazarus_injector, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 5 + }, +/turf/open/floor/iron, /area/shuttle/escape) (1,1,1) = {" @@ -391,10 +706,10 @@ aq oq UE ab -aH -aH -aH -aB +bS +aL +aS +zs ah ab aa @@ -402,14 +717,14 @@ aa (3,1,1) = {" aa ab -ak -ar -aC +vW +vW +ra av -ab -ta -aC -aC +MN +bS +aL +aS aC aS ab @@ -418,14 +733,14 @@ aa (4,1,1) = {" aa MN -aj zf -ru -aC +Ke +ip +jD RD +KB aC -aC -aC +ra aC aS MN @@ -434,14 +749,14 @@ aa (5,1,1) = {" aa MN -aj -zf +ar +Re ru -aV +MM ab -aE -aE -aM +ta +aC +aC aC aS MN @@ -451,13 +766,13 @@ aa lL ab ab -mr -MN ab ab -aL -aI -aL +MN +ah +aE +aM +aC aC aT ah @@ -466,26 +781,26 @@ ab (7,1,1) = {" lL Ok -at -at -ax +im +OU ab aB +Kr +aL +aI aC aC aC -aC -aC -aB +hK ab "} (8,1,1) = {" lL Fg -at -at +sK at MN +KP aC aC aC @@ -497,15 +812,15 @@ ab "} (9,1,1) = {" Vg +al at at -at -at -Wn +ho aC aC -aN -aP +ip +aC +ra aC aE aE @@ -514,110 +829,110 @@ MN (10,1,1) = {" Vg al -at -at +vj EQ MN +bS aC aC aN aP aC -aD -aD +aL +aL MN "} (11,1,1) = {" Vg -al -at -at -EQ +AT +Nl +xV ab +vv aC aC aN aP -aC +HU aH aH MN "} (12,1,1) = {" lL -al -at -Xi -ay ab -aC -aC -aO -aP -aC -aC -aB ab -"} -(13,1,1) = {" ab ab ab +xz +xz ab ab -ah -aC -aC -aw ab -Hy MN ab ab "} +(13,1,1) = {" +ab +Yo +ow +mk +ab +DU +kh +kh +aw +ab +Hy +QI +li +ab +"} (14,1,1) = {" ab ad an -af -af -jz -aC -aC +YX +ab +Eg +GP +GP jz -aQ -af -af +MN +Nj +uP aX ab "} (15,1,1) = {" ab ae -af -af -af -jz -aC -aC -jz -af -af -af +Tf +FV +Ml +eF +iH +wJ +st +Ml +Bm +SQ af ab "} (16,1,1) = {" ab -af -af -af -af +ZR +jP +sR ab -aC -aJ +cM +GP +GP +PJ ab -af aR aU aY @@ -628,15 +943,15 @@ ab xQ xQ xQ -xQ ab -aC -aC +mM +lO +lO +Lz ab xQ xQ xQ -xQ ab "} (18,1,1) = {" @@ -644,12 +959,12 @@ ab ag ap au -ag +ab ab Ti Mg ab -ag +ab ag ap au diff --git a/_maps/shuttles/emergency/emergency_box.dmm b/_maps/shuttles/emergency/emergency_box.dmm index 4905f73d54616..ac3bffd123722 100644 --- a/_maps/shuttles/emergency/emergency_box.dmm +++ b/_maps/shuttles/emergency/emergency_box.dmm @@ -12,7 +12,8 @@ /obj/effect/turf_decal/siding/thinplating_new{ dir = 8 }, -/turf/open/floor/iron, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, /area/shuttle/escape) "ag" = ( /turf/open/floor/iron, @@ -25,7 +26,12 @@ /obj/effect/turf_decal/siding/thinplating_new/corner{ dir = 4 }, -/turf/open/floor/iron, +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/vending/wallmed/directional/north, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, /area/shuttle/escape) "ai" = ( /obj/structure/chair/fancy/shuttle{ @@ -41,9 +47,6 @@ /obj/effect/turf_decal/siding/thinplating_new{ dir = 4 }, -/obj/machinery/light{ - dir = 8 - }, /turf/open/floor/iron/tech/grid, /area/shuttle/escape) "am" = ( @@ -54,86 +57,9 @@ /turf/open/floor/iron/techmaint, /area/shuttle/escape) "an" = ( -/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, +/obj/machinery/newscaster/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, /area/shuttle/escape) "ao" = ( /obj/structure/chair/fancy/shuttle, @@ -147,57 +73,39 @@ /obj/effect/turf_decal/siding/thinplating_new{ dir = 8 }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/firealarm/directional/east, /turf/open/floor/iron/tech/grid, /area/shuttle/escape) "aq" = ( -/obj/effect/turf_decal/guideline/guideline_edge/blue{ +/obj/effect/turf_decal/trimline/blue/filled/line, +/turf/open/floor/iron/white/smooth_edge{ dir = 1 }, -/turf/open/floor/iron/white, /area/shuttle/escape) "ar" = ( /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/effect/turf_decal/guideline/guideline_half_edge/blue{ - dir = 10 - }, -/obj/effect/turf_decal/guideline/guideline_half_edge/blue{ +/obj/machinery/computer/operating{ dir = 4 }, -/obj/machinery/computer/operating{ - dir = 1 +/obj/item/radio/intercom/directional/west, +/obj/machinery/camera/directional/west, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 10 }, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/white/textured, +/turf/open/floor/iron/white, /area/shuttle/escape) "at" = ( /obj/structure/chair/fancy/shuttle{ dir = 8 }, -/obj/structure/extinguisher_cabinet{ - pixel_y = -30 - }, /obj/effect/turf_decal/bot_white, +/obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron/techmaint, /area/shuttle/escape) -"au" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = -5; - pixel_y = 30 - }, -/obj/effect/turf_decal/siding/thinplating_new, -/turf/open/floor/iron, -/area/shuttle/escape) "az" = ( /obj/machinery/status_display/evac, /turf/closed/wall/mineral/titanium, @@ -209,14 +117,11 @@ "aB" = ( /obj/machinery/stasis, /obj/effect/turf_decal/bot, -/obj/effect/turf_decal/guideline/guideline_edge_alt/blue{ - dir = 4 - }, -/obj/effect/turf_decal/guideline/guideline_half_edge/blue{ - dir = 6 +/obj/machinery/newscaster/directional/north, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 5 }, -/obj/item/defibrillator/loaded, -/turf/open/floor/iron/white/textured, +/turf/open/floor/iron/white, /area/shuttle/escape) "aC" = ( /obj/effect/turf_decal/siding/thinplating_new{ @@ -225,7 +130,8 @@ /obj/effect/turf_decal/siding/thinplating_new{ dir = 4 }, -/turf/open/floor/iron, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, /area/shuttle/escape) "aD" = ( /obj/machinery/recharger, @@ -247,6 +153,7 @@ /obj/machinery/light{ dir = 8 }, +/obj/structure/reagent_dispensers/peppertank/directional/west, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "aG" = ( @@ -256,13 +163,15 @@ /obj/structure/chair/fancy/shuttle{ dir = 1 }, +/obj/machinery/newscaster/directional/south, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "aK" = ( /obj/effect/turf_decal/siding/thinplating_new{ dir = 1 }, -/turf/open/floor/iron, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, /area/shuttle/escape) "aM" = ( /obj/structure/table, @@ -273,14 +182,16 @@ dir = 8 }, /obj/effect/turf_decal/siding/thinplating_new/corner, -/turf/open/floor/iron, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, /area/shuttle/escape) "aR" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 27 }, /obj/effect/turf_decal/siding/thinplating_new, -/turf/open/floor/iron, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, /area/shuttle/escape) "aS" = ( /obj/structure/chair/fancy/shuttle{ @@ -303,46 +214,38 @@ /turf/open/floor/iron/techmaint, /area/shuttle/escape) "aW" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = -30 - }, /obj/effect/turf_decal/siding/thinplating_new/corner{ dir = 4 }, /obj/effect/turf_decal/siding/thinplating_new/corner{ dir = 1 }, -/turf/open/floor/iron, +/obj/item/radio/intercom/directional/south, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, /area/shuttle/escape) "bb" = ( -/turf/open/floor/mineral/titanium/yellow, +/obj/effect/turf_decal/tile/yellow/fourcorners, +/turf/open/floor/iron/large, /area/shuttle/escape) "bc" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 27 +/obj/structure/extinguisher_cabinet/directional/east, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 5 }, -/turf/open/floor/mineral/titanium/yellow, +/turf/open/floor/iron, /area/shuttle/escape) "bd" = ( /obj/machinery/stasis, /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 +/obj/machinery/vending/wallmed/directional/south, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 6 }, -/turf/open/floor/iron/white/textured, +/turf/open/floor/iron/white, /area/shuttle/escape) "be" = ( /obj/structure/table, -/obj/structure/extinguisher_cabinet{ - pixel_x = 27 - }, -/obj/effect/turf_decal/guideline/guideline_edge/blue{ - dir = 8 - }, /obj/item/storage/firstaid/regular{ pixel_x = -10; pixel_y = 7 @@ -355,28 +258,35 @@ /obj/machinery/light{ dir = 4 }, -/turf/open/floor/iron/white/textured, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/turf/open/floor/iron/white/smooth_edge{ + dir = 8 + }, /area/shuttle/escape) "bf" = ( /obj/structure/closet, -/turf/open/floor/mineral/titanium/yellow, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 10 + }, +/turf/open/floor/iron, /area/shuttle/escape) "bg" = ( /obj/structure/closet/crate, -/turf/open/floor/mineral/titanium/yellow, -/area/shuttle/escape) -"bi" = ( -/obj/structure/window/reinforced{ +/obj/effect/turf_decal/trimline/yellow/filled/line, +/turf/open/floor/iron/edge{ dir = 1 }, +/area/shuttle/escape) +"bi" = ( /obj/structure/shuttle/engine/heater, +/obj/effect/spawner/structure/window/shuttle, +/obj/machinery/door/firedoor/window, /turf/open/floor/plating/airless, /area/shuttle/escape) "bj" = ( -/obj/machinery/vending/wallmed{ - name = "Emergency NanoMed"; - use_power = 0 - }, /turf/closed/wall/mineral/titanium/nodiagonal, /area/shuttle/escape) "bk" = ( @@ -390,24 +300,29 @@ /obj/machinery/light{ dir = 4 }, -/turf/open/floor/iron, +/obj/item/radio/intercom/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, /area/shuttle/escape) "bm" = ( /obj/effect/turf_decal/siding/thinplating_new{ dir = 4 }, -/turf/open/floor/iron, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, /area/shuttle/escape) "bn" = ( /obj/effect/turf_decal/siding/thinplating_new, -/turf/open/floor/iron, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, /area/shuttle/escape) "bo" = ( /obj/effect/turf_decal/siding/thinplating_new{ dir = 1 }, -/obj/machinery/light, -/turf/open/floor/iron, +/obj/machinery/newscaster/directional/south, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, /area/shuttle/escape) "bp" = ( /obj/machinery/light, @@ -417,34 +332,63 @@ /obj/effect/turf_decal/siding/thinplating_new/corner{ dir = 1 }, -/turf/open/floor/iron, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, /area/shuttle/escape) "bq" = ( /obj/machinery/light/small{ brightness = 3; dir = 8 }, -/turf/open/floor/mineral/titanium/yellow, +/obj/machinery/newscaster/directional/west, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 8 + }, +/turf/open/floor/iron/edge{ + dir = 4 + }, /area/shuttle/escape) "br" = ( /obj/machinery/light/small{ dir = 4 }, -/turf/open/floor/mineral/titanium/yellow, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 4 + }, +/turf/open/floor/iron/edge{ + dir = 8 + }, /area/shuttle/escape) "bs" = ( /obj/structure/table/optable, /obj/machinery/light{ dir = 8 }, -/obj/effect/turf_decal/guideline/guideline_edge/blue{ +/obj/machinery/status_display/evac/directional/west, +/obj/item/clothing/gloves/color/latex, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/white/smooth_edge{ dir = 4 }, -/obj/item/storage/backpack/duffelbag/med/surgery{ - pixel_y = 7 +/area/shuttle/escape) +"bz" = ( +/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/machinery/ai_slipper, +/turf/open/floor/iron/large, +/area/shuttle/escape) +"bG" = ( +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 8 + }, +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 4 }, -/obj/item/surgical_drapes, -/turf/open/floor/iron/white/textured, +/obj/machinery/ai_slipper, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, /area/shuttle/escape) "ds" = ( /obj/structure/extinguisher_cabinet{ @@ -454,9 +398,9 @@ /obj/effect/turf_decal/siding/thinplating_new{ dir = 1 }, -/obj/machinery/light, /obj/effect/turf_decal/bot_white, -/turf/open/floor/iron, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, /area/shuttle/escape) "ef" = ( /obj/structure/table, @@ -478,11 +422,36 @@ /obj/effect/turf_decal/siding/thinplating_new/corner{ dir = 1 }, -/turf/open/floor/iron, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, /area/shuttle/escape) "ga" = ( -/obj/effect/turf_decal/tile/blue/diagonal_centre, -/turf/open/floor/iron/white, +/obj/machinery/ai_slipper, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/white/smooth_large, +/area/shuttle/escape) +"ij" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/box, +/turf/open/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) +"iS" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 9 + }, +/turf/open/floor/iron, +/area/shuttle/escape) +"jw" = ( +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 8 + }, +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 4 + }, +/obj/machinery/holopad, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/box, +/turf/open/floor/iron/large, /area/shuttle/escape) "jX" = ( /obj/machinery/computer/atmos_alert{ @@ -491,20 +460,48 @@ /obj/effect/turf_decal/siding/thinplating_new{ dir = 4 }, +/obj/machinery/status_display/evac/directional/west, +/obj/machinery/light{ + dir = 8 + }, /turf/open/floor/iron/tech/grid, /area/shuttle/escape) +"lc" = ( +/obj/structure/chair/fancy/shuttle{ + dir = 4 + }, +/obj/effect/turf_decal/bot_white, +/obj/machinery/newscaster/directional/south, +/turf/open/floor/iron/techmaint, +/area/shuttle/escape) +"lm" = ( +/obj/structure/chair/fancy/shuttle, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) "mA" = ( /obj/machinery/door/airlock/titanium{ name = "Emergency Shuttle Airlock" }, /obj/structure/fans/tiny, -/turf/open/floor/plating, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/turf/open/floor/iron/white, /area/shuttle/escape) "mU" = ( /obj/effect/turf_decal/siding/thinplating_new, /obj/effect/turf_decal/siding/thinplating_new/corner{ dir = 4 }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, +/area/shuttle/escape) +"nN" = ( +/obj/structure/closet/crate, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 6 + }, /turf/open/floor/iron, /area/shuttle/escape) "qi" = ( @@ -515,16 +512,23 @@ /obj/machinery/light{ dir = 8 }, +/obj/machinery/status_display/evac/directional/west, +/obj/machinery/camera/directional/west, /turf/open/floor/iron/techmaint, /area/shuttle/escape) "qO" = ( +/obj/machinery/camera/directional/south, /obj/machinery/button/flasher{ id = "cockpit_flasher"; pixel_x = 6; - pixel_y = -24 + pixel_y = -25 }, /turf/open/floor/iron, /area/shuttle/escape) +"rD" = ( +/obj/machinery/ai_slipper, +/turf/open/floor/iron, +/area/shuttle/escape) "tF" = ( /obj/structure/chair/fancy/shuttle{ dir = 1 @@ -533,27 +537,141 @@ /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 +"uh" = ( +/obj/structure/chair/fancy/shuttle{ + dir = 4 }, +/obj/effect/turf_decal/bot_white, +/obj/machinery/status_display/ai/directional/west, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/iron/techmaint, +/area/shuttle/escape) +"vj" = ( +/obj/structure/chair/fancy/shuttle{ + dir = 8 + }, +/obj/effect/turf_decal/bot_white, +/obj/machinery/status_display/evac/directional/east, +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/camera/directional/east, +/turf/open/floor/iron/techmaint, +/area/shuttle/escape) +"wq" = ( +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron, +/area/shuttle/escape) +"wF" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/effect/turf_decal/box, +/turf/open/floor/iron/white/smooth_large, +/area/shuttle/escape) +"yh" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/box, /turf/open/floor/iron, /area/shuttle/escape) "yM" = ( +/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, /obj/effect/turf_decal/siding/thinplating_new{ dir = 4 }, -/obj/effect/turf_decal/bot_white, -/obj/structure/tank_dispenser/oxygen, -/turf/open/floor/iron, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, /area/shuttle/escape) "Ao" = ( /obj/effect/turf_decal/siding/thinplating_new, /obj/effect/turf_decal/siding/thinplating_new{ dir = 1 }, -/turf/open/floor/iron, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, +/area/shuttle/escape) +"Bo" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, /area/shuttle/escape) "BN" = ( /obj/machinery/computer/security{ @@ -562,14 +680,27 @@ /obj/effect/turf_decal/siding/thinplating_new{ dir = 8 }, +/obj/machinery/status_display/evac/directional/east, +/obj/machinery/light{ + dir = 4 + }, /turf/open/floor/iron/tech/grid, /area/shuttle/escape) +"Ck" = ( +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet/directional/south, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, +/area/shuttle/escape) "Dd" = ( /obj/machinery/door/airlock/titanium{ name = "Emergency Shuttle Cargo" }, /obj/machinery/door/firedoor, -/turf/open/floor/mineral/titanium/yellow, +/obj/effect/turf_decal/stripes/closeup, +/turf/open/floor/iron, /area/shuttle/escape) "FC" = ( /obj/structure/chair/fancy/shuttle, @@ -582,11 +713,23 @@ req_access_txt = "2" }, /obj/structure/fans/tiny, -/turf/open/floor/mineral/plastitanium/red/brig, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/shuttle/escape) +"GK" = ( +/obj/item/radio/intercom/directional/north, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 + }, +/turf/open/floor/iron/edge, /area/shuttle/escape) "HD" = ( -/obj/effect/turf_decal/guideline/guideline_edge/blue, -/turf/open/floor/iron/white, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/turf/open/floor/iron/white/smooth_edge, /area/shuttle/escape) "IL" = ( /obj/machinery/door/firedoor, @@ -594,16 +737,19 @@ name = "Cockpit"; req_access_txt = "19" }, +/obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron, /area/shuttle/escape) "JT" = ( +/obj/structure/extinguisher_cabinet/directional/south, /obj/structure/chair/fancy/shuttle{ - dir = 8 + dir = 1 }, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "JW" = ( /obj/effect/spawner/structure/window/shuttle, +/obj/machinery/door/firedoor/window, /turf/open/floor/plating, /area/shuttle/escape) "Km" = ( @@ -614,7 +760,10 @@ name = "Box emergency shuttle" }, /obj/structure/fans/tiny, -/turf/open/floor/plating, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/turf/open/floor/iron/white, /area/shuttle/escape) "KS" = ( /obj/structure/chair/fancy/shuttle{ @@ -624,6 +773,7 @@ /obj/machinery/light{ dir = 4 }, +/obj/machinery/status_display/ai/directional/east, /turf/open/floor/iron/techmaint, /area/shuttle/escape) "Lm" = ( @@ -631,14 +781,17 @@ name = "Emergency Shuttle Infirmary" }, /obj/machinery/door/firedoor, -/obj/effect/turf_decal/guideline/guideline_edge/blue{ - dir = 4 - }, -/obj/effect/turf_decal/guideline/guideline_edge/blue{ - dir = 8 +/obj/effect/turf_decal/stripes/closeup, +/turf/open/floor/iron, +/area/shuttle/escape) +"Lr" = ( +/obj/machinery/flasher{ + id = "cockpit_flasher"; + pixel_x = -25; + pixel_y = 25 }, -/obj/effect/turf_decal/caution/stand_clear, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, /area/shuttle/escape) "Np" = ( /obj/item/storage/firstaid/regular{ @@ -652,32 +805,29 @@ /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 }, +/obj/machinery/camera/directional/west, /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 +"Od" = ( +/obj/effect/turf_decal/trimline/yellow/filled/warning{ + dir = 1 }, -/obj/effect/turf_decal/guideline/guideline_tri/blue{ +/turf/open/floor/iron/edge, +/area/shuttle/escape) +"OC" = ( +/obj/effect/turf_decal/siding/thinplating_new, +/obj/structure/extinguisher_cabinet/directional/north, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, +/area/shuttle/escape) +"Pt" = ( +/obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 1 }, -/turf/open/floor/iron/white, +/turf/open/floor/iron/white/smooth_edge, /area/shuttle/escape) "PC" = ( /obj/effect/turf_decal/siding/thinplating_new/corner{ @@ -686,7 +836,8 @@ /obj/effect/turf_decal/siding/thinplating_new{ dir = 1 }, -/turf/open/floor/iron, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, /area/shuttle/escape) "RE" = ( /obj/structure/chair/fancy/shuttle{ @@ -706,14 +857,16 @@ /obj/effect/turf_decal/siding/thinplating_new/corner{ dir = 1 }, -/turf/open/floor/iron, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, /area/shuttle/escape) "UI" = ( /obj/machinery/door/airlock/security/glass{ name = "Brig"; req_access_txt = "2" }, -/turf/open/floor/mineral/plastitanium/red/brig, +/obj/effect/turf_decal/stripes/closeup, +/turf/open/floor/iron, /area/shuttle/escape) "US" = ( /obj/machinery/door/firedoor, @@ -721,22 +874,35 @@ name = "Brig"; req_access_txt = "2" }, -/turf/open/floor/mineral/plastitanium/red/brig, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/turf/open/floor/iron, /area/shuttle/escape) "Vh" = ( /obj/structure/table, /obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron/techmaint, /area/shuttle/escape) -"XC" = ( -/obj/effect/turf_decal/guideline/guideline_edge_alt/blue{ +"VE" = ( +/obj/machinery/ai_slipper, +/turf/open/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) +"VF" = ( +/obj/structure/closet, +/obj/effect/turf_decal/trimline/yellow/filled/line, +/turf/open/floor/iron/edge{ dir = 1 }, -/obj/effect/turf_decal/guideline/guideline_half_edge/blue{ - dir = 5 +/area/shuttle/escape) +"XC" = ( +/obj/structure/table, +/obj/item/storage/backpack/duffelbag/med/surgery{ + pixel_y = 7 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 9 }, -/obj/effect/turf_decal/guideline/guideline_half_edge/blue, -/obj/effect/turf_decal/box, /turf/open/floor/iron/white, /area/shuttle/escape) @@ -781,10 +947,10 @@ qi ai ai ai -ai +uh bo ad -bb +iS bq bf ad @@ -797,21 +963,21 @@ jX al ad FC -aG +ij aG aG UI aQ aC aC -aC +bG aC aC aW ad +GK bb -bb -bf +VF bi bk "} @@ -823,10 +989,10 @@ at ad aA aG -aG +VE aJ ad -au +bn aS aS aS @@ -834,8 +1000,8 @@ aS aS aK Dd -bb -bb +Od +bz bg bi bk @@ -843,35 +1009,35 @@ bk (5,1,1) = {" JW tF -ag +rD wq ad -aA -JT +lm +aG aG JT ad -bn +OC aT aT aT aT aT -aK +Ck ad bc br -bg +nN bi bk "} (6,1,1) = {" -ad +JW ar ag qO ad -JW +ad JW US JW @@ -879,7 +1045,7 @@ bj ah aC aC -aC +jw aC aC bp @@ -893,11 +1059,11 @@ bk (7,1,1) = {" JW tF -ag +yh ag IL -ag -ag +Lr +Bo bn ao aM @@ -919,7 +1085,7 @@ bk JW Np ai -ai +lc ad yM bm @@ -954,13 +1120,13 @@ af es aC aC -aC +bG aC aC TU JW HD -ga +wF aq bi bk @@ -974,16 +1140,16 @@ ad aM aE bl -ag +Bo an aR KS am am am -am +vj ds -JW +ad aB be bd diff --git a/_maps/shuttles/emergency/emergency_delta.dmm b/_maps/shuttles/emergency/emergency_delta.dmm index 1fb7c30b9f8b2..c9fb559b3fd38 100644 --- a/_maps/shuttles/emergency/emergency_delta.dmm +++ b/_maps/shuttles/emergency/emergency_delta.dmm @@ -865,6 +865,11 @@ pixel_x = 16; pixel_y = -16 }, +/obj/effect/turf_decal/box/corners{ + dir = 1; + pixel_x = 16; + pixel_y = -16 + }, /turf/open/floor/iron/white/smooth_corner{ dir = 1 }, @@ -941,6 +946,10 @@ /obj/effect/turf_decal/tile/blue/anticorner{ dir = 1 }, +/obj/effect/turf_decal/box/corners{ + pixel_x = -16; + pixel_y = 16 + }, /turf/open/floor/iron/white/smooth_corner, /area/shuttle/escape) "uA" = ( @@ -956,6 +965,11 @@ /obj/effect/turf_decal/tile/blue/anticorner{ dir = 8 }, +/obj/effect/turf_decal/box/corners{ + dir = 4; + pixel_x = -16; + pixel_y = -16 + }, /turf/open/floor/iron/white/smooth_corner{ dir = 4 }, @@ -966,6 +980,7 @@ dir = 10 }, /obj/machinery/vending/wallmed/directional/south, +/obj/effect/turf_decal/bot, /turf/open/floor/iron/white, /area/shuttle/escape) "vA" = ( @@ -1026,6 +1041,7 @@ /area/shuttle/escape) "xX" = ( /obj/machinery/holopad, +/obj/effect/turf_decal/box, /turf/open/floor/carpet/blue, /area/shuttle/escape) "zd" = ( @@ -1094,6 +1110,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 }, +/obj/effect/turf_decal/bot, /turf/open/floor/iron/white/smooth_edge, /area/shuttle/escape) "Ay" = ( @@ -1139,6 +1156,7 @@ /area/shuttle/escape) "CS" = ( /obj/machinery/holopad, +/obj/effect/turf_decal/box, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "Dx" = ( @@ -1299,6 +1317,7 @@ "Hv" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/holopad, +/obj/effect/turf_decal/box, /turf/open/floor/iron/large, /area/shuttle/escape) "Hz" = ( @@ -1333,6 +1352,7 @@ dir = 6 }, /obj/item/radio/intercom/directional/east, +/obj/effect/turf_decal/bot, /turf/open/floor/iron/white, /area/shuttle/escape) "Kr" = ( @@ -1607,6 +1627,11 @@ /obj/effect/turf_decal/tile/blue/anticorner{ dir = 4 }, +/obj/effect/turf_decal/box/corners{ + pixel_y = 16; + dir = 8; + pixel_x = 16 + }, /turf/open/floor/iron/white/smooth_corner{ dir = 8 }, @@ -1906,6 +1931,7 @@ }, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/holopad, +/obj/effect/turf_decal/box, /turf/open/floor/iron/large, /area/shuttle/escape) "Yt" = ( diff --git a/_maps/shuttles/emergency/emergency_meta.dmm b/_maps/shuttles/emergency/emergency_meta.dmm index 9324c642199d0..dde100bd7d350 100644 --- a/_maps/shuttles/emergency/emergency_meta.dmm +++ b/_maps/shuttles/emergency/emergency_meta.dmm @@ -71,6 +71,7 @@ "as" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/holopad, +/obj/effect/turf_decal/box, /turf/open/floor/iron, /area/shuttle/escape) "at" = ( @@ -228,6 +229,7 @@ /area/shuttle/escape) "aR" = ( /obj/machinery/holopad, +/obj/effect/turf_decal/box, /turf/open/floor/carpet/blue, /area/shuttle/escape) "aS" = ( @@ -279,7 +281,7 @@ /area/shuttle/escape) "bj" = ( /obj/machinery/stasis, -/obj/effect/turf_decal/box, +/obj/effect/turf_decal/bot, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "bk" = ( @@ -339,6 +341,10 @@ /obj/effect/turf_decal/tile/blue/anticorner{ dir = 1 }, +/obj/effect/turf_decal/box/corners{ + pixel_x = -16; + pixel_y = 16 + }, /turf/open/floor/iron/white/smooth_corner, /area/shuttle/escape) "bw" = ( @@ -669,6 +675,7 @@ /area/shuttle/escape) "cl" = ( /obj/machinery/holopad, +/obj/effect/turf_decal/box, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "cO" = ( @@ -679,6 +686,11 @@ /obj/effect/turf_decal/siding/thinplating_new/light{ dir = 8 }, +/obj/item/storage/firstaid/regular{ + pixel_x = 2; + pixel_y = 3 + }, +/obj/item/storage/firstaid/fire, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "dy" = ( @@ -711,6 +723,7 @@ /area/shuttle/escape) "fb" = ( /obj/machinery/holopad, +/obj/effect/turf_decal/box, /turf/open/floor/iron/dark, /area/shuttle/escape) "fi" = ( @@ -754,6 +767,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/orange/hidden, +/obj/machinery/ai_slipper, /turf/open/floor/iron, /area/shuttle/escape) "ig" = ( @@ -772,6 +786,11 @@ /obj/effect/turf_decal/tile/blue/anticorner{ dir = 4 }, +/obj/effect/turf_decal/box/corners{ + pixel_y = 16; + dir = 8; + pixel_x = 16 + }, /turf/open/floor/iron/white/smooth_corner{ dir = 8 }, @@ -876,6 +895,11 @@ pixel_x = 16; pixel_y = -16 }, +/obj/effect/turf_decal/box/corners{ + dir = 1; + pixel_x = 16; + pixel_y = -16 + }, /turf/open/floor/iron/white/smooth_corner{ dir = 1 }, @@ -884,6 +908,11 @@ /obj/effect/turf_decal/tile/blue/anticorner{ dir = 8 }, +/obj/effect/turf_decal/box/corners{ + dir = 4; + pixel_x = -16; + pixel_y = -16 + }, /turf/open/floor/iron/white/smooth_corner{ dir = 4 }, @@ -972,15 +1001,12 @@ /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 }, +/obj/machinery/computer/crew{ + dir = 1 + }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "EG" = ( @@ -1037,7 +1063,7 @@ dir = 1 }, /obj/item/radio/intercom/directional/west, -/obj/machinery/computer/crew{ +/obj/machinery/computer/operating{ dir = 4 }, /turf/open/floor/mineral/titanium/blue, diff --git a/_maps/shuttles/emergency/emergency_tiny.dmm b/_maps/shuttles/emergency/emergency_tiny.dmm index 98f3d414ae195..8ad47943f35d3 100644 --- a/_maps/shuttles/emergency/emergency_tiny.dmm +++ b/_maps/shuttles/emergency/emergency_tiny.dmm @@ -32,10 +32,6 @@ "bV" = ( /obj/structure/chair/fancy/shuttle, /obj/effect/turf_decal/bot, -/obj/structure/extinguisher_cabinet{ - pixel_x = -31; - pixel_y = -1 - }, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "ci" = ( @@ -163,6 +159,7 @@ /area/shuttle/escape) "nQ" = ( /obj/machinery/holopad, +/obj/effect/turf_decal/box, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "ou" = ( @@ -175,6 +172,10 @@ /obj/structure/sign/departments/medbay/alt{ pixel_x = 32 }, +/obj/effect/turf_decal/box/corners{ + pixel_x = -16; + pixel_y = 16 + }, /turf/open/floor/mineral/titanium/white, /area/shuttle/escape) "pJ" = ( @@ -226,6 +227,7 @@ pixel_y = -32 }, /obj/machinery/holopad, +/obj/effect/turf_decal/box, /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) "sf" = ( @@ -239,6 +241,17 @@ /obj/item/radio/intercom/directional/north, /turf/open/floor/noslip/dark, /area/shuttle/escape) +"sp" = ( +/obj/effect/turf_decal/trimline/dark/warning{ + dir = 4 + }, +/obj/effect/turf_decal/box/corners{ + dir = 4; + pixel_x = -16; + pixel_y = -16 + }, +/turf/open/floor/mineral/titanium/white, +/area/shuttle/escape) "sv" = ( /obj/effect/turf_decal/trimline/dark/warning{ dir = 4 @@ -254,12 +267,12 @@ /turf/open/floor/plating, /area/shuttle/escape) "tn" = ( +/obj/machinery/ai_slipper, /obj/machinery/button/flasher{ - id = "tinyflash"; - pixel_x = 26; + id = "cockpit_flasher"; + pixel_x = 25; pixel_y = -25 }, -/obj/machinery/ai_slipper, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "tQ" = ( @@ -510,6 +523,17 @@ }, /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) +"JM" = ( +/obj/effect/turf_decal/trimline/dark/warning{ + dir = 8 + }, +/obj/machinery/flasher{ + id = "cockpit_flasher"; + pixel_x = 25; + pixel_y = 25 + }, +/turf/open/floor/mineral/titanium/white, +/area/shuttle/escape) "KD" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -594,6 +618,15 @@ /obj/effect/turf_decal/bot, /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) +"Pv" = ( +/obj/effect/turf_decal/trimline/dark/warning, +/obj/effect/turf_decal/box/corners{ + pixel_y = 16; + dir = 8; + pixel_x = 16 + }, +/turf/open/floor/mineral/titanium/white, +/area/shuttle/escape) "QG" = ( /obj/machinery/door/airlock/medical/glass{ name = "Shuttle Infirmary" @@ -619,10 +652,6 @@ /turf/open/floor/grass/no_border, /area/shuttle/escape) "Sm" = ( -/obj/machinery/flasher{ - id = "tinyflash"; - pixel_y = 27 - }, /obj/effect/turf_decal/stripes/line{ dir = 10 }, @@ -631,6 +660,10 @@ /obj/structure/closet/firecloset/full, /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) +"TD" = ( +/obj/structure/reagent_dispensers/peppertank/directional/north, +/turf/open/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) "TL" = ( /obj/effect/turf_decal/stripes/closeup{ dir = 1 @@ -677,6 +710,11 @@ pixel_x = 16; pixel_y = -16 }, +/obj/effect/turf_decal/box/corners{ + dir = 1; + pixel_x = 16; + pixel_y = -16 + }, /turf/open/floor/mineral/titanium/white, /area/shuttle/escape) @@ -701,7 +739,7 @@ xX (2,1,1) = {" wR wR -UW +TD ac nL Ix @@ -740,11 +778,11 @@ yf UW tn in -gy +JM bR gy Ze -gg +Pv Lv QY BB @@ -761,7 +799,7 @@ wR Sm qq qq -qq +sp ou sv sv From 0ee5aa93eb5fcaed7cc98c7ee884e810a0e4612c Mon Sep 17 00:00:00 2001 From: Markus Date: Fri, 27 Sep 2024 13:10:45 +0200 Subject: [PATCH 06/13] finished part 2 --- .../shuttles/emergency/emergency_asteroid.dmm | 24 +- .../shuttles/emergency/emergency_birdboat.dmm | 361 ++++++++++++++---- _maps/shuttles/emergency/emergency_box.dmm | 13 +- _maps/shuttles/emergency/emergency_delta.dmm | 6 +- _maps/shuttles/emergency/emergency_meta.dmm | 8 +- 5 files changed, 308 insertions(+), 104 deletions(-) diff --git a/_maps/shuttles/emergency/emergency_asteroid.dmm b/_maps/shuttles/emergency/emergency_asteroid.dmm index 1bf8b084ed9b9..6ac117d297315 100644 --- a/_maps/shuttles/emergency/emergency_asteroid.dmm +++ b/_maps/shuttles/emergency/emergency_asteroid.dmm @@ -166,7 +166,6 @@ }, /area/shuttle/escape) "aT" = ( -/obj/structure/chair/fancy/shuttle, /obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 1 }, @@ -174,23 +173,24 @@ /obj/machinery/light{ dir = 1 }, +/obj/structure/chair/fancy/corp, /turf/open/floor/carpet/blue, /area/shuttle/escape) "aU" = ( -/obj/structure/chair/fancy/shuttle, /obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 1 }, /obj/effect/turf_decal/siding/thinplating_new/dark, +/obj/structure/chair/fancy/corp, /turf/open/floor/carpet/blue, /area/shuttle/escape) "aV" = ( -/obj/structure/chair/fancy/shuttle, /obj/item/radio/intercom/directional/north, /obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 1 }, /obj/effect/turf_decal/siding/thinplating_new/dark, +/obj/structure/chair/fancy/corp, /turf/open/floor/carpet/blue, /area/shuttle/escape) "aW" = ( @@ -264,9 +264,6 @@ /turf/open/floor/iron/large, /area/shuttle/escape) "bk" = ( -/obj/structure/chair/fancy/shuttle{ - dir = 1 - }, /obj/machinery/camera/directional/south, /obj/effect/turf_decal/siding/thinplating_new/dark, /obj/effect/turf_decal/siding/thinplating_new/dark{ @@ -274,27 +271,30 @@ }, /obj/machinery/newscaster/directional/south, /obj/machinery/light, +/obj/structure/chair/fancy/corp{ + dir = 1 + }, /turf/open/floor/carpet/blue, /area/shuttle/escape) "bl" = ( -/obj/structure/chair/fancy/shuttle{ - dir = 1 - }, /obj/effect/turf_decal/siding/thinplating_new/dark, /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) "bm" = ( -/obj/structure/chair/fancy/shuttle{ - dir = 1 - }, /obj/effect/turf_decal/siding/thinplating_new/dark, /obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 1 }, /obj/structure/extinguisher_cabinet/directional/south, +/obj/structure/chair/fancy/corp{ + dir = 1 + }, /turf/open/floor/carpet/blue, /area/shuttle/escape) "bn" = ( diff --git a/_maps/shuttles/emergency/emergency_birdboat.dmm b/_maps/shuttles/emergency/emergency_birdboat.dmm index 17cfb117d974c..2980550ae6cf2 100644 --- a/_maps/shuttles/emergency/emergency_birdboat.dmm +++ b/_maps/shuttles/emergency/emergency_birdboat.dmm @@ -56,13 +56,17 @@ "aq" = ( /obj/machinery/computer/crew, /obj/item/radio/intercom/directional/west, -/turf/open/floor/mineral/titanium/blue, +/obj/machinery/newscaster/directional/north, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark/side, /area/shuttle/escape) "ar" = ( -/obj/structure/chair/fancy/shuttle{ +/obj/structure/chair/fancy/corp{ dir = 8 }, -/turf/open/floor/mineral/titanium, +/turf/open/floor/carpet/blue, /area/shuttle/escape) "at" = ( /turf/open/floor/mineral/plastitanium/red/brig, @@ -77,7 +81,13 @@ /obj/machinery/computer/communications{ dir = 1 }, -/turf/open/floor/mineral/titanium/blue, +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + alpha = 180; + dir = 8 + }, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, /area/shuttle/escape) "aw" = ( /obj/structure/closet/crate/bin, @@ -92,22 +102,30 @@ /obj/item/kirbyplants{ icon_state = "plant-21" }, -/turf/open/floor/mineral/titanium, +/obj/effect/turf_decal/siding/thinplating_new, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, /area/shuttle/escape) "aC" = ( -/turf/open/floor/mineral/titanium, +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, /area/shuttle/escape) "aE" = ( /obj/structure/chair/fancy/shuttle{ dir = 4 }, -/turf/open/floor/mineral/plastitanium, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/iron/techmaint, /area/shuttle/escape) "aH" = ( /obj/structure/chair/fancy/shuttle{ dir = 8 }, -/turf/open/floor/mineral/plastitanium, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/iron/techmaint, /area/shuttle/escape) "aI" = ( /obj/structure/table, @@ -116,30 +134,32 @@ pixel_x = 4; pixel_y = 7 }, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/iron/techmaint, /area/shuttle/escape) "aL" = ( /obj/structure/table, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/iron/techmaint, /area/shuttle/escape) "aM" = ( /obj/structure/table, /obj/item/food/chocolatebar, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/iron/techmaint, /area/shuttle/escape) "aN" = ( /obj/structure/chair/fancy/shuttle{ dir = 1 }, /obj/structure/window/reinforced, -/turf/open/floor/mineral/plastitanium, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/iron/techmaint, /area/shuttle/escape) "aP" = ( /obj/structure/chair/fancy/shuttle, /obj/structure/window/reinforced{ dir = 1 }, -/turf/open/floor/mineral/plastitanium, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/iron/techmaint, /area/shuttle/escape) "aR" = ( /obj/structure/extinguisher_cabinet/directional/north, @@ -152,7 +172,8 @@ /obj/structure/chair/fancy/shuttle{ dir = 1 }, -/turf/open/floor/mineral/plastitanium, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/iron/techmaint, /area/shuttle/escape) "aT" = ( /obj/machinery/light, @@ -160,7 +181,9 @@ dir = 1 }, /obj/structure/extinguisher_cabinet/directional/south, -/turf/open/floor/mineral/plastitanium, +/obj/machinery/camera/directional/south, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/iron/techmaint, /area/shuttle/escape) "aU" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -173,7 +196,12 @@ "aV" = ( /obj/machinery/vending/cigarette, /obj/effect/turf_decal/bot, -/turf/open/floor/mineral/titanium, +/obj/machinery/newscaster/directional/south, +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, /area/shuttle/escape) "aX" = ( /obj/machinery/stasis, @@ -195,7 +223,11 @@ /area/shuttle/escape) "bS" = ( /obj/structure/chair/fancy/shuttle, -/turf/open/floor/mineral/plastitanium, +/obj/structure/sign/nanotrasen{ + pixel_y = 32 + }, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/iron/techmaint, /area/shuttle/escape) "cM" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -206,12 +238,34 @@ }, /turf/open/floor/iron/edge, /area/shuttle/escape) +"do" = ( +/obj/effect/turf_decal/siding/thinplating_new, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, +/area/shuttle/escape) +"dy" = ( +/obj/effect/turf_decal/siding/thinplating_new, +/obj/effect/turf_decal/siding/thinplating_new/corner{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, +/area/shuttle/escape) "eF" = ( /obj/effect/turf_decal/trimline/neutral/filled/warning{ dir = 1 }, /turf/open/floor/iron/edge, /area/shuttle/escape) +"gr" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark/corner{ + dir = 8 + }, +/obj/structure/chair/fancy/corp{ + dir = 4 + }, +/turf/open/floor/carpet/blue, +/area/shuttle/escape) "ho" = ( /obj/machinery/door/airlock/security/glass{ name = "security Airlock"; @@ -224,7 +278,8 @@ "hK" = ( /obj/machinery/vending/sustenance, /obj/effect/turf_decal/bot, -/turf/open/floor/mineral/titanium, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, /area/shuttle/escape) "im" = ( /obj/machinery/computer/secure_data{ @@ -235,7 +290,9 @@ "ip" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box, -/turf/open/floor/mineral/titanium, +/obj/effect/turf_decal/siding/thinplating_new/corner, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, /area/shuttle/escape) "iH" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -256,7 +313,10 @@ pixel_x = 25; pixel_y = -25 }, -/turf/open/floor/mineral/titanium, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 8 + }, +/turf/open/floor/carpet/blue, /area/shuttle/escape) "jP" = ( /mob/living/simple_animal/bot/medbot{ @@ -288,6 +348,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 10 }, +/obj/machinery/newscaster/directional/west, /turf/open/floor/iron/white, /area/shuttle/escape) "lL" = ( @@ -301,12 +362,27 @@ dir = 8 }, /area/shuttle/escape) +"lX" = ( +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, +/area/shuttle/escape) "mk" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 10 }, /turf/open/floor/iron, /area/shuttle/escape) +"mB" = ( +/obj/effect/turf_decal/siding/thinplating_new, +/obj/effect/turf_decal/siding/thinplating_new/corner{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, +/area/shuttle/escape) "mM" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 5 @@ -314,8 +390,12 @@ /turf/open/floor/iron, /area/shuttle/escape) "oq" = ( -/obj/structure/chair/fancy/shuttle, -/turf/open/floor/mineral/titanium/blue, +/obj/effect/turf_decal/siding/thinplating_new/dark, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 1 + }, +/obj/structure/chair/fancy/corp, +/turf/open/floor/carpet/blue, /area/shuttle/escape) "ow" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -325,14 +405,35 @@ dir = 4 }, /area/shuttle/escape) +"oZ" = ( +/obj/structure/chair/fancy/shuttle{ + dir = 1 + }, +/obj/structure/window/reinforced, +/obj/machinery/newscaster/directional/east, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/iron/techmaint, +/area/shuttle/escape) +"pl" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/box, +/obj/effect/turf_decal/siding/thinplating_new/dark/corner{ + dir = 8 + }, +/turf/open/floor/carpet/blue, +/area/shuttle/escape) "ra" = ( /obj/machinery/ai_slipper, -/turf/open/floor/mineral/titanium, +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, /area/shuttle/escape) "ru" = ( /obj/machinery/firealarm/directional/east, /obj/machinery/camera/directional/east, -/turf/open/floor/mineral/titanium, +/turf/open/floor/carpet/blue, /area/shuttle/escape) "st" = ( /obj/effect/turf_decal/trimline/neutral/filled/warning, @@ -348,13 +449,28 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 6 }, +/obj/machinery/newscaster/directional/south, /turf/open/floor/iron, /area/shuttle/escape) "ta" = ( /obj/machinery/light{ dir = 1 }, -/turf/open/floor/mineral/titanium, +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, +/area/shuttle/escape) +"tw" = ( +/obj/effect/turf_decal/siding/thinplating_new/corner, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, +/area/shuttle/escape) +"uy" = ( +/obj/structure/chair/fancy/shuttle, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/iron/techmaint, /area/shuttle/escape) "uP" = ( /obj/effect/turf_decal/tile/blue/fourcorners, @@ -370,13 +486,17 @@ "vv" = ( /obj/structure/chair/fancy/shuttle, /obj/machinery/camera/directional/north, -/turf/open/floor/mineral/plastitanium, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/iron/techmaint, /area/shuttle/escape) "vW" = ( -/obj/structure/chair/fancy/shuttle{ +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 8 + }, +/obj/structure/chair/fancy/corp{ dir = 4 }, -/turf/open/floor/mineral/titanium, +/turf/open/floor/carpet/blue, /area/shuttle/escape) "wJ" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -405,18 +525,33 @@ dir = 1 }, /obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/newscaster/directional/south, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "zf" = ( /obj/structure/table, -/turf/open/floor/mineral/titanium, +/obj/machinery/recharger, +/obj/item/storage/fancy/donut_box, +/turf/open/floor/carpet/blue, /area/shuttle/escape) "zs" = ( /obj/item/kirbyplants{ icon_state = "plant-21" }, /obj/item/radio/intercom/directional/west, -/turf/open/floor/mineral/titanium, +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, +/area/shuttle/escape) +"zG" = ( +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating_new, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, /area/shuttle/escape) "AT" = ( /obj/structure/chair/fancy/shuttle, @@ -429,6 +564,14 @@ }, /turf/open/floor/iron/white/smooth_edge, /area/shuttle/escape) +"Cy" = ( +/obj/machinery/ai_slipper, +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, +/area/shuttle/escape) "DU" = ( /obj/structure/closet/firecloset, /obj/effect/turf_decal/bot, @@ -436,6 +579,7 @@ dir = 9 }, /obj/machinery/camera/directional/north, +/obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron, /area/shuttle/escape) "Eg" = ( @@ -446,6 +590,13 @@ }, /turf/open/floor/iron/edge, /area/shuttle/escape) +"Em" = ( +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, +/area/shuttle/escape) "EQ" = ( /obj/structure/chair/fancy/shuttle{ dir = 1 @@ -467,6 +618,13 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/large, /area/shuttle/escape) +"Hx" = ( +/obj/effect/turf_decal/siding/thinplating_new/corner{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, +/area/shuttle/escape) "Hy" = ( /obj/machinery/computer/crew{ dir = 4 @@ -479,17 +637,52 @@ /area/shuttle/escape) "HU" = ( /obj/item/radio/intercom/directional/east, -/turf/open/floor/mineral/titanium, +/obj/effect/turf_decal/siding/thinplating_new, +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, +/area/shuttle/escape) +"II" = ( +/obj/effect/turf_decal/siding/thinplating_new, +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, +/area/shuttle/escape) +"Jj" = ( +/obj/effect/turf_decal/siding/thinplating_new/corner{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, /area/shuttle/escape) "Ke" = ( /obj/structure/table, -/obj/item/storage/fancy/donut_box, -/turf/open/floor/mineral/titanium, +/obj/item/paper_bin, +/obj/item/pen, +/obj/item/folder/blue, +/turf/open/floor/carpet/blue, +/area/shuttle/escape) +"Ki" = ( +/obj/machinery/ai_slipper, +/obj/effect/turf_decal/siding/thinplating_new/dark, +/obj/effect/turf_decal/siding/thinplating_new/dark/corner{ + dir = 1 + }, +/turf/open/floor/carpet/blue, /area/shuttle/escape) "Kr" = ( /obj/structure/table, /obj/structure/extinguisher_cabinet/directional/west, -/turf/open/floor/mineral/plastitanium, +/obj/item/bikehorn/rubberducky{ + pixel_y = 6; + pixel_x = 4 + }, +/obj/item/origami/paperboat, +/turf/open/floor/iron/techmaint, /area/shuttle/escape) "KB" = ( /obj/machinery/flasher{ @@ -497,12 +690,20 @@ pixel_x = 25; pixel_y = 25 }, -/turf/open/floor/mineral/titanium, +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, /area/shuttle/escape) "KP" = ( /obj/structure/closet/crate/bin, /obj/effect/turf_decal/bot, -/turf/open/floor/mineral/titanium, +/obj/effect/turf_decal/siding/thinplating_new/corner{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, /area/shuttle/escape) "Lz" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -537,7 +738,7 @@ /obj/item/kirbyplants{ icon_state = "plant-22" }, -/turf/open/floor/mineral/titanium, +/turf/open/floor/carpet/blue, /area/shuttle/escape) "MN" = ( /obj/effect/spawner/structure/window/shuttle, @@ -601,11 +802,11 @@ /obj/machinery/light{ dir = 4 }, -/obj/structure/chair/fancy/shuttle{ +/obj/structure/extinguisher_cabinet/directional/east, +/obj/structure/chair/fancy/corp{ dir = 8 }, -/obj/structure/extinguisher_cabinet/directional/east, -/turf/open/floor/mineral/titanium, +/turf/open/floor/carpet/blue, /area/shuttle/escape) "RD" = ( /obj/machinery/door/airlock/command/glass{ @@ -639,7 +840,13 @@ /obj/machinery/computer/emergency_shuttle{ dir = 1 }, -/turf/open/floor/mineral/titanium/blue, +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + alpha = 180; + dir = 8 + }, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, /area/shuttle/escape) "Vg" = ( /obj/effect/spawner/structure/window/shuttle, @@ -653,6 +860,18 @@ }, /turf/open/floor/iron, /area/shuttle/escape) +"YS" = ( +/obj/effect/turf_decal/siding/thinplating_new, +/obj/effect/turf_decal/siding/thinplating_new/corner{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, +/area/shuttle/escape) +"YT" = ( +/obj/structure/sign/nanotrasen, +/turf/closed/wall/mineral/titanium, +/area/shuttle/escape) "YX" = ( /obj/item/radio/intercom/directional/south, /obj/effect/turf_decal/trimline/yellow/filled/line, @@ -717,15 +936,15 @@ aa (3,1,1) = {" aa ab +gr vW -vW -ra +Ki av MN -bS +uy aL aS -aC +zG aS ab aa @@ -735,13 +954,13 @@ aa MN zf Ke -ip +pl jD RD KB aC ra -aC +YS aS MN aa @@ -755,9 +974,9 @@ ru MM ab ta -aC -aC -aC +Em +Hx +do aS MN aa @@ -772,8 +991,8 @@ MN ah aE aM -aC -aC +lX +mB aT ah ab @@ -788,8 +1007,8 @@ aB Kr aL aI -aC -aC +lX +GP aC hK ab @@ -804,9 +1023,9 @@ KP aC aC aC -aC -aC -aC +Jj +tw +Em aV ab "} @@ -816,12 +1035,12 @@ al at at ho -aC -aC +Em +Hx ip -aC -ra -aC +Em +Cy +dy aE aE MN @@ -832,12 +1051,12 @@ al vj EQ MN -bS -aC -aC +uy +lX +do aN aP -aC +II aL aL MN @@ -849,9 +1068,9 @@ Nl xV ab vv -aC -aC -aN +lX +do +oZ aP HU aH @@ -959,12 +1178,12 @@ ab ag ap au -ab +YT ab Ti Mg ab -ab +YT ag ap au diff --git a/_maps/shuttles/emergency/emergency_box.dmm b/_maps/shuttles/emergency/emergency_box.dmm index ac3bffd123722..288686f1880c7 100644 --- a/_maps/shuttles/emergency/emergency_box.dmm +++ b/_maps/shuttles/emergency/emergency_box.dmm @@ -839,17 +839,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/large, /area/shuttle/escape) -"RE" = ( -/obj/structure/chair/fancy/shuttle{ - dir = 4 - }, -/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) "TU" = ( /obj/effect/turf_decal/siding/thinplating_new/corner{ dir = 4 @@ -1093,7 +1082,7 @@ mU ao aM Ao -RE +aT aT aT aT diff --git a/_maps/shuttles/emergency/emergency_delta.dmm b/_maps/shuttles/emergency/emergency_delta.dmm index c9fb559b3fd38..243951873ac64 100644 --- a/_maps/shuttles/emergency/emergency_delta.dmm +++ b/_maps/shuttles/emergency/emergency_delta.dmm @@ -822,8 +822,7 @@ /obj/machinery/computer/crew{ dir = 1 }, -/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ - alpha = 180; +/obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, /turf/open/floor/iron/dark/side{ @@ -1902,8 +1901,7 @@ /obj/machinery/computer/med_data{ dir = 1 }, -/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ - alpha = 180; +/obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, /turf/open/floor/iron/dark/side{ diff --git a/_maps/shuttles/emergency/emergency_meta.dmm b/_maps/shuttles/emergency/emergency_meta.dmm index dde100bd7d350..b9dc488d1bd6d 100644 --- a/_maps/shuttles/emergency/emergency_meta.dmm +++ b/_maps/shuttles/emergency/emergency_meta.dmm @@ -130,7 +130,6 @@ /area/shuttle/escape) "aC" = ( /obj/structure/table, -/obj/item/folder/blue, /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron/dark/side{ dir = 1 @@ -957,11 +956,10 @@ /area/shuttle/escape) "AT" = ( /obj/structure/table, -/obj/item/paper_bin{ - pixel_x = -2; - pixel_y = 8 - }, +/obj/item/paper_bin, /obj/item/radio/intercom/directional/south, +/obj/item/pen, +/obj/item/folder/blue, /turf/open/floor/iron/dark/side{ dir = 1 }, From 65e21d2d029c299a187630090c44f4fd35633298 Mon Sep 17 00:00:00 2001 From: Markus Date: Fri, 27 Sep 2024 13:22:25 +0200 Subject: [PATCH 07/13] finished part 3!1!! --- .../shuttles/emergency/emergency_birdboat.dmm | 41 +++++++++++-------- _maps/shuttles/emergency/emergency_meta.dmm | 25 +++++++++-- 2 files changed, 44 insertions(+), 22 deletions(-) diff --git a/_maps/shuttles/emergency/emergency_birdboat.dmm b/_maps/shuttles/emergency/emergency_birdboat.dmm index 2980550ae6cf2..a3be0a54e0ce3 100644 --- a/_maps/shuttles/emergency/emergency_birdboat.dmm +++ b/_maps/shuttles/emergency/emergency_birdboat.dmm @@ -26,6 +26,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/blue/filled/line, +/obj/machinery/light, /turf/open/floor/iron/white/smooth_edge{ dir = 1 }, @@ -233,7 +234,7 @@ /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 1 }, -/obj/machinery/light/small{ +/obj/machinery/light{ dir = 1 }, /turf/open/floor/iron/edge, @@ -351,9 +352,6 @@ /obj/machinery/newscaster/directional/west, /turf/open/floor/iron/white, /area/shuttle/escape) -"lL" = ( -/turf/closed/wall/mineral/titanium, -/area/template_noop) "lO" = ( /obj/effect/turf_decal/trimline/neutral/filled/warning{ dir = 4 @@ -435,6 +433,17 @@ /obj/machinery/camera/directional/east, /turf/open/floor/carpet/blue, /area/shuttle/escape) +"rE" = ( +/obj/structure/chair/fancy/shuttle, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/effect/turf_decal/bot_white, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/iron/techmaint, +/area/shuttle/escape) "st" = ( /obj/effect/turf_decal/trimline/neutral/filled/warning, /turf/open/floor/iron/edge{ @@ -779,7 +788,7 @@ /area/shuttle/escape) "PJ" = ( /obj/effect/turf_decal/trimline/neutral/filled/line, -/obj/machinery/light/small, +/obj/machinery/light, /turf/open/floor/iron/edge{ dir = 1 }, @@ -848,11 +857,6 @@ dir = 1 }, /area/shuttle/escape) -"Vg" = ( -/obj/effect/spawner/structure/window/shuttle, -/obj/machinery/door/firedoor/window, -/turf/open/floor/plating, -/area/template_noop) "Yo" = ( /obj/structure/closet/crate, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -875,6 +879,7 @@ "YX" = ( /obj/item/radio/intercom/directional/south, /obj/effect/turf_decal/trimline/yellow/filled/line, +/obj/machinery/light/small, /turf/open/floor/iron/edge{ dir = 1 }, @@ -982,7 +987,7 @@ MN aa "} (6,1,1) = {" -lL +ab ab ab ab @@ -998,7 +1003,7 @@ ah ab "} (7,1,1) = {" -lL +ab Ok im OU @@ -1014,7 +1019,7 @@ hK ab "} (8,1,1) = {" -lL +ab Fg sK at @@ -1030,7 +1035,7 @@ aV ab "} (9,1,1) = {" -Vg +MN al at at @@ -1046,7 +1051,7 @@ aE MN "} (10,1,1) = {" -Vg +MN al vj EQ @@ -1062,7 +1067,7 @@ aL MN "} (11,1,1) = {" -Vg +MN AT Nl xV @@ -1071,14 +1076,14 @@ vv lX do oZ -aP +rE HU aH aH MN "} (12,1,1) = {" -lL +ab ab ab ab diff --git a/_maps/shuttles/emergency/emergency_meta.dmm b/_maps/shuttles/emergency/emergency_meta.dmm index b9dc488d1bd6d..3d03aa9b2c3b2 100644 --- a/_maps/shuttles/emergency/emergency_meta.dmm +++ b/_maps/shuttles/emergency/emergency_meta.dmm @@ -741,6 +741,15 @@ }, /turf/open/floor/catwalk_floor/iron, /area/shuttle/escape) +"fx" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/closet/firecloset, +/obj/effect/turf_decal/box, +/obj/machinery/status_display/ai/directional/west, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/escape) "fH" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/tank/air{ @@ -930,7 +939,7 @@ /obj/structure/chair/fancy/shuttle{ dir = 8 }, -/obj/machinery/status_display/evac/directional/east, +/obj/machinery/status_display/ai/directional/east, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "yL" = ( @@ -1051,6 +1060,14 @@ /obj/machinery/door/firedoor/window, /turf/open/floor/plating, /area/shuttle/escape) +"Ls" = ( +/obj/structure/chair/fancy/shuttle{ + dir = 1 + }, +/obj/effect/turf_decal/bot, +/obj/machinery/status_display/ai/directional/south, +/turf/open/floor/mineral/titanium, +/area/shuttle/escape) "LY" = ( /turf/open/floor/iron/dark/side{ dir = 4 @@ -1120,7 +1137,7 @@ "Rg" = ( /obj/structure/table, /obj/item/storage/firstaid/regular, -/obj/machinery/status_display/evac/directional/east, +/obj/machinery/status_display/ai/directional/east, /turf/open/floor/iron/dark/side, /area/shuttle/escape) "Ro" = ( @@ -1408,7 +1425,7 @@ ad (9,1,1) = {" ad bX -ap +fx Yp Uh Yp @@ -1464,7 +1481,7 @@ bN aI aT ar -bN +Ls ad bs cd From e75c9ca19da66cb82a9f95b2b651275ab3dc4521 Mon Sep 17 00:00:00 2001 From: Markus Date: Fri, 27 Sep 2024 13:24:55 +0200 Subject: [PATCH 08/13] door names fixes --- .../shuttles/emergency/emergency_birdboat.dmm | 48 ++++++++++++++----- _maps/shuttles/emergency/emergency_meta.dmm | 6 +-- 2 files changed, 40 insertions(+), 14 deletions(-) diff --git a/_maps/shuttles/emergency/emergency_birdboat.dmm b/_maps/shuttles/emergency/emergency_birdboat.dmm index a3be0a54e0ce3..bf0f52eb315a7 100644 --- a/_maps/shuttles/emergency/emergency_birdboat.dmm +++ b/_maps/shuttles/emergency/emergency_birdboat.dmm @@ -268,12 +268,12 @@ /turf/open/floor/carpet/blue, /area/shuttle/escape) "ho" = ( -/obj/machinery/door/airlock/security/glass{ - name = "security Airlock"; - req_access_txt = "63" - }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, +/obj/machinery/door/airlock/security/glass{ + name = "Emergency Shuttle Brig"; + req_access_txt = "2" + }, /turf/open/floor/iron, /area/shuttle/escape) "hK" = ( @@ -514,7 +514,9 @@ /turf/open/floor/iron/large, /area/shuttle/escape) "xz" = ( -/obj/machinery/door/airlock/public/glass, +/obj/machinery/door/airlock/public/glass{ + name = "Emergency Shuttle" + }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup{ dir = 1 @@ -627,6 +629,14 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/large, /area/shuttle/escape) +"Hl" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/closeup, +/obj/machinery/door/airlock/titanium{ + name = "Emergency Shuttle Cargo" + }, +/turf/open/floor/iron, +/area/shuttle/escape) "Hx" = ( /obj/effect/turf_decal/siding/thinplating_new/corner{ dir = 4 @@ -721,7 +731,9 @@ /turf/open/floor/iron, /area/shuttle/escape) "Mg" = ( -/obj/machinery/door/airlock/titanium, +/obj/machinery/door/airlock/titanium{ + name = "Emergency Shuttle Airlock" + }, /obj/docking_port/mobile/emergency{ dir = 8; dwidth = 6; @@ -738,9 +750,11 @@ /turf/open/floor/iron/white, /area/shuttle/escape) "Ml" = ( -/obj/machinery/door/airlock/public/glass, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, +/obj/machinery/door/airlock/public/glass{ + name = "Emergency Shuttle Infirmary" + }, /turf/open/floor/iron, /area/shuttle/escape) "MM" = ( @@ -819,13 +833,23 @@ /area/shuttle/escape) "RD" = ( /obj/machinery/door/airlock/command/glass{ - name = "bridge Door"; + name = "Emergency Shuttle Cockpit"; req_access_txt = "19" }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron, /area/shuttle/escape) +"SF" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/obj/machinery/door/airlock/public/glass{ + name = "Emergency Shuttle" + }, +/turf/open/floor/iron, +/area/shuttle/escape) "SQ" = ( /obj/effect/turf_decal/tile/blue/fourcorners, /obj/machinery/ai_slipper, @@ -837,7 +861,9 @@ /turf/open/floor/iron/large, /area/shuttle/escape) "Ti" = ( -/obj/machinery/door/airlock/titanium, +/obj/machinery/door/airlock/titanium{ + name = "Emergency Shuttle Airlock" + }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup{ dir = 1 @@ -1089,7 +1115,7 @@ ab ab ab ab -xz +SF xz ab ab @@ -1135,7 +1161,7 @@ ab ae Tf FV -Ml +Hl eF iH wJ diff --git a/_maps/shuttles/emergency/emergency_meta.dmm b/_maps/shuttles/emergency/emergency_meta.dmm index 3d03aa9b2c3b2..44ac398eccc48 100644 --- a/_maps/shuttles/emergency/emergency_meta.dmm +++ b/_maps/shuttles/emergency/emergency_meta.dmm @@ -1220,11 +1220,11 @@ /turf/open/floor/iron, /area/shuttle/escape) "Xm" = ( -/obj/machinery/door/airlock/titanium{ - name = "Emergency Shuttle Cargo Bay Airlock" - }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, +/obj/machinery/door/airlock/titanium{ + name = "Emergency Shuttle Cargo" + }, /turf/open/floor/iron, /area/shuttle/escape) "Xr" = ( From cbdbcf13acf4019b8c88315b1981c72a4b98f482 Mon Sep 17 00:00:00 2001 From: Markus Date: Fri, 27 Sep 2024 13:28:17 +0200 Subject: [PATCH 09/13] Update emergency_asteroid.dmm --- _maps/shuttles/emergency/emergency_asteroid.dmm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/_maps/shuttles/emergency/emergency_asteroid.dmm b/_maps/shuttles/emergency/emergency_asteroid.dmm index 6ac117d297315..6e8d0de320871 100644 --- a/_maps/shuttles/emergency/emergency_asteroid.dmm +++ b/_maps/shuttles/emergency/emergency_asteroid.dmm @@ -63,9 +63,6 @@ "az" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/shuttle/escape) -"aB" = ( -/turf/closed/wall/mineral/titanium/interior, -/area/shuttle/escape) "aE" = ( /obj/structure/chair/fancy/shuttle{ dir = 4 @@ -1052,7 +1049,7 @@ aa (11,1,1) = {" qO qO -aB +az aJ Vz aZ @@ -1082,7 +1079,7 @@ aa (13,1,1) = {" qO qO -aB +az aK Vz aZ @@ -1142,7 +1139,7 @@ aa (17,1,1) = {" qO qO -aB +az bK Vz aZ @@ -1172,7 +1169,7 @@ aa (19,1,1) = {" qO qO -aB +az Dx Vz aZ From ea82ebb9f7440a1fc4e4efe7dcad81848acc267c Mon Sep 17 00:00:00 2001 From: Markus Date: Fri, 27 Sep 2024 13:28:54 +0200 Subject: [PATCH 10/13] Update emergency_asteroid.dmm --- _maps/shuttles/emergency/emergency_asteroid.dmm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/_maps/shuttles/emergency/emergency_asteroid.dmm b/_maps/shuttles/emergency/emergency_asteroid.dmm index 6e8d0de320871..c080e4eeae0db 100644 --- a/_maps/shuttles/emergency/emergency_asteroid.dmm +++ b/_maps/shuttles/emergency/emergency_asteroid.dmm @@ -15,9 +15,7 @@ /obj/structure/shuttle/engine/heater{ dir = 8 }, -/obj/structure/window/reinforced/survival_pod{ - dir = 8 - }, +/obj/effect/spawner/structure/window/shuttle, /turf/open/floor/plating/airless, /area/shuttle/escape) "ap" = ( From 382129e36a678e5eaacc5b232a27942e1bfb86ba Mon Sep 17 00:00:00 2001 From: Markus Date: Fri, 27 Sep 2024 13:38:38 +0200 Subject: [PATCH 11/13] banned variable fix --- _maps/shuttles/emergency/emergency_asteroid.dmm | 6 ++---- _maps/shuttles/emergency/emergency_bar.dmm | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/_maps/shuttles/emergency/emergency_asteroid.dmm b/_maps/shuttles/emergency/emergency_asteroid.dmm index c080e4eeae0db..fddaba40ad2a9 100644 --- a/_maps/shuttles/emergency/emergency_asteroid.dmm +++ b/_maps/shuttles/emergency/emergency_asteroid.dmm @@ -457,8 +457,7 @@ }, /obj/structure/sink{ dir = 1; - pixel_y = 24; - layer = 3.3 + pixel_y = 24 }, /obj/effect/turf_decal/trimline/neutral/filled/line, /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -646,8 +645,7 @@ }, /obj/structure/sink{ dir = 1; - pixel_y = 24; - layer = 3.3 + pixel_y = 24 }, /obj/effect/turf_decal/trimline/neutral/filled/end{ dir = 4 diff --git a/_maps/shuttles/emergency/emergency_bar.dmm b/_maps/shuttles/emergency/emergency_bar.dmm index 43eb5ea85623c..d101cc9360000 100644 --- a/_maps/shuttles/emergency/emergency_bar.dmm +++ b/_maps/shuttles/emergency/emergency_bar.dmm @@ -722,8 +722,7 @@ }, /obj/structure/sink{ dir = 1; - pixel_y = 24; - layer = 3.3 + pixel_y = 24 }, /turf/open/floor/iron/freezer, /area/shuttle/escape) From b86af23e1c7786fdc9b6977af4876f947e37bb14 Mon Sep 17 00:00:00 2001 From: Markus Date: Fri, 27 Sep 2024 13:44:09 +0200 Subject: [PATCH 12/13] Update emergency_delta.dmm --- _maps/shuttles/emergency/emergency_delta.dmm | 26 +++----------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/_maps/shuttles/emergency/emergency_delta.dmm b/_maps/shuttles/emergency/emergency_delta.dmm index 243951873ac64..073b1d48ed365 100644 --- a/_maps/shuttles/emergency/emergency_delta.dmm +++ b/_maps/shuttles/emergency/emergency_delta.dmm @@ -902,9 +902,6 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, -/obj/structure/sign/nanotrasen{ - pixel_x = -32 - }, /turf/open/floor/iron/dark/side{ dir = 4 }, @@ -1163,9 +1160,6 @@ dir = 8 }, /obj/effect/turf_decal/tile/yellow/half/contrasted, -/obj/structure/sign/nanotrasen{ - pixel_x = 32 - }, /turf/open/floor/iron/dark/side{ dir = 8 }, @@ -1232,12 +1226,6 @@ /obj/item/radio/intercom/directional/south, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) -"FO" = ( -/obj/structure/sign/nanotrasen{ - pixel_x = 32 - }, -/turf/template_noop, -/area/template_noop) "Gd" = ( /obj/item/reagent_containers/glass/bottle/epinephrine{ pixel_x = 6 @@ -1319,12 +1307,6 @@ /obj/effect/turf_decal/box, /turf/open/floor/iron/large, /area/shuttle/escape) -"Hz" = ( -/obj/structure/sign/nanotrasen{ - pixel_x = -32 - }, -/turf/template_noop, -/area/template_noop) "HH" = ( /obj/effect/turf_decal/trimline/neutral/filled/line, /turf/open/floor/iron/edge{ @@ -2070,7 +2052,7 @@ af aa aa aa -FO +aa aa "} (5,1,1) = {" @@ -2101,7 +2083,7 @@ af af af Ky -af +aT af "} (6,1,1) = {" @@ -2380,7 +2362,7 @@ af af af Ky -af +aT af "} (15,1,1) = {" @@ -2411,7 +2393,7 @@ af aa aa aa -Hz +aa aa "} (16,1,1) = {" From c0f334fc5ca2e535331914d6082b1caf68f96da6 Mon Sep 17 00:00:00 2001 From: Markus Date: Sat, 28 Sep 2024 11:11:01 +0200 Subject: [PATCH 13/13] removed foam dispensers --- .../shuttles/emergency/emergency_asteroid.dmm | 25 +--- _maps/shuttles/emergency/emergency_bar.dmm | 16 +-- .../shuttles/emergency/emergency_birdboat.dmm | 80 +++++------ _maps/shuttles/emergency/emergency_box.dmm | 85 +++++++----- _maps/shuttles/emergency/emergency_delta.dmm | 125 +++++++++++++++--- _maps/shuttles/emergency/emergency_meta.dmm | 78 +++++++---- _maps/shuttles/emergency/emergency_tiny.dmm | 19 +-- 7 files changed, 265 insertions(+), 163 deletions(-) diff --git a/_maps/shuttles/emergency/emergency_asteroid.dmm b/_maps/shuttles/emergency/emergency_asteroid.dmm index fddaba40ad2a9..b6de68951f0e1 100644 --- a/_maps/shuttles/emergency/emergency_asteroid.dmm +++ b/_maps/shuttles/emergency/emergency_asteroid.dmm @@ -199,11 +199,6 @@ /obj/machinery/firealarm/directional/north, /turf/open/floor/carpet/blue, /area/shuttle/escape) -"aY" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/ai_slipper, -/turf/open/floor/iron/large, -/area/shuttle/escape) "aZ" = ( /obj/structure/chair/fancy/shuttle{ dir = 1 @@ -239,7 +234,6 @@ /turf/open/floor/iron/large, /area/shuttle/escape) "bf" = ( -/obj/machinery/ai_slipper, /obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 8 }, @@ -346,7 +340,6 @@ /area/shuttle/escape) "by" = ( /obj/effect/turf_decal/tile/yellow/fourcorners, -/obj/machinery/ai_slipper, /turf/open/floor/iron/large, /area/shuttle/escape) "bz" = ( @@ -543,10 +536,6 @@ /obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) -"qf" = ( -/obj/machinery/ai_slipper, -/turf/open/floor/mineral/plastitanium/red/brig, -/area/shuttle/escape) "qO" = ( /obj/effect/spawner/structure/window/shuttle, /obj/machinery/door/firedoor/window, @@ -587,11 +576,6 @@ dir = 4 }, /area/shuttle/escape) -"uW" = ( -/obj/machinery/ai_slipper, -/obj/effect/turf_decal/tile/blue/fourcorners, -/turf/open/floor/iron/white/smooth_large, -/area/shuttle/escape) "ve" = ( /obj/structure/closet, /obj/structure/extinguisher_cabinet/directional/west, @@ -883,7 +867,6 @@ /area/shuttle/escape) "ZD" = ( /obj/machinery/light/small, -/obj/machinery/ai_slipper, /obj/machinery/status_display/evac/directional/south, /obj/effect/turf_decal/trimline/neutral/filled/line, /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -1034,7 +1017,7 @@ ac iZ Vz Vz -aY +Vz Vz Vz bv @@ -1184,7 +1167,7 @@ ac aM Vz Vz -aY +Vz Vz Vz aI @@ -1240,15 +1223,15 @@ ac (24,1,1) = {" jj aw -qf aw IQ +aw bM ac cl +lL uM lL -uW bG qO "} diff --git a/_maps/shuttles/emergency/emergency_bar.dmm b/_maps/shuttles/emergency/emergency_bar.dmm index d101cc9360000..b1720b49d0f1c 100644 --- a/_maps/shuttles/emergency/emergency_bar.dmm +++ b/_maps/shuttles/emergency/emergency_bar.dmm @@ -449,7 +449,6 @@ "jv" = ( /obj/machinery/status_display/evac/directional/north, /obj/machinery/light/small, -/obj/machinery/ai_slipper, /turf/open/floor/iron/freezer, /area/shuttle/escape) "kj" = ( @@ -580,10 +579,6 @@ /obj/machinery/newscaster/directional/north, /turf/open/floor/wood, /area/shuttle/escape) -"AJ" = ( -/obj/machinery/ai_slipper, -/turf/open/floor/wood, -/area/shuttle/escape) "AX" = ( /obj/structure/chair/stool/bar{ dir = 1; @@ -604,7 +599,6 @@ /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 1 }, -/obj/machinery/ai_slipper, /turf/open/floor/iron/white/smooth_edge, /area/shuttle/escape) "Fm" = ( @@ -766,10 +760,6 @@ }, /turf/open/floor/wood, /area/shuttle/escape) -"Vu" = ( -/obj/machinery/ai_slipper, -/turf/open/floor/carpet/royalblue, -/area/shuttle/escape) "Vx" = ( /obj/machinery/light{ dir = 8 @@ -928,7 +918,7 @@ bE (5,1,1) = {" Zp ag -Vu +an as ab ac @@ -980,7 +970,7 @@ mB Gr GY Cv -AJ +kS hI hI hI @@ -988,7 +978,7 @@ hI hI hI hI -AJ +kS zE ae ab diff --git a/_maps/shuttles/emergency/emergency_birdboat.dmm b/_maps/shuttles/emergency/emergency_birdboat.dmm index bf0f52eb315a7..cc2dc3d035c09 100644 --- a/_maps/shuttles/emergency/emergency_birdboat.dmm +++ b/_maps/shuttles/emergency/emergency_birdboat.dmm @@ -296,8 +296,15 @@ /turf/open/floor/iron/large, /area/shuttle/escape) "iH" = ( +/obj/effect/turf_decal/box/corners{ + dir = 1; + pixel_y = -16 + }, +/obj/effect/turf_decal/box/corners{ + pixel_y = -16; + dir = 4 + }, /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/ai_slipper, /turf/open/floor/iron/large, /area/shuttle/escape) "jz" = ( @@ -420,14 +427,6 @@ }, /turf/open/floor/carpet/blue, /area/shuttle/escape) -"ra" = ( -/obj/machinery/ai_slipper, -/obj/effect/turf_decal/siding/thinplating_new{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/large, -/area/shuttle/escape) "ru" = ( /obj/machinery/firealarm/directional/east, /obj/machinery/camera/directional/east, @@ -450,10 +449,6 @@ dir = 1 }, /area/shuttle/escape) -"sK" = ( -/obj/machinery/ai_slipper, -/turf/open/floor/mineral/plastitanium/red/brig, -/area/shuttle/escape) "sR" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 6 @@ -482,9 +477,18 @@ /turf/open/floor/iron/techmaint, /area/shuttle/escape) "uP" = ( +/obj/machinery/holopad{ + pixel_x = 16 + }, +/obj/effect/turf_decal/box/corners{ + dir = 1; + pixel_x = 16 + }, +/obj/effect/turf_decal/box/corners{ + pixel_x = 16; + dir = 8 + }, /obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/holopad, -/obj/effect/turf_decal/box, /turf/open/floor/iron/white/smooth_large, /area/shuttle/escape) "vj" = ( @@ -508,9 +512,17 @@ /turf/open/floor/carpet/blue, /area/shuttle/escape) "wJ" = ( +/obj/machinery/holopad{ + pixel_y = 16 + }, +/obj/effect/turf_decal/box/corners{ + pixel_y = 16 + }, +/obj/effect/turf_decal/box/corners{ + pixel_y = 16; + dir = 8 + }, /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/holopad, -/obj/effect/turf_decal/box, /turf/open/floor/iron/large, /area/shuttle/escape) "xz" = ( @@ -575,14 +587,6 @@ }, /turf/open/floor/iron/white/smooth_edge, /area/shuttle/escape) -"Cy" = ( -/obj/machinery/ai_slipper, -/obj/effect/turf_decal/siding/thinplating_new{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/large, -/area/shuttle/escape) "DU" = ( /obj/structure/closet/firecloset, /obj/effect/turf_decal/bot, @@ -686,7 +690,6 @@ /turf/open/floor/carpet/blue, /area/shuttle/escape) "Ki" = ( -/obj/machinery/ai_slipper, /obj/effect/turf_decal/siding/thinplating_new/dark, /obj/effect/turf_decal/siding/thinplating_new/dark/corner{ dir = 1 @@ -851,15 +854,16 @@ /turf/open/floor/iron, /area/shuttle/escape) "SQ" = ( +/obj/effect/turf_decal/box/corners{ + pixel_x = -16 + }, +/obj/effect/turf_decal/box/corners{ + pixel_x = -16; + dir = 4 + }, /obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/ai_slipper, /turf/open/floor/iron/white/smooth_large, /area/shuttle/escape) -"Tf" = ( -/obj/effect/turf_decal/tile/yellow/fourcorners, -/obj/machinery/ai_slipper, -/turf/open/floor/iron/large, -/area/shuttle/escape) "Ti" = ( /obj/machinery/door/airlock/titanium{ name = "Emergency Shuttle Airlock" @@ -990,7 +994,7 @@ jD RD KB aC -ra +aC YS aS MN @@ -1047,7 +1051,7 @@ ab (8,1,1) = {" ab Fg -sK +at at MN KP @@ -1063,14 +1067,14 @@ ab (9,1,1) = {" MN al -at +vj at ho Em Hx ip Em -Cy +Em dy aE aE @@ -1079,7 +1083,7 @@ MN (10,1,1) = {" MN al -vj +at EQ MN uy @@ -1159,7 +1163,7 @@ ab (15,1,1) = {" ab ae -Tf +an FV Hl eF diff --git a/_maps/shuttles/emergency/emergency_box.dmm b/_maps/shuttles/emergency/emergency_box.dmm index 288686f1880c7..4e2846ce75543 100644 --- a/_maps/shuttles/emergency/emergency_box.dmm +++ b/_maps/shuttles/emergency/emergency_box.dmm @@ -374,21 +374,13 @@ dir = 4 }, /area/shuttle/escape) -"bz" = ( -/obj/effect/turf_decal/tile/yellow/fourcorners, -/obj/machinery/ai_slipper, -/turf/open/floor/iron/large, -/area/shuttle/escape) -"bG" = ( -/obj/effect/turf_decal/siding/thinplating_new{ - dir = 8 +"cF" = ( +/obj/effect/turf_decal/box/corners{ + pixel_y = 16; + dir = 8; + pixel_x = 16 }, -/obj/effect/turf_decal/siding/thinplating_new{ - dir = 4 - }, -/obj/machinery/ai_slipper, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/large, +/turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "ds" = ( /obj/structure/extinguisher_cabinet{ @@ -426,13 +418,30 @@ /turf/open/floor/iron/large, /area/shuttle/escape) "ga" = ( -/obj/machinery/ai_slipper, +/obj/machinery/holopad{ + pixel_x = 16 + }, +/obj/effect/turf_decal/box/corners{ + dir = 1; + pixel_x = 16 + }, +/obj/effect/turf_decal/box/corners{ + pixel_x = 16; + dir = 8 + }, /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron/white/smooth_large, /area/shuttle/escape) "ij" = ( -/obj/machinery/holopad, -/obj/effect/turf_decal/box, +/obj/machinery/holopad{ + pixel_x = 16; + pixel_y = -16 + }, +/obj/effect/turf_decal/box/corners{ + dir = 1; + pixel_x = 16; + pixel_y = -16 + }, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "iS" = ( @@ -525,10 +534,6 @@ }, /turf/open/floor/iron, /area/shuttle/escape) -"rD" = ( -/obj/machinery/ai_slipper, -/turf/open/floor/iron, -/area/shuttle/escape) "tF" = ( /obj/structure/chair/fancy/shuttle{ dir = 1 @@ -565,11 +570,24 @@ /turf/open/floor/iron, /area/shuttle/escape) "wF" = ( -/obj/machinery/holopad, +/obj/effect/turf_decal/box/corners{ + pixel_x = -16 + }, +/obj/effect/turf_decal/box/corners{ + pixel_x = -16; + dir = 4 + }, /obj/effect/turf_decal/tile/blue/fourcorners, -/obj/effect/turf_decal/box, /turf/open/floor/iron/white/smooth_large, /area/shuttle/escape) +"wG" = ( +/obj/effect/turf_decal/box/corners{ + dir = 4; + pixel_x = -16; + pixel_y = -16 + }, +/turf/open/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) "yh" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box, @@ -874,7 +892,10 @@ /turf/open/floor/iron/techmaint, /area/shuttle/escape) "VE" = ( -/obj/machinery/ai_slipper, +/obj/effect/turf_decal/box/corners{ + pixel_x = -16; + pixel_y = 16 + }, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "VF" = ( @@ -953,13 +974,13 @@ al ad FC ij -aG +cF aG UI aQ aC aC -bG +aC aC aC aW @@ -977,7 +998,7 @@ am at ad aA -aG +wG VE aJ ad @@ -990,7 +1011,7 @@ aS aK Dd Od -bz +bb bg bi bk @@ -998,7 +1019,7 @@ bk (5,1,1) = {" JW tF -rD +ag wq ad lm @@ -1023,7 +1044,7 @@ bk (6,1,1) = {" JW ar -ag +yh qO ad ad @@ -1048,7 +1069,7 @@ bk (7,1,1) = {" JW tF -yh +ag ag IL Lr @@ -1109,7 +1130,7 @@ af es aC aC -bG +aC aC aC TU diff --git a/_maps/shuttles/emergency/emergency_delta.dmm b/_maps/shuttles/emergency/emergency_delta.dmm index 073b1d48ed365..de3aa740a6542 100644 --- a/_maps/shuttles/emergency/emergency_delta.dmm +++ b/_maps/shuttles/emergency/emergency_delta.dmm @@ -642,7 +642,6 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 4 }, -/obj/machinery/ai_slipper, /obj/machinery/status_display/evac/directional/south, /turf/open/floor/iron, /area/shuttle/escape) @@ -777,6 +776,23 @@ }, /turf/open/floor/iron/edge, /area/shuttle/escape) +"hv" = ( +/obj/effect/turf_decal/box/corners{ + pixel_y = 16; + dir = 8; + pixel_x = 16 + }, +/turf/open/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) +"iy" = ( +/obj/effect/turf_decal/box/corners{ + pixel_y = 16; + dir = 8; + pixel_x = 16 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, +/area/shuttle/escape) "iz" = ( /obj/structure/chair/fancy/shuttle, /obj/machinery/camera/directional/north, @@ -1036,8 +1052,17 @@ /turf/open/floor/iron, /area/shuttle/escape) "xX" = ( -/obj/machinery/holopad, -/obj/effect/turf_decal/box, +/obj/machinery/holopad{ + pixel_x = 16 + }, +/obj/effect/turf_decal/box/corners{ + dir = 1; + pixel_x = 16 + }, +/obj/effect/turf_decal/box/corners{ + pixel_x = 16; + dir = 8 + }, /turf/open/floor/carpet/blue, /area/shuttle/escape) "zd" = ( @@ -1077,7 +1102,13 @@ }, /area/shuttle/escape) "zu" = ( -/obj/machinery/ai_slipper, +/obj/effect/turf_decal/box/corners{ + pixel_x = -16 + }, +/obj/effect/turf_decal/box/corners{ + pixel_x = -16; + dir = 4 + }, /turf/open/floor/carpet/blue, /area/shuttle/escape) "zW" = ( @@ -1151,8 +1182,15 @@ /turf/open/floor/iron/edge, /area/shuttle/escape) "CS" = ( -/obj/machinery/holopad, -/obj/effect/turf_decal/box, +/obj/machinery/holopad{ + pixel_x = 16; + pixel_y = -16 + }, +/obj/effect/turf_decal/box/corners{ + dir = 1; + pixel_x = 16; + pixel_y = -16 + }, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "Dx" = ( @@ -1165,7 +1203,10 @@ }, /area/shuttle/escape) "DG" = ( -/obj/machinery/ai_slipper, +/obj/effect/turf_decal/box/corners{ + pixel_x = -16; + pixel_y = 16 + }, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "Ec" = ( @@ -1307,6 +1348,15 @@ /obj/effect/turf_decal/box, /turf/open/floor/iron/large, /area/shuttle/escape) +"Hw" = ( +/obj/effect/turf_decal/box/corners{ + dir = 4; + pixel_x = -16; + pixel_y = -16 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, +/area/shuttle/escape) "HH" = ( /obj/effect/turf_decal/trimline/neutral/filled/line, /turf/open/floor/iron/edge{ @@ -1537,11 +1587,21 @@ /turf/open/floor/iron, /area/shuttle/escape) "Mi" = ( -/obj/effect/turf_decal/stripes/line{ +/obj/machinery/holopad{ + pixel_x = 16 + }, +/obj/effect/turf_decal/box/corners{ + dir = 1; + pixel_x = 16 + }, +/obj/effect/turf_decal/box/corners{ + pixel_x = 16; dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/ai_slipper, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /turf/open/floor/iron/large, /area/shuttle/escape) "Ml" = ( @@ -1670,6 +1730,14 @@ }, /turf/open/floor/iron/white/smooth_large, /area/shuttle/escape) +"QN" = ( +/obj/effect/turf_decal/box/corners{ + pixel_x = -16; + pixel_y = 16 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/large, +/area/shuttle/escape) "QW" = ( /obj/structure/table/reinforced, /obj/item/storage/fancy/donut_box, @@ -1687,8 +1755,16 @@ }, /area/shuttle/escape) "RY" = ( +/obj/machinery/holopad{ + pixel_x = 16; + pixel_y = -16 + }, +/obj/effect/turf_decal/box/corners{ + dir = 1; + pixel_x = 16; + pixel_y = -16 + }, /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/ai_slipper, /turf/open/floor/iron/large, /area/shuttle/escape) "Ss" = ( @@ -1906,12 +1982,17 @@ /turf/open/floor/carpet/blue, /area/shuttle/escape) "Yn" = ( -/obj/effect/turf_decal/stripes/line{ +/obj/effect/turf_decal/box/corners{ + pixel_x = -16 + }, +/obj/effect/turf_decal/box/corners{ + pixel_x = -16; dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/holopad, -/obj/effect/turf_decal/box, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/iron/large, /area/shuttle/escape) "Yt" = ( @@ -1930,6 +2011,14 @@ }, /turf/open/floor/iron/white, /area/shuttle/escape) +"ZZ" = ( +/obj/effect/turf_decal/box/corners{ + dir = 4; + pixel_x = -16; + pixel_y = -16 + }, +/turf/open/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) (1,1,1) = {" aa @@ -2015,7 +2104,7 @@ Vu uA bw CS -bw +hv bU Ky aa @@ -2045,7 +2134,7 @@ zW HH af iz -bw +ZZ DG cG af @@ -2201,7 +2290,7 @@ Vu Hh gv RY -zW +iy co Hh Ml @@ -2231,8 +2320,8 @@ zW Vu Hh gv -zW -Hv +Hw +QN co Hh Ml diff --git a/_maps/shuttles/emergency/emergency_meta.dmm b/_maps/shuttles/emergency/emergency_meta.dmm index 44ac398eccc48..998c2fb62672c 100644 --- a/_maps/shuttles/emergency/emergency_meta.dmm +++ b/_maps/shuttles/emergency/emergency_meta.dmm @@ -70,8 +70,17 @@ /area/shuttle/escape) "as" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/holopad, -/obj/effect/turf_decal/box, +/obj/machinery/holopad{ + pixel_x = 16 + }, +/obj/effect/turf_decal/box/corners{ + dir = 1; + pixel_x = 16 + }, +/obj/effect/turf_decal/box/corners{ + pixel_x = 16; + dir = 8 + }, /turf/open/floor/iron, /area/shuttle/escape) "at" = ( @@ -673,8 +682,15 @@ /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "cl" = ( -/obj/machinery/holopad, -/obj/effect/turf_decal/box, +/obj/machinery/holopad{ + pixel_x = 16; + pixel_y = -16 + }, +/obj/effect/turf_decal/box/corners{ + dir = 1; + pixel_x = 16; + pixel_y = -16 + }, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "cO" = ( @@ -692,6 +708,14 @@ /obj/item/storage/firstaid/fire, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) +"df" = ( +/obj/effect/turf_decal/box/corners{ + pixel_y = 16; + dir = 8; + pixel_x = 16 + }, +/turf/open/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) "dy" = ( /obj/item/stack/medical/bruise_pack, /obj/item/stack/medical/ointment, @@ -775,7 +799,6 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/orange/hidden, -/obj/machinery/ai_slipper, /turf/open/floor/iron, /area/shuttle/escape) "ig" = ( @@ -827,6 +850,14 @@ }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) +"nd" = ( +/obj/effect/turf_decal/box/corners{ + dir = 4; + pixel_x = -16; + pixel_y = -16 + }, +/turf/open/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) "ph" = ( /obj/structure/flora/ausbushes/grassybush, /obj/structure/flora/ausbushes/lavendergrass, @@ -854,7 +885,13 @@ /area/shuttle/escape) "re" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/ai_slipper, +/obj/effect/turf_decal/box/corners{ + pixel_x = -16 + }, +/obj/effect/turf_decal/box/corners{ + pixel_x = -16; + dir = 4 + }, /turf/open/floor/iron, /area/shuttle/escape) "rl" = ( @@ -1033,10 +1070,6 @@ /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/iron, /area/shuttle/escape) -"Ib" = ( -/obj/machinery/ai_slipper, -/turf/open/floor/carpet/blue, -/area/shuttle/escape) "Kc" = ( /obj/machinery/light{ dir = 4 @@ -1046,10 +1079,6 @@ }, /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) -"Ki" = ( -/obj/machinery/ai_slipper, -/turf/open/floor/iron/white/smooth_large, -/area/shuttle/escape) "Kk" = ( /turf/open/floor/iron/dark/side{ dir = 8 @@ -1168,7 +1197,10 @@ /turf/open/floor/iron/white, /area/shuttle/escape) "SV" = ( -/obj/machinery/ai_slipper, +/obj/effect/turf_decal/box/corners{ + pixel_x = -16; + pixel_y = 16 + }, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "TI" = ( @@ -1178,10 +1210,6 @@ }, /turf/open/floor/iron/dark/side, /area/shuttle/escape) -"Uh" = ( -/obj/machinery/ai_slipper, -/turf/open/floor/iron, -/area/shuttle/escape) "Ui" = ( /turf/open/floor/iron/dark/corner{ dir = 1 @@ -1393,7 +1421,7 @@ Li Rg ao bZ -Ib +ax ig dE wY @@ -1427,7 +1455,7 @@ ad bX fx Yp -Uh +cO Yp ap bX @@ -1451,7 +1479,7 @@ cO ef bU cl -bU +df bU bE Li @@ -1467,7 +1495,7 @@ ar bN Li bi -bU +nd SV bU bF @@ -1552,7 +1580,7 @@ ar cO PE bl -Ki +bl ve jb bJ @@ -1665,7 +1693,7 @@ ad LY LY LY -Uh +cO LY LY LY diff --git a/_maps/shuttles/emergency/emergency_tiny.dmm b/_maps/shuttles/emergency/emergency_tiny.dmm index 8ad47943f35d3..9bdc48160d4e6 100644 --- a/_maps/shuttles/emergency/emergency_tiny.dmm +++ b/_maps/shuttles/emergency/emergency_tiny.dmm @@ -22,13 +22,6 @@ }, /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) -"bR" = ( -/obj/effect/turf_decal/trimline/dark/warning{ - dir = 8 - }, -/obj/machinery/ai_slipper, -/turf/open/floor/mineral/titanium/white, -/area/shuttle/escape) "bV" = ( /obj/structure/chair/fancy/shuttle, /obj/effect/turf_decal/bot, @@ -138,10 +131,6 @@ }, /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) -"ls" = ( -/obj/machinery/ai_slipper, -/turf/open/floor/mineral/plastitanium, -/area/shuttle/escape) "mX" = ( /obj/effect/turf_decal/bot, /obj/structure/chair/fancy/shuttle{ @@ -267,7 +256,6 @@ /turf/open/floor/plating, /area/shuttle/escape) "tn" = ( -/obj/machinery/ai_slipper, /obj/machinery/button/flasher{ id = "cockpit_flasher"; pixel_x = 25; @@ -482,7 +470,6 @@ /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, -/obj/machinery/ai_slipper, /turf/open/floor/iron/white, /area/shuttle/escape) "HD" = ( @@ -766,7 +753,7 @@ lm Ow gg Ae -ls +HD hT xa EA @@ -779,7 +766,7 @@ UW tn in JM -bR +gy gy Ze Pv @@ -811,7 +798,7 @@ xX (6,1,1) = {" sT ec -ls +HD rZ nL gk