From 6a442a1b1fd06bdfb42d3bd0ea8e1e06b02ad741 Mon Sep 17 00:00:00 2001 From: Kyep Date: Tue, 21 Jul 2020 19:32:37 -0700 Subject: [PATCH 01/10] v1 --- _maps/map_files/shuttles/emergency_dept.dmm | 2060 +++++++++++-------- 1 file changed, 1248 insertions(+), 812 deletions(-) diff --git a/_maps/map_files/shuttles/emergency_dept.dmm b/_maps/map_files/shuttles/emergency_dept.dmm index 739056d20d6..6a90c7ba45c 100644 --- a/_maps/map_files/shuttles/emergency_dept.dmm +++ b/_maps/map_files/shuttles/emergency_dept.dmm @@ -17,81 +17,152 @@ "ad" = ( /turf/space, /turf/simulated/shuttle/wall{ - tag = "icon-swall_f10"; icon_state = "swall_f10"; dir = 2 }, /area/shuttle/escape) "ae" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall12"; - dir = 2 +/obj/structure/table/reinforced, +/obj/item/paper_bin, +/obj/item/pen, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "vault" }, /area/shuttle/escape) "af" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swallc4" +/obj/structure/table/reinforced, +/obj/item/folder/red, +/obj/item/restraints/handcuffs, +/obj/item/flash, +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, /area/shuttle/escape) "ag" = ( -/obj/machinery/computer/emergency_shuttle, -/turf/simulated/shuttle/floor, +/obj/machinery/computer/robotics, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "darkblue" + }, /area/shuttle/escape) "ah" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swallc3" +/obj/machinery/computer/crew, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "darkblue" }, /area/shuttle/escape) "ai" = ( -/obj/machinery/computer/station_alert, -/turf/simulated/shuttle/floor, +/obj/machinery/computer/emergency_shuttle, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "darkblue" + }, /area/shuttle/escape) "aj" = ( /obj/machinery/computer/communications, -/obj/machinery/light/spot{ - tag = "icon-tube1 (NORTH)"; - icon_state = "tube1"; - dir = 1 +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "darkblue" }, -/turf/simulated/shuttle/floor, /area/shuttle/escape) "ak" = ( -/obj/machinery/computer/security{ - network = list("SS13","Telecomms","Research Outpost","Mining Outpost") +/obj/structure/table/reinforced, +/obj/item/storage/fancy/donut_box, +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/turf/simulated/shuttle/floor, /area/shuttle/escape) "al" = ( +/obj/structure/table/reinforced, +/obj/machinery/cell_charger, +/obj/item/stock_parts/cell/high, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "vault" + }, +/area/shuttle/escape) +"am" = ( +/obj/structure/table/reinforced, +/obj/machinery/recharger, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "vault" + }, +/area/shuttle/escape) +"an" = ( +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/shuttle/escape) +"ao" = ( /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/simulated/shuttle/floor, -/area/shuttle/escape) -"am" = ( -/obj/structure/table, -/turf/simulated/shuttle/floor, -/area/shuttle/escape) -"an" = ( -/obj/machinery/computer/crew, -/obj/machinery/light/spot{ - tag = "icon-tube1 (NORTH)"; - icon_state = "tube1"; - dir = 1 +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/turf/simulated/shuttle/floor, -/area/shuttle/escape) -"ao" = ( -/obj/machinery/computer/robotics, -/turf/simulated/shuttle/floor, /area/shuttle/escape) "ap" = ( +/obj/structure/table/reinforced, +/obj/item/storage/toolbox/mechanical, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "vault" + }, +/area/shuttle/escape) +"aq" = ( /turf/simulated/shuttle/wall{ icon_state = "swall3"; dir = 2 }, /area/shuttle/escape) -"aq" = ( -/turf/simulated/shuttle/floor, +"ar" = ( +/obj/machinery/computer/security{ + network = list("SS13","Research Outpost","Mining Outpost","Telecomms") + }, +/obj/structure/sign/poster/official/nanotrasen_logo{ + pixel_x = -32; + pixel_y = 0 + }, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "darkred" + }, +/area/shuttle/escape) +"as" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/shuttle/escape) +"at" = ( +/obj/item/radio/intercom{ + dir = 4; + name = "Station Intercom (General)"; + pixel_x = 29; + pixel_y = -60 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/shuttle/escape) +"au" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/shuttle/escape) +"av" = ( +/turf/simulated/shuttle/wall{ + icon_state = "swall12"; + dir = 2 + }, /area/shuttle/escape) "aw" = ( /turf/simulated/shuttle/wall{ @@ -100,49 +171,258 @@ }, /area/shuttle/escape) "ax" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall14"; - dir = 2 +/obj/machinery/computer/station_alert, +/obj/structure/sign/poster/official/nanotrasen_logo{ + pixel_x = 32; + pixel_y = 0 + }, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "darkyellow" }, /area/shuttle/escape) "ay" = ( -/obj/machinery/door/airlock/command/glass{ - name = "Escape Shuttle Cockpit"; - req_access_txt = "19" +/obj/machinery/computer/secure_data, +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "darkred" }, -/turf/simulated/shuttle/floor, /area/shuttle/escape) "az" = ( -/obj/structure/chair/comfy/shuttle, +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, /turf/simulated/shuttle/floor4, /area/shuttle/escape) "aA" = ( -/obj/machinery/status_display{ - pixel_y = 30 +/obj/machinery/light, +/obj/structure/chair/comfy/shuttle{ + dir = 8 }, -/obj/machinery/light/spot{ - tag = "icon-tube1 (NORTH)"; - icon_state = "tube1"; - dir = 1 +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor4, /area/shuttle/escape) "aB" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle{ - icon_state = "16" +/obj/machinery/light, +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/turf/simulated/floor/plating, /area/shuttle/escape) "aC" = ( +/obj/machinery/computer/atmos_alert, +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "darkyellow" + }, +/area/shuttle/escape) +"aD" = ( +/obj/machinery/status_display, +/turf/simulated/shuttle/wall{ + icon_state = "swall12"; + dir = 2 + }, +/area/shuttle/escape) +"aE" = ( +/obj/machinery/door/airlock/command/glass{ + name = "Escape Shuttle Cockpit"; + normalspeed = 0; + req_access_txt = "19" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/shuttle/escape) +"aF" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/obj/machinery/light{ + icon_state = "tube1"; + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/shuttle/escape) +"aG" = ( +/obj/machinery/recharger/wallcharger{ + pixel_x = 32; + pixel_y = 0 + }, +/turf/simulated/shuttle/floor4, +/area/shuttle/escape) +"aH" = ( +/turf/simulated/shuttle/floor4, +/area/shuttle/escape) +"aI" = ( +/obj/machinery/door/airlock/medical/glass{ + id_tag = null; + name = "Escape Shuttle Infirmary"; + req_access_txt = "0" + }, +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "cmo" + }, +/area/shuttle/escape) +"aJ" = ( +/obj/structure/table/reinforced, +/obj/item/storage/fancy/donut_box, +/turf/simulated/shuttle/floor4, +/area/shuttle/escape) +"aK" = ( +/obj/machinery/door/airlock/engineering/glass{ + name = "Escape Shuttle Engineering"; + req_access_txt = "32"; + req_one_access_txt = "0" + }, +/turf/simulated/shuttle/floor{ + icon_state = "floor2" + }, +/area/shuttle/escape) +"aL" = ( +/obj/machinery/door/airlock/mining/glass{ + name = "Escape Shuttle Cargo"; + req_access_txt = "50" + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/shuttle/escape) +"aM" = ( +/obj/machinery/door/airlock/medical/glass{ + name = "Escape Shuttle Medical"; + req_access_txt = "5" + }, +/turf/simulated/shuttle/floor{ + icon_state = "floor3" + }, +/area/shuttle/escape) +"aN" = ( +/obj/structure/sign/directions/security{ + dir = 1; + pixel_y = 7 + }, +/turf/simulated/shuttle/wall{ + icon_state = "swall12"; + dir = 2 + }, +/area/shuttle/escape) +"aO" = ( +/obj/machinery/door/airlock/research{ + name = "Escape Shuttle Research"; + req_access_txt = "47" + }, +/turf/simulated/shuttle/floor{ + icon_state = "floor5" + }, +/area/shuttle/escape) +"aP" = ( +/turf/simulated/shuttle/wall{ + tag = "icon-swall7"; + icon_state = "swall7"; + dir = 2 + }, +/area/shuttle/escape) +"aQ" = ( +/obj/machinery/defibrillator_mount/loaded, +/turf/simulated/shuttle/wall{ + icon_state = "swallc4" + }, +/area/shuttle/escape) +"aR" = ( +/turf/simulated/shuttle/wall{ + dir = 2; + icon_state = "swallc1" + }, +/area/shuttle/escape) +"aS" = ( /turf/simulated/floor/plasteel{ icon_state = "cafeteria"; dir = 2 }, /area/shuttle/escape) -"aD" = ( +"aT" = ( +/obj/item/twohanded/required/kirbyplants, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/shuttle/escape) +"aU" = ( +/obj/structure/chair/stool/bar, +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria"; + dir = 2 + }, +/area/shuttle/escape) +"aV" = ( +/obj/structure/table/wood, +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria"; + dir = 2 + }, +/area/shuttle/escape) +"aW" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Escape Shuttle Brig"; + req_access_txt = "63" + }, +/turf/simulated/shuttle/floor4, +/area/shuttle/escape) +"aX" = ( /obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/turf/simulated/shuttle/floor4, +/area/shuttle/escape) +"aY" = ( +/turf/simulated/shuttle/wall{ + dir = 2; + icon_state = "swallc3" + }, +/area/shuttle/escape) +"aZ" = ( +/turf/simulated/shuttle/wall{ + tag = "icon-swall14"; + icon_state = "swall14"; + dir = 2 + }, +/area/shuttle/escape) +"ba" = ( +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/shuttle/escape) +"bb" = ( +/obj/structure/sign/greencross, +/turf/simulated/shuttle/wall{ + icon_state = "swall12"; + dir = 2 + }, +/area/shuttle/escape) +"bc" = ( +/obj/machinery/light{ + icon_state = "tube1"; + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/shuttle/escape) +"bd" = ( +/obj/item/storage/box/drinkingglasses, +/obj/item/reagent_containers/food/drinks/shaker, +/obj/structure/table/wood, +/obj/machinery/light{ + icon_state = "tube1"; dir = 4 }, /turf/simulated/floor/plasteel{ @@ -150,60 +430,7 @@ dir = 2 }, /area/shuttle/escape) -"aE" = ( -/obj/structure/table/wood, -/turf/simulated/floor/plasteel{ - icon_state = "cafeteria"; - dir = 2 - }, -/area/shuttle/escape) -"aF" = ( -/obj/machinery/status_display{ - pixel_y = 30 - }, -/obj/machinery/light/spot{ - tag = "icon-tube1 (NORTH)"; - icon_state = "tube1"; - dir = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "cafeteria"; - dir = 2 - }, -/area/shuttle/escape) -"aG" = ( -/obj/item/storage/box/drinkingglasses, -/obj/item/reagent_containers/food/drinks/shaker, -/obj/structure/table/wood, -/turf/simulated/floor/plasteel{ - icon_state = "cafeteria"; - dir = 2 - }, -/area/shuttle/escape) -"aH" = ( -/obj/structure/closet/walllocker/emerglocker{ - pixel_x = -28 - }, -/turf/simulated/shuttle/floor4, -/area/shuttle/escape) -"aI" = ( -/turf/simulated/shuttle/floor4, -/area/shuttle/escape) -"aJ" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle{ - icon_state = "15" - }, -/turf/simulated/floor/plating, -/area/shuttle/escape) -"aK" = ( -/obj/structure/chair/comfy/shuttle, -/turf/simulated/floor/plasteel{ - icon_state = "cafeteria"; - dir = 2 - }, -/area/shuttle/escape) -"aL" = ( +"be" = ( /obj/machinery/chem_dispenser/beer, /obj/structure/table/wood, /turf/simulated/floor/plasteel{ @@ -211,24 +438,39 @@ dir = 2 }, /area/shuttle/escape) -"aM" = ( -/obj/machinery/door/airlock/security/glass{ - name = "Escape Shuttle Cell"; - req_access_txt = "2" +"bf" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/food/drinks/mug/med, +/obj/machinery/light{ + icon_state = "tube1"; + dir = 4 }, -/turf/simulated/floor/plating, -/area/shuttle/escape) -"aN" = ( -/obj/item/storage/box/drinkingglasses, -/obj/item/reagent_containers/food/drinks/shaker, -/obj/item/clothing/mask/cigarette/cigar, -/obj/structure/table/wood, +/obj/item/storage/firstaid/machine, /turf/simulated/floor/plasteel{ - icon_state = "cafeteria"; - dir = 2 + dir = 2; + icon_state = "cmo" }, /area/shuttle/escape) -"aO" = ( +"bg" = ( +/obj/machinery/light{ + icon_state = "tube1"; + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/shuttle/escape) +"bh" = ( +/obj/machinery/recharger/wallcharger{ + pixel_x = 0; + pixel_y = -32 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/shuttle/escape) +"bi" = ( /obj/machinery/chem_dispenser/soda, /obj/structure/table/wood, /turf/simulated/floor/plasteel{ @@ -236,410 +478,166 @@ dir = 2 }, /area/shuttle/escape) -"aP" = ( -/obj/machinery/door/airlock/shuttle{ - aiControlDisabled = 1; - hackProof = 1; - id_tag = "s_docking_airlock"; - name = "Shuttle Hatch" - }, -/turf/simulated/floor/plating, -/area/shuttle/escape) -"aQ" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/turf/simulated/shuttle/floor4, -/area/shuttle/escape) -"aR" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "cafeteria"; - dir = 2 - }, -/area/shuttle/escape) -"aS" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall7"; - icon_state = "swall7"; - dir = 2 - }, -/area/shuttle/escape) -"aT" = ( -/obj/docking_port/mobile/emergency{ - dir = 4; - dwidth = 11; - height = 13; - timid = 1; - width = 24 - }, -/obj/machinery/door/airlock/shuttle{ - aiControlDisabled = 1; - hackProof = 1; - id_tag = "s_docking_airlock"; - name = "Shuttle Hatch" - }, -/turf/simulated/shuttle/floor, -/area/shuttle/escape) -"aU" = ( -/turf/simulated/floor/plasteel, -/area/shuttle/escape) -"aV" = ( -/obj/machinery/door/window/southright{ - autoclose = 1; - name = "engineering door"; - req_access_txt = "32" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor2" - }, -/area/shuttle/escape) -"aW" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/shuttle/floor4, -/area/shuttle/escape) -"aX" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor2" - }, -/area/shuttle/escape) -"aY" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) -"aZ" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) -"ba" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor5" - }, -/area/shuttle/escape) -"bb" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/turf/simulated/shuttle/floor4, -/area/shuttle/escape) -"bc" = ( -/obj/machinery/door/window/southright{ - autoclose = 1; - name = "science door"; - req_access_txt = "47" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor5" - }, -/area/shuttle/escape) -"bd" = ( -/obj/machinery/door/window/northleft{ - autoclose = 1; - name = "security door"; +"bj" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Escape Shuttle Cell"; req_access_txt = "2" }, /turf/simulated/shuttle/floor4, /area/shuttle/escape) -"be" = ( -/obj/structure/window/reinforced{ - dir = 1 +"bl" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor2" - }, -/area/shuttle/escape) -"bf" = ( -/obj/item/radio/intercom{ - dir = 8; - name = "station intercom (General)"; - pixel_x = -28 - }, -/obj/machinery/light/spot{ - tag = "icon-tube1 (WEST)"; +/obj/machinery/light{ icon_state = "tube1"; dir = 8 }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, /turf/simulated/shuttle/floor4, /area/shuttle/escape) -"bg" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle{ - icon_state = "8" - }, -/turf/simulated/floor/plating, -/area/shuttle/escape) -"bh" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) -"bi" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) -"bj" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor2" - }, -/area/shuttle/escape) -"bk" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/turf/simulated/shuttle/floor4, -/area/shuttle/escape) -"bl" = ( -/obj/machinery/door/window/northleft{ - autoclose = 1; - name = "medical door"; - req_access_txt = "5" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/escape) -"bm" = ( -/obj/structure/window/reinforced, -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor2" - }, -/area/shuttle/escape) "bn" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor5" +/obj/machinery/light, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" }, /area/shuttle/escape) "bo" = ( -/obj/structure/window/reinforced, -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor2" - }, -/area/shuttle/escape) -"bp" = ( -/obj/structure/window/reinforced, -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) -"bq" = ( -/obj/structure/window/reinforced, -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) -"br" = ( -/obj/structure/window/reinforced, -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor5" - }, -/area/shuttle/escape) -"bs" = ( -/obj/structure/closet/walllocker/emerglocker{ - pixel_x = 28 - }, -/obj/machinery/light/spot{ - tag = "icon-tube1 (EAST)"; - icon_state = "tube1"; - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/escape) -"bt" = ( -/obj/structure/window/reinforced, -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor5" - }, -/area/shuttle/escape) -"bu" = ( -/obj/machinery/light/spot{ - tag = "icon-tube1 (WEST)"; - icon_state = "tube1"; - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) -"bv" = ( -/obj/machinery/light/spot{ - tag = "icon-tube1 (EAST)"; - icon_state = "tube1"; - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) -"bw" = ( /obj/machinery/door/airlock/shuttle{ aiControlDisabled = 1; hackProof = 1; id_tag = "s_docking_airlock"; name = "Shuttle Hatch" }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/plasteel, /area/shuttle/escape) -"bx" = ( -/obj/structure/noticeboard, -/turf/simulated/shuttle/wall{ - icon_state = "swall12"; - dir = 2 - }, -/area/shuttle/escape) -"by" = ( -/obj/machinery/door/airlock/shuttle{ - aiControlDisabled = 1; - hackProof = 1; - id_tag = null; - name = "Shuttle Cargo Hatch" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/escape) -"bz" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/escape) -"bA" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, +"bp" = ( /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor5" +/obj/machinery/light{ + icon_state = "tube1"; + dir = 4 + }, +/turf/simulated/shuttle/floor4, +/area/shuttle/escape) +"bq" = ( +/turf/space, +/turf/simulated/shuttle/wall{ + icon_state = "swall_f5"; + dir = 2 }, /area/shuttle/escape) -"bB" = ( -/obj/structure/table, -/obj/item/storage/firstaid/o2{ - layer = 2.8; - pixel_x = 4; - pixel_y = 6 +"br" = ( +/turf/simulated/shuttle/wall{ + dir = 2; + icon_state = "swallc2" }, -/obj/item/storage/firstaid/regular{ - pixel_x = 2; - pixel_y = 6 - }, -/obj/item/storage/firstaid/regular{ - pixel_x = -2; - pixel_y = 4 - }, -/obj/item/bodybag{ - pixel_x = 5 - }, -/obj/item/storage/firstaid/fire, -/obj/item/storage/firstaid/regular{ - pixel_x = 2; - pixel_y = 3 - }, -/turf/simulated/floor/plasteel, /area/shuttle/escape) -"bC" = ( -/obj/machinery/door/airlock/medical/glass{ - id_tag = null; - name = "Escape Shuttle Infirmary"; - req_access_txt = "0" - }, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) -"bD" = ( +"bs" = ( /turf/simulated/shuttle/wall{ icon_state = "swall11"; dir = 2 }, /area/shuttle/escape) -"bE" = ( +"bt" = ( +/turf/simulated/shuttle/wall{ + icon_state = "swall7"; + dir = 2 + }, +/area/shuttle/escape) +"bu" = ( +/obj/structure/shuttle/engine/heater, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/shuttle/plating, +/area/shuttle/escape) +"bv" = ( +/turf/space, +/turf/simulated/shuttle/wall{ + icon_state = "swall_f9"; + dir = 2 + }, +/area/shuttle/escape) +"bw" = ( +/obj/structure/shuttle/engine/propulsion, +/turf/simulated/shuttle/plating, +/area/shuttle/escape) +"bx" = ( +/obj/machinery/light, +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria"; + dir = 2 + }, +/area/shuttle/escape) +"by" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/simulated/shuttle/floor{ + icon_state = "floor2" + }, +/area/shuttle/escape) +"bz" = ( +/turf/simulated/shuttle/floor{ + icon_state = "floor2" + }, +/area/shuttle/escape) +"bA" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/turf/simulated/shuttle/floor{ + icon_state = "floor2" + }, +/area/shuttle/escape) +"bB" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/simulated/shuttle/floor{ + icon_state = "floor3" + }, +/area/shuttle/escape) +"bC" = ( +/obj/structure/sign/directions/engineering, +/turf/simulated/shuttle/wall{ + icon_state = "swall12"; + dir = 2 + }, +/area/shuttle/escape) +"bD" = ( /obj/machinery/door/airlock/shuttle{ aiControlDisabled = 1; hackProof = 1; id_tag = "s_docking_airlock"; name = "Shuttle Hatch" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor2" +/obj/docking_port/mobile/emergency{ + dir = 4; + dwidth = 11; + height = 18; + timid = 1; + width = 29 + }, +/turf/simulated/floor/plasteel, +/area/shuttle/escape) +"bE" = ( +/obj/machinery/light{ + icon_state = "tube1"; + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "cmo" }, /area/shuttle/escape) "bF" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" +/obj/structure/sign/directions/medical, +/turf/simulated/shuttle/wall{ + icon_state = "swall12"; + dir = 2 }, /area/shuttle/escape) "bG" = ( @@ -656,422 +654,860 @@ }, /area/shuttle/escape) "bI" = ( -/obj/machinery/vending/wallmed{ - layer = 3.3; - name = "Emergency NanoMed"; - pixel_x = 28; - pixel_y = 0; - req_access_txt = "0" +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/simulated/shuttle/floor{ + icon_state = "floor5" }, -/obj/machinery/sleeper, -/turf/simulated/floor/plasteel, /area/shuttle/escape) "bJ" = ( -/obj/item/radio/intercom{ - dir = 4; - name = "station intercom (General)"; - pixel_x = 28 +/turf/simulated/shuttle/floor{ + icon_state = "floor5" }, -/obj/item/extinguisher, -/turf/simulated/floor/plasteel, /area/shuttle/escape) "bK" = ( -/obj/structure/closet/cardboard, -/obj/machinery/light/spot{ - tag = "icon-tube1 (WEST)"; +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/turf/simulated/shuttle/floor{ + icon_state = "floor5" + }, +/area/shuttle/escape) +"bL" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/machinery/light{ icon_state = "tube1"; dir = 8 }, -/turf/simulated/floor/plasteel, +/turf/simulated/shuttle/floor{ + icon_state = "floor2" + }, /area/shuttle/escape) -"bL" = ( -/obj/machinery/recharge_station, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) -"bN" = ( -/obj/structure/bed/roller, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) -"bO" = ( -/obj/machinery/sleeper, -/obj/machinery/light/spot{ - tag = "icon-tube1 (EAST)"; +"bM" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/obj/machinery/light{ icon_state = "tube1"; dir = 4 }, -/turf/simulated/floor/plasteel, +/turf/simulated/shuttle/floor{ + icon_state = "floor2" + }, +/area/shuttle/escape) +"bN" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/machinery/light{ + icon_state = "tube1"; + dir = 8 + }, +/turf/simulated/shuttle/floor{ + icon_state = "floor3" + }, +/area/shuttle/escape) +"bO" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/obj/machinery/light{ + icon_state = "tube1"; + dir = 4 + }, +/turf/simulated/shuttle/floor{ + icon_state = "floor3" + }, /area/shuttle/escape) "bP" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f5"; - dir = 2 +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "bot"; + dir = 1 }, /area/shuttle/escape) "bQ" = ( -/obj/structure/window/reinforced{ +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "bot"; dir = 1 }, -/obj/structure/shuttle/engine/heater, -/turf/simulated/shuttle/plating, /area/shuttle/escape) "bR" = ( -/obj/structure/shuttle/engine/heater, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/shuttle/plating, +/obj/structure/flora/ausbushes/grassybush, +/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/flora/ausbushes/sunnybush, +/obj/structure/window/full/shuttle, +/turf/simulated/floor/grass, /area/shuttle/escape) "bS" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f9"; - dir = 2 +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/machinery/light{ + icon_state = "tube1"; + dir = 8 + }, +/turf/simulated/shuttle/floor{ + icon_state = "floor5" }, /area/shuttle/escape) "bT" = ( -/obj/structure/shuttle/engine/propulsion, -/turf/simulated/shuttle/plating, +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/obj/machinery/light{ + icon_state = "tube1"; + dir = 4 + }, +/turf/simulated/shuttle/floor{ + icon_state = "floor5" + }, /area/shuttle/escape) "bU" = ( -/turf/space, +/obj/structure/sign/directions/science, +/turf/simulated/shuttle/wall{ + icon_state = "swall12"; + dir = 2 + }, +/area/shuttle/escape) +"bV" = ( +/obj/structure/sign/directions/cargo, +/turf/simulated/shuttle/wall{ + icon_state = "swall12"; + dir = 2 + }, +/area/shuttle/escape) +"bW" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/machinery/recharger/wallcharger{ + pixel_x = -24 + }, +/turf/simulated/shuttle/floor4, +/area/shuttle/escape) +"bX" = ( +/obj/machinery/ai_status_display, +/turf/simulated/shuttle/wall{ + icon_state = "swall3"; + dir = 2 + }, +/area/shuttle/escape) +"bY" = ( +/obj/structure/flora/ausbushes/grassybush, +/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/flora/ausbushes/fernybush, +/obj/structure/window/full/shuttle, +/turf/simulated/floor/grass, +/area/shuttle/escape) +"bZ" = ( +/obj/machinery/recharge_station/upgraded, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/shuttle/escape) +"cc" = ( +/obj/structure/extinguisher_cabinet, +/turf/simulated/shuttle/wall{ + icon_state = "swall3"; + dir = 2 + }, +/area/shuttle/escape) +"cf" = ( +/turf/simulated/shuttle/wall{ + icon_state = "swallc4" + }, +/area/shuttle/escape) +"ch" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/item/radio/intercom{ + dir = 8; + name = "station intercom (General)"; + pixel_x = -28 + }, +/obj/machinery/light{ + icon_state = "tube1"; + dir = 8 + }, +/turf/simulated/shuttle/floor4, +/area/shuttle/escape) +"ck" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/obj/machinery/light{ + icon_state = "tube1"; + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "bot"; + dir = 1 + }, +/area/shuttle/escape) +"co" = ( +/obj/machinery/sleeper{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "cmo" + }, +/area/shuttle/escape) +"cp" = ( +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "cmo" + }, +/area/shuttle/escape) +"cw" = ( +/obj/structure/bed/roller, +/obj/machinery/iv_drip, +/turf/simulated/floor/plasteel{ + tag = "icon-whiteblue (EAST)"; + icon_state = "whiteblue"; + dir = 4 + }, +/area/shuttle/escape) +"cx" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/iv_bag/blood/random, +/obj/item/reagent_containers/iv_bag/blood/random, +/obj/item/reagent_containers/iv_bag/blood/random, +/turf/simulated/floor/plasteel{ + tag = "icon-whiteblue (EAST)"; + icon_state = "whiteblue"; + dir = 4 + }, +/area/shuttle/escape) +"cz" = ( +/obj/structure/table/reinforced, +/obj/item/storage/firstaid/o2{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/regular{ + pixel_x = 3; + pixel_y = 3 + }, +/turf/simulated/floor/plasteel{ + tag = "icon-whiteblue (NORTHEAST)"; + icon_state = "whiteblue"; + dir = 5 + }, +/area/shuttle/escape) +"cA" = ( +/obj/machinery/light{ + icon_state = "tube1"; + dir = 8 + }, +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "bot"; + dir = 1 + }, +/area/shuttle/escape) +"cD" = ( +/obj/structure/table/reinforced, +/obj/item/storage/backpack/medic, +/obj/item/storage/belt/medical, +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "cmo" + }, +/area/shuttle/escape) +"cE" = ( +/obj/structure/bed/roller, +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "cmo" + }, +/area/shuttle/escape) +"cG" = ( +/obj/structure/table/reinforced, +/obj/item/clothing/gloves/color/latex/nitrile, +/obj/item/clothing/mask/breath, +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "cmo" + }, +/area/shuttle/escape) +"cH" = ( +/turf/simulated/shuttle/wall{ + icon_state = "wall3" + }, /area/shuttle/escape) (1,1,1) = {" aa aa aa -aa -aa ab -ap -ap -ap +aq +aq +aq aP -aS -aT -ap -aB -bg -aJ -ap -bw -aS -bE +aq +bo +aP +bD +aq ac -ap -bP +ac +ac +aq +bo +aq +bo +bt +aq +ac +ac +aq +aq +bt +bq aa "} (2,1,1) = {" aa aa -ab -ap -ap -aw +aa +av az +bl +az +ac +bW aH -aI -aI -ae -aU -bf -aW -bj -bm -bu -aU -ae -aU -aU -bK -ax +aN +ba +bg bP +bP +bP +ba +ba +aT +ba +bR +bP +cA +bP +bP +bP +av +cH +cH "} (3,1,1) = {" aa -ab -af -aq -aq -ae -aA -aI -aI -aI -ae -aU -bd -aI -be -aV -aU -aU -bx -aU -aU -bL -bQ -bT +aa +aa +ac +aH +aH +aH +bj +aH +aH +aW +ba +ba +ba +ba +ba +ba +ba +ba +ba +bV +ba +ba +ba +ba +ba +av +bu +bw "} (4,1,1) = {" aa -ae -ai -al -aq -ae -az -aI -aI -aQ -ae -aU -bk -bb +aa +aa +av aX -bo -aU -aU -by -aU -aU -bL +bp +aX +ac +aH +aH +aR +ac +aY bQ -bT +bQ +bQ +ba +ba +ba +ba +aL +ba +ba +ba +ba +ba +ac +bu +bw "} (5,1,1) = {" -aa -ae -aj -al +ab aq -ae +ac +bs +aq +bt +aq +cf +aH az -aI -aI -aQ -ae -aU -aB -bg -bg -aJ -aU -aU -aB -bg -bg -aJ -aw -bS +ch +az +ac +bP +bP +bP +ba +ba +ba +bZ +bR +bQ +ck +bQ +bQ +bQ +av +cH +cH "} (6,1,1) = {" -ab -af -ak -al -aq -ax -aB -aJ -aM -aB -aJ -aU -aY -bh -bh -bp -aU -aU -aY -bh -bh -bh +av ae -bU +am +ar +ay +aD +aJ +aH +aH +aH +aH +aH +ac +ba +ba +ba +ba +bn +br +bR +bs +bY +cc +bR +bX +bY +av +cH +cH "} (7,1,1) = {" ac -ag -al -aq -aq -ay -aC -aC -aC -aC -aC -aU -aU -aU -aU -aU -aU -aU -aU -aU -aU -aU -ae -bU +af +an +as +aA +av +aH +aG +aH +aX +bp +aX +ac +bQ +bQ +bQ +ba +ba +bC +by +by +by +bL +by +by +by +av +bu +bw "} (8,1,1) = {" -ad -ah -am -aq -aq -ae -aD -aD -aD -aD -aD -aU +ac +ag +ao +an +bh aZ -bi -bi -bq -aU -aU -aZ -bi -bi -bi -ae -bU +aW +bt +aW +ac +aq +ac +cf +bP +bP +bP +ba +ba +aK +bz +bz +bz +bz +bz +bz +bz +ac +bu +bw "} (9,1,1) = {" -aa -ae +ac +ah +ao +an an -al -aq -ae aE +an aE -aE -aE -aE -aU -aB +ba +ba bg -bg -aJ -aU -aU -aB -bg -bg -aJ -aw -bP +ba +ba +ba +ba +ba +ba +ba +bR +bA +bA +bA +bM +bA +bA +bA +av +cH +cH "} (10,1,1) = {" -aa -ae +ac +ai ao -al -aq -ae -aC -aC -aC -aC -aC -aU -bz -bF +an +an +aE +an +aE ba -br -aU -aU -bC -aU -aU -bN +ba +ba +ba +ba +ba +ba +ba +ba +bn +aZ bR -bT +bR +bY +cc +bR +bX +bY +aw +cH +cH "} (11,1,1) = {" -aa -ad -ah -aq -aq -ae -aF -aK -aN -aR -aC -aU -bl -bG -bn -bc -aU -aU ac -aU -aU +aj +ao +at +an +aD +aF +av +ba +ba +bc +ba +ba +bQ +bQ +bQ +ba +ba +bF bB -bR -bT +bB +bB +bN +bB +bB +bB +av +bu +bw "} (12,1,1) = {" -aa -aa -ad -ap -ap -aw -aG -aL -aO -aR -aC -aU +ac +ak +an +au +aB +aZ +aq bs -bH -bA -bt -bv -aU -ae -bI -bJ -bO -ax -bS +aI +ac +aY +aT +ba +bP +bP +bP +ba +ba +aM +bG +bG +bG +bG +bG +bG +bG +ac +bu +bw "} (13,1,1) = {" +av +al +ap +ax +aC +aD +co +bE +cp +cE +bb +aS +aS +aS +aS +aS +aS +aS +bR +bH +bH +bH +bO +bH +bH +bH +av +cH +cH +"} +(14,1,1) = {" +ad +aq +ac +bt +aq +aQ +co +cp +cp +cp +aI +aS +aU +aU +aU +aU +aS +bx +aZ +bR +bR +bY +cc +bR +bX +bY +aw +cH +cH +"} +(15,1,1) = {" aa aa aa +av +cp +cp +cp +cp +cp +cE +ac +aS +aV +aV +aV +aV +aU +aS +bU +bI +bI +bI +bS +bI +bI +bI +av +bu +bw +"} +(16,1,1) = {" +aa +aa +aa +ac +cp +cp +cp +cp +cp +cw +ac +aS +aS +aS +aS +aV +aU +aS +aO +bJ +bJ +bJ +bJ +bJ +bJ +bJ +ac +bu +bw +"} +(17,1,1) = {" +aa +aa +aa +av +cx +cz +cD +bf +cx +cG +av +aS +bd +be +bi +aV +aU +aS +bR +bK +bK +bK +bT +bK +bK +bK +av +cH +cH +"} +(18,1,1) = {" +aa aa aa ad -ap -ap -ap +aq +aq +aq +aq +aq ac -ap -ap -ap -aB -bg -aJ -ap +bs ac -bD -ap -ap -ap -bS +ac +ac +ac +ac +ac +ac +bs +ac +ac +ac +aq +ac +ac +ac +bs +bv aa "} From 4f30d51a2ca5eaf3687056010451fa90658b65c4 Mon Sep 17 00:00:00 2001 From: Kyep Date: Tue, 21 Jul 2020 19:57:06 -0700 Subject: [PATCH 02/10] small tweaks --- _maps/map_files/shuttles/emergency_dept.dmm | 49 ++++++++++++--------- 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/_maps/map_files/shuttles/emergency_dept.dmm b/_maps/map_files/shuttles/emergency_dept.dmm index 6a90c7ba45c..65e2e0b88fd 100644 --- a/_maps/map_files/shuttles/emergency_dept.dmm +++ b/_maps/map_files/shuttles/emergency_dept.dmm @@ -314,12 +314,10 @@ }, /area/shuttle/escape) "aO" = ( -/obj/machinery/door/airlock/research{ - name = "Escape Shuttle Research"; - req_access_txt = "47" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor5" +/mob/living/simple_animal/bot/secbot, +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria"; + dir = 2 }, /area/shuttle/escape) "aP" = ( @@ -463,8 +461,8 @@ /area/shuttle/escape) "bh" = ( /obj/machinery/recharger/wallcharger{ - pixel_x = 0; - pixel_y = -32 + pixel_x = 5; + pixel_y = -28 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -485,6 +483,15 @@ }, /turf/simulated/shuttle/floor4, /area/shuttle/escape) +"bk" = ( +/obj/machinery/door/airlock/research/glass{ + name = "Escape Shuttle Research"; + req_access_txt = "47" + }, +/turf/simulated/shuttle/floor{ + icon_state = "floor5" + }, +/area/shuttle/escape) "bl" = ( /obj/structure/chair/comfy/shuttle{ dir = 4 @@ -495,6 +502,15 @@ }, /turf/simulated/shuttle/floor4, /area/shuttle/escape) +"bm" = ( +/obj/machinery/sleeper/upgraded{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "cmo" + }, +/area/shuttle/escape) "bn" = ( /obj/machinery/light, /turf/simulated/floor/plasteel{ @@ -857,15 +873,6 @@ dir = 1 }, /area/shuttle/escape) -"co" = ( -/obj/machinery/sleeper{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "cmo" - }, -/area/shuttle/escape) "cp" = ( /turf/simulated/floor/plasteel{ dir = 2; @@ -1332,7 +1339,7 @@ ap ax aC aD -co +bm bE cp cE @@ -1363,7 +1370,7 @@ ac bt aq aQ -co +bm cp cp cp @@ -1437,7 +1444,7 @@ aS aV aU aS -aO +bk bJ bJ bJ @@ -1467,7 +1474,7 @@ be bi aV aU -aS +aO bR bK bK From d4f02a591411a4a5b88d184b3b4679fee673d960 Mon Sep 17 00:00:00 2001 From: Kyep Date: Wed, 22 Jul 2020 02:05:59 -0700 Subject: [PATCH 03/10] updated based on affecteds suggestions --- _maps/map_files/shuttles/emergency_dept.dmm | 583 ++++++++++---------- 1 file changed, 302 insertions(+), 281 deletions(-) diff --git a/_maps/map_files/shuttles/emergency_dept.dmm b/_maps/map_files/shuttles/emergency_dept.dmm index 65e2e0b88fd..3257194c720 100644 --- a/_maps/map_files/shuttles/emergency_dept.dmm +++ b/_maps/map_files/shuttles/emergency_dept.dmm @@ -240,12 +240,9 @@ /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/obj/machinery/light{ - icon_state = "tube1"; - dir = 4 - }, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 2; + icon_state = "cmo" }, /area/shuttle/escape) "aG" = ( @@ -272,35 +269,44 @@ "aJ" = ( /obj/structure/table/reinforced, /obj/item/storage/fancy/donut_box, +/obj/machinery/light{ + dir = 1; + on = 1 + }, +/obj/item/restraints/handcuffs, /turf/simulated/shuttle/floor4, /area/shuttle/escape) "aK" = ( -/obj/machinery/door/airlock/engineering/glass{ - name = "Escape Shuttle Engineering"; - req_access_txt = "32"; - req_one_access_txt = "0" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor2" +/obj/structure/table/reinforced, +/obj/item/storage/firstaid/adv, +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "cmo" }, /area/shuttle/escape) "aL" = ( -/obj/machinery/door/airlock/mining/glass{ - name = "Escape Shuttle Cargo"; - req_access_txt = "50" +/obj/machinery/door/airlock/medical/glass{ + id_tag = null; + name = "Escape Shuttle Infirmary"; + normalspeed = 0; + req_access_txt = "5" }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" + dir = 2; + icon_state = "cmo" }, /area/shuttle/escape) "aM" = ( -/obj/machinery/door/airlock/medical/glass{ - name = "Escape Shuttle Medical"; - req_access_txt = "5" +/obj/machinery/light{ + icon_state = "tube1"; + dir = 8 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "cmo" }, /area/shuttle/escape) "aN" = ( @@ -334,10 +340,10 @@ }, /area/shuttle/escape) "aR" = ( -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swallc1" +/obj/structure/chair/comfy/shuttle{ + dir = 1 }, +/turf/simulated/shuttle/floor4, /area/shuttle/escape) "aS" = ( /turf/simulated/floor/plasteel{ @@ -369,6 +375,7 @@ "aW" = ( /obj/machinery/door/airlock/security/glass{ name = "Escape Shuttle Brig"; + normalspeed = 0; req_access_txt = "63" }, /turf/simulated/shuttle/floor4, @@ -406,13 +413,14 @@ }, /area/shuttle/escape) "bc" = ( +/obj/structure/bed/roller, /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 1; + on = 1 }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" + dir = 2; + icon_state = "cmo" }, /area/shuttle/escape) "bd" = ( @@ -438,11 +446,6 @@ /area/shuttle/escape) "bf" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/mug/med, -/obj/machinery/light{ - icon_state = "tube1"; - dir = 4 - }, /obj/item/storage/firstaid/machine, /turf/simulated/floor/plasteel{ dir = 2; @@ -450,14 +453,11 @@ }, /area/shuttle/escape) "bg" = ( -/obj/machinery/light{ - icon_state = "tube1"; - dir = 8 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" +/obj/structure/chair/comfy/shuttle{ + dir = 1 }, +/obj/machinery/light, +/turf/simulated/shuttle/floor4, /area/shuttle/escape) "bh" = ( /obj/machinery/recharger/wallcharger{ @@ -479,17 +479,20 @@ "bj" = ( /obj/machinery/door/airlock/security/glass{ name = "Escape Shuttle Cell"; + normalspeed = 0; req_access_txt = "2" }, /turf/simulated/shuttle/floor4, /area/shuttle/escape) "bk" = ( -/obj/machinery/door/airlock/research/glass{ - name = "Escape Shuttle Research"; - req_access_txt = "47" +/obj/machinery/door/airlock/mining/glass{ + name = "Escape Shuttle Cargo"; + normalspeed = 0; + req_access_txt = "50" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor5" +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" }, /area/shuttle/escape) "bl" = ( @@ -512,10 +515,9 @@ }, /area/shuttle/escape) "bn" = ( -/obj/machinery/light, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" +/obj/structure/table/reinforced, +/turf/simulated/shuttle/floor{ + icon_state = "floor2" }, /area/shuttle/escape) "bo" = ( @@ -545,9 +547,11 @@ }, /area/shuttle/escape) "br" = ( -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swallc2" +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/turf/simulated/shuttle/floor{ + icon_state = "floor2" }, /area/shuttle/escape) "bs" = ( @@ -583,8 +587,8 @@ "bx" = ( /obj/machinery/light, /turf/simulated/floor/plasteel{ - icon_state = "cafeteria"; - dir = 2 + dir = 2; + icon_state = "cmo" }, /area/shuttle/escape) "by" = ( @@ -609,11 +613,9 @@ }, /area/shuttle/escape) "bB" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, +/obj/structure/table/reinforced, /turf/simulated/shuttle/floor{ - icon_state = "floor3" + icon_state = "floor5" }, /area/shuttle/escape) "bC" = ( @@ -640,33 +642,40 @@ /turf/simulated/floor/plasteel, /area/shuttle/escape) "bE" = ( -/obj/machinery/light{ - icon_state = "tube1"; - dir = 8 +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/turf/simulated/shuttle/floor{ + icon_state = "floor5" + }, +/area/shuttle/escape) +"bF" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cmo" }, /area/shuttle/escape) -"bF" = ( -/obj/structure/sign/directions/medical, -/turf/simulated/shuttle/wall{ - icon_state = "swall12"; - dir = 2 - }, -/area/shuttle/escape) "bG" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor3" +/obj/item/twohanded/required/kirbyplants, +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "cmo" }, /area/shuttle/escape) "bH" = ( /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" +/obj/machinery/light{ + icon_state = "tube1"; + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "cmo" }, /area/shuttle/escape) "bI" = ( @@ -715,27 +724,26 @@ }, /area/shuttle/escape) "bN" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 1; + on = 1 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" }, /area/shuttle/escape) "bO" = ( /obj/structure/chair/comfy/shuttle{ - dir = 8 + dir = 4 }, /obj/machinery/light{ icon_state = "tube1"; - dir = 4 + dir = 8 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" +/turf/simulated/floor/plasteel{ + icon_state = "bot"; + dir = 1 }, /area/shuttle/escape) "bP" = ( @@ -833,6 +841,24 @@ icon_state = "neutralfull" }, /area/shuttle/escape) +"ca" = ( +/obj/machinery/light, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/shuttle/escape) +"cb" = ( +/obj/machinery/door/airlock/engineering/glass{ + name = "Escape Shuttle Engineering"; + normalspeed = 0; + req_access_txt = "32"; + req_one_access_txt = "0" + }, +/turf/simulated/shuttle/floor{ + icon_state = "floor2" + }, +/area/shuttle/escape) "cc" = ( /obj/structure/extinguisher_cabinet, /turf/simulated/shuttle/wall{ @@ -840,26 +866,21 @@ dir = 2 }, /area/shuttle/escape) +"cd" = ( +/obj/machinery/door/airlock/research/glass{ + name = "Escape Shuttle Research"; + normalspeed = 0; + req_access_txt = "47" + }, +/turf/simulated/shuttle/floor{ + icon_state = "floor5" + }, +/area/shuttle/escape) "cf" = ( /turf/simulated/shuttle/wall{ icon_state = "swallc4" }, /area/shuttle/escape) -"ch" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/obj/item/radio/intercom{ - dir = 8; - name = "station intercom (General)"; - pixel_x = -28 - }, -/obj/machinery/light{ - icon_state = "tube1"; - dir = 8 - }, -/turf/simulated/shuttle/floor4, -/area/shuttle/escape) "ck" = ( /obj/structure/chair/comfy/shuttle{ dir = 8 @@ -1004,12 +1025,12 @@ bW aH aN ba -bg +bP +bO bP bP bP ba -ba aT ba bR @@ -1063,18 +1084,18 @@ bp aX ac aH -aH aR -ac -aY +av +ba +bQ +bQ +bQ bQ bQ bQ ba ba -ba -ba -aL +bk ba ba ba @@ -1094,17 +1115,17 @@ bt aq cf aH -az -ch -az -ac +aR +av +ba +bP +bP +bP bP bP bP ba ba -ba -bZ bR bQ ck @@ -1123,26 +1144,26 @@ ar ay aD aJ +az aH -aH -aH -aH -aH -ac +bg +av +bN ba ba ba ba -bn -br -bR -bs +ba +ba +ba +ca +aZ bY cc bR bX bY -av +aw cH cH "} @@ -1156,23 +1177,23 @@ av aH aG aH -aX -bp -aX -ac +aR +av +ba +bQ +bQ +bQ bQ bQ bQ ba ba -bC -by -by +bR by bL by by -by +bn av bu bw @@ -1188,23 +1209,23 @@ aW bt aW ac -aq -ac cf +ba +bP +bP +bP bP bP bP ba ba -aK +bC bz bz bz bz -bz -bz -bz -ac +br +av bu bw "} @@ -1219,7 +1240,6 @@ an aE ba ba -bg ba ba ba @@ -1227,15 +1247,16 @@ ba ba ba ba -bR -bA -bA -bA -bM -bA -bA -bA -av +ba +ba +ba +cb +bz +bz +bz +bz +br +ac cH cH "} @@ -1252,21 +1273,21 @@ ba ba ba ba +aS +aU +aU +aU +aU +aS ba ba -ba -ba -ba -bn -aZ bR -bR -bY -cc -bR -bX -bY -aw +bz +bz +bz +bz +br +av cH cH "} @@ -1277,26 +1298,26 @@ ao at an aD -aF -av +aq +bs +aI +ac +aY +ba +aO +aV +aV +aV +aV +aU ba ba -bc -ba -ba -bQ -bQ -bQ -ba -ba -bF -bB -bB -bB -bN -bB -bB -bB +bR +bA +bM +bA +bA +bn av bu bw @@ -1307,28 +1328,28 @@ ak an au aB +av +bm +cp +cp +cp +bb +bN +aS +aS +aS +aS +aV +aU +ba +ca aZ -aq -bs -aI -ac -aY -aT -ba -bP -bP -bP -ba -ba -aM -bG -bG -bG -bG -bG -bG -bG -ac +bY +cc +bR +bX +bY +aw bu bw "} @@ -1340,25 +1361,25 @@ ax aC aD bm -bE cp -cE -bb -aS -aS -aS -aS -aS -aS +cp +cp +aI +ba aS +bd +be +bi +aV +aU +ba +ba bR -bH -bH -bH -bO -bH -bH -bH +bI +bS +bI +bI +bB av cH cH @@ -1370,27 +1391,27 @@ ac bt aq aQ -bm +bc cp cp -cp -aI -aS -aU -aU -aU -aU -aS bx aZ -bR -bR -bY -cc -bR -bX -bY -aw +aq +aq +aq +aq +aq +aq +aY +ba +ba +bU +bJ +bJ +bJ +bJ +bE +av cH cH "} @@ -1399,29 +1420,29 @@ aa aa aa av +cz +cD +cw cp cp cp -cp -cp -cE ac -aS -aV -aV -aV -aV -aU -aS -bU -bI -bI -bI -bS -bI -bI -bI -av +bF +bF +aM +bF +bF +cp +aL +ba +ba +cd +bJ +bJ +bJ +bJ +bE +ac bu bw "} @@ -1430,29 +1451,29 @@ aa aa aa ac +cG cp cp cp cp cp -cw -ac -aS -aS -aS -aS -aV -aU -aS -bk +aL +cp +cp +cp +cp +cp +cp +av +ba +ba +bR bJ bJ bJ bJ -bJ -bJ -bJ -ac +bE +av bu bw "} @@ -1462,27 +1483,27 @@ aa aa av cx -cz -cD -bf cx -cG +aK +cw +cE +bf +ac +aF +aF +bH +aF +aF +bG av -aS -bd -be -bi -aV -aU -aO +bZ +bZ bR bK -bK -bK bT bK bK -bK +bB av cH cH @@ -1506,10 +1527,10 @@ ac ac ac ac +ac +ac bs ac -ac -ac aq ac ac From 8e7b490a298f195a0ec57c105a00be4d44793722 Mon Sep 17 00:00:00 2001 From: Kyep Date: Wed, 22 Jul 2020 02:09:11 -0700 Subject: [PATCH 04/10] tweak south medical door --- _maps/map_files/shuttles/emergency_dept.dmm | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/_maps/map_files/shuttles/emergency_dept.dmm b/_maps/map_files/shuttles/emergency_dept.dmm index 3257194c720..45cc6be1ead 100644 --- a/_maps/map_files/shuttles/emergency_dept.dmm +++ b/_maps/map_files/shuttles/emergency_dept.dmm @@ -658,13 +658,6 @@ icon_state = "cmo" }, /area/shuttle/escape) -"bG" = ( -/obj/item/twohanded/required/kirbyplants, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "cmo" - }, -/area/shuttle/escape) "bH" = ( /obj/structure/chair/comfy/shuttle{ dir = 8 @@ -1432,8 +1425,8 @@ bF aM bF bF -cp -aL +bF +av ba ba cd @@ -1464,7 +1457,7 @@ cp cp cp cp -av +aL ba ba bR @@ -1494,7 +1487,7 @@ aF bH aF aF -bG +aF av bZ bZ From 7c32fd3268fd0a0b5023af6efeefe9742b3ef76f Mon Sep 17 00:00:00 2001 From: Kyep Date: Wed, 22 Jul 2020 02:18:53 -0700 Subject: [PATCH 05/10] symmetry --- _maps/map_files/shuttles/emergency_dept.dmm | 40 ++++++++++++--------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/_maps/map_files/shuttles/emergency_dept.dmm b/_maps/map_files/shuttles/emergency_dept.dmm index 45cc6be1ead..8724f5992e4 100644 --- a/_maps/map_files/shuttles/emergency_dept.dmm +++ b/_maps/map_files/shuttles/emergency_dept.dmm @@ -408,8 +408,8 @@ "bb" = ( /obj/structure/sign/greencross, /turf/simulated/shuttle/wall{ - icon_state = "swall12"; - dir = 2 + dir = 2; + icon_state = "swallc3" }, /area/shuttle/escape) "bc" = ( @@ -658,6 +658,14 @@ icon_state = "cmo" }, /area/shuttle/escape) +"bG" = ( +/obj/machinery/status_display, +/turf/simulated/shuttle/wall{ + tag = "icon-swall14"; + icon_state = "swall14"; + dir = 2 + }, +/area/shuttle/escape) "bH" = ( /obj/structure/chair/comfy/shuttle{ dir = 8 @@ -1198,8 +1206,8 @@ ao an bh aZ -aW -bt +aq +aq aW ac cf @@ -1230,6 +1238,9 @@ an an aE an +an +an +an aE ba ba @@ -1240,9 +1251,6 @@ ba ba ba ba -ba -ba -ba cb bz bz @@ -1261,11 +1269,11 @@ an an aE an +an +an +an aE ba -ba -ba -ba aS aU aU @@ -1290,12 +1298,12 @@ aj ao at an -aD +bG aq -bs -aI +aq +aL ac -aY +bb ba aO aV @@ -1326,8 +1334,8 @@ bm cp cp cp -bb -bN +aI +ba aS aS aS From d25c5487b09f56d8eb7c7e163f451b652668d5ab Mon Sep 17 00:00:00 2001 From: Kyep Date: Wed, 22 Jul 2020 02:23:36 -0700 Subject: [PATCH 06/10] more symmetry --- _maps/map_files/shuttles/emergency_dept.dmm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_maps/map_files/shuttles/emergency_dept.dmm b/_maps/map_files/shuttles/emergency_dept.dmm index 8724f5992e4..ad9701362b0 100644 --- a/_maps/map_files/shuttles/emergency_dept.dmm +++ b/_maps/map_files/shuttles/emergency_dept.dmm @@ -1085,8 +1085,8 @@ bp aX ac aH -aR -av +aH +aW ba bQ bQ From 716091557d5ac4c5864627c5ab6153a699de822d Mon Sep 17 00:00:00 2001 From: Kyep Date: Wed, 22 Jul 2020 19:45:41 -0700 Subject: [PATCH 07/10] right tile --- _maps/map_files/shuttles/emergency_dept.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/map_files/shuttles/emergency_dept.dmm b/_maps/map_files/shuttles/emergency_dept.dmm index ad9701362b0..1ba450b5040 100644 --- a/_maps/map_files/shuttles/emergency_dept.dmm +++ b/_maps/map_files/shuttles/emergency_dept.dmm @@ -1527,7 +1527,7 @@ ac ac ac ac -ac +bs ac ac bs From 0adaaf1445791f5b018b88f0b6a9c30d427e657f Mon Sep 17 00:00:00 2001 From: Kyep Date: Sun, 26 Jul 2020 15:25:45 -0700 Subject: [PATCH 08/10] affected midsection --- _maps/map_files/shuttles/emergency_dept.dmm | 447 ++++++++++++-------- 1 file changed, 264 insertions(+), 183 deletions(-) diff --git a/_maps/map_files/shuttles/emergency_dept.dmm b/_maps/map_files/shuttles/emergency_dept.dmm index 1ba450b5040..28a9d158662 100644 --- a/_maps/map_files/shuttles/emergency_dept.dmm +++ b/_maps/map_files/shuttles/emergency_dept.dmm @@ -269,21 +269,9 @@ "aJ" = ( /obj/structure/table/reinforced, /obj/item/storage/fancy/donut_box, -/obj/machinery/light{ - dir = 1; - on = 1 - }, /obj/item/restraints/handcuffs, /turf/simulated/shuttle/floor4, /area/shuttle/escape) -"aK" = ( -/obj/structure/table/reinforced, -/obj/item/storage/firstaid/adv, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "cmo" - }, -/area/shuttle/escape) "aL" = ( /obj/machinery/door/airlock/medical/glass{ id_tag = null; @@ -333,12 +321,6 @@ dir = 2 }, /area/shuttle/escape) -"aQ" = ( -/obj/machinery/defibrillator_mount/loaded, -/turf/simulated/shuttle/wall{ - icon_state = "swallc4" - }, -/area/shuttle/escape) "aR" = ( /obj/structure/chair/comfy/shuttle{ dir = 1 @@ -386,12 +368,6 @@ }, /turf/simulated/shuttle/floor4, /area/shuttle/escape) -"aY" = ( -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swallc3" - }, -/area/shuttle/escape) "aZ" = ( /turf/simulated/shuttle/wall{ tag = "icon-swall14"; @@ -446,10 +422,19 @@ /area/shuttle/escape) "bf" = ( /obj/structure/table/reinforced, -/obj/item/storage/firstaid/machine, +/obj/item/storage/firstaid/o2{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/toxin{ + pixel_x = 5; + pixel_y = 5 + }, /turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "cmo" + tag = "icon-whiteblue (NORTHEAST)"; + icon_state = "whiteblue"; + dir = 5 }, /area/shuttle/escape) "bg" = ( @@ -585,10 +570,13 @@ /turf/simulated/shuttle/plating, /area/shuttle/escape) "bx" = ( +/obj/structure/bed/roller, +/obj/machinery/iv_drip, /obj/machinery/light, /turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "cmo" + tag = "icon-whiteblue (EAST)"; + icon_state = "whiteblue"; + dir = 4 }, /area/shuttle/escape) "by" = ( @@ -724,16 +712,6 @@ icon_state = "floor2" }, /area/shuttle/escape) -"bN" = ( -/obj/machinery/light{ - dir = 1; - on = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/shuttle/escape) "bO" = ( /obj/structure/chair/comfy/shuttle{ dir = 4 @@ -910,34 +888,6 @@ dir = 4 }, /area/shuttle/escape) -"cx" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/iv_bag/blood/random, -/obj/item/reagent_containers/iv_bag/blood/random, -/obj/item/reagent_containers/iv_bag/blood/random, -/turf/simulated/floor/plasteel{ - tag = "icon-whiteblue (EAST)"; - icon_state = "whiteblue"; - dir = 4 - }, -/area/shuttle/escape) -"cz" = ( -/obj/structure/table/reinforced, -/obj/item/storage/firstaid/o2{ - pixel_x = -3; - pixel_y = -3 - }, -/obj/item/storage/firstaid/regular, -/obj/item/storage/firstaid/regular{ - pixel_x = 3; - pixel_y = 3 - }, -/turf/simulated/floor/plasteel{ - tag = "icon-whiteblue (NORTHEAST)"; - icon_state = "whiteblue"; - dir = 5 - }, -/area/shuttle/escape) "cA" = ( /obj/machinery/light{ icon_state = "tube1"; @@ -981,17 +931,148 @@ icon_state = "wall3" }, /area/shuttle/escape) +"cS" = ( +/turf/simulated/shuttle/wall{ + icon_state = "swall12"; + dir = 2 + }, +/area/space) +"dI" = ( +/turf/space, +/turf/simulated/shuttle/wall{ + icon_state = "swall_f10"; + dir = 2 + }, +/area/space) +"eJ" = ( +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "cmo" + }, +/area/space) +"ir" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/simulated/shuttle/floor4, +/area/space) +"lz" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/turf/simulated/shuttle/floor4, +/area/space) +"mp" = ( +/obj/machinery/defibrillator_mount/loaded, +/turf/simulated/shuttle/wall{ + icon_state = "swall12"; + dir = 2 + }, +/area/shuttle/escape) +"sD" = ( +/obj/structure/chair/comfy/shuttle, +/obj/machinery/light{ + dir = 1; + on = 1 + }, +/turf/simulated/shuttle/floor4, +/area/shuttle/escape) +"sX" = ( +/obj/machinery/door/airlock/medical/glass{ + id_tag = null; + name = "Escape Shuttle Medical Seating"; + normalspeed = 0; + req_access_txt = "5" + }, +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "cmo" + }, +/area/shuttle/escape) +"xB" = ( +/turf/simulated/shuttle/floor4, +/area/space) +"yd" = ( +/obj/structure/table/reinforced, +/obj/item/storage/firstaid/machine{ + pixel_x = -5; + pixel_y = -5 + }, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/adv{ + pixel_x = 5; + pixel_y = 5 + }, +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "cmo" + }, +/area/shuttle/escape) +"Ex" = ( +/turf/space, +/turf/simulated/shuttle/wall{ + icon_state = "swall_f6"; + dir = 2 + }, +/area/space) +"Fu" = ( +/turf/simulated/shuttle/wall{ + icon_state = "swall3"; + dir = 2 + }, +/area/space) +"Jk" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "cmo" + }, +/area/space) +"Qt" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "cmo" + }, +/area/space) +"Qu" = ( +/obj/structure/grille, +/obj/structure/window/full/shuttle, +/turf/simulated/floor/plating, +/area/space) +"Wi" = ( +/obj/structure/chair/comfy/shuttle, +/turf/simulated/shuttle/floor4, +/area/shuttle/escape) +"XD" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/iv_bag/blood/random, +/obj/item/reagent_containers/iv_bag/blood/random, +/obj/item/reagent_containers/iv_bag/blood/random, +/obj/item/reagent_containers/iv_bag/blood/random, +/obj/item/reagent_containers/iv_bag/blood/random, +/obj/item/reagent_containers/iv_bag/blood/random, +/turf/simulated/floor/plasteel{ + tag = "icon-whiteblue (EAST)"; + icon_state = "whiteblue"; + dir = 4 + }, +/area/shuttle/escape) (1,1,1) = {" aa -aa -aa -ab -aq -aq +Ex +Fu +ac aq aP aq +aq +aq bo aP bD @@ -1015,14 +1096,14 @@ aa "} (2,1,1) = {" aa -aa -aa -av -az +cS +ir bl az ac +az bW +az aH aN ba @@ -1046,15 +1127,15 @@ cH "} (3,1,1) = {" aa -aa -aa -ac -aH +Qu +xB aH aH bj aH aH +aH +aH aW ba ba @@ -1077,15 +1158,15 @@ bw "} (4,1,1) = {" aa -aa -aa -av -aX +cS +lz bp aX ac aH aH +aH +aH aW ba bQ @@ -1108,15 +1189,15 @@ bw "} (5,1,1) = {" ab -aq -ac bs aq -bt aq -cf +aq +aw +sD aH -aR +aH +bg av ba bP @@ -1145,11 +1226,11 @@ ar ay aD aJ -az aH -bg -av -bN +aH +aR +aD +ba ba ba ba @@ -1158,7 +1239,7 @@ ba ba ba ca -aZ +bG bY cc bR @@ -1175,7 +1256,7 @@ an as aA av -aH +Wi aG aH aR @@ -1274,12 +1355,12 @@ an an aE ba -aS -aU -aU -aU -aU -aS +ba +ba +ba +ba +ba +ba ba ba bR @@ -1298,19 +1379,19 @@ aj ao at an -bG +aZ aq aq aL ac bb ba -aO -aV -aV -aV -aV -aU +bQ +bQ +bQ +bQ +bQ +bQ ba ba bR @@ -1336,15 +1417,15 @@ cp cp aI ba -aS -aS -aS -aS -aV -aU +bP +bP +bP +bP +bP +bP ba ca -aZ +bG bY cc bR @@ -1367,12 +1448,12 @@ cp cp aI ba -aS -bd -be -bi -aV -aU +ba +ba +ba +ba +ba +ba ba ba bR @@ -1387,23 +1468,23 @@ cH "} (14,1,1) = {" ad -aq -ac bt aq -aQ +aq +aq +aw bc cp cp bx -aZ -aq -aq -aq -aq -aq -aq -aY +av +ba +aS +aU +aU +aU +aU +aS ba ba bU @@ -1418,24 +1499,24 @@ cH "} (15,1,1) = {" aa -aa -aa -av -cz -cD -cw -cp -cp -cp -ac -bF -bF +cS +Qt aM bF -bF -bF +mp +cE +cp +cp +cw av ba +aO +aV +aV +aV +aV +aU +ba ba cd bJ @@ -1449,23 +1530,23 @@ bw "} (16,1,1) = {" aa -aa -aa -ac -cG +Qu +eJ +cp +cp +sX cp cp cp -cp -cp -aL -cp -cp -cp -cp -cp -cp -aL +XD +av +ba +aS +aS +aS +aS +aV +aU ba ba bR @@ -1480,23 +1561,23 @@ bw "} (17,1,1) = {" aa -aa -aa -av -cx -cx -aK -cw -cE -bf -ac -aF -aF +cS +Jk bH aF -aF -aF av +cG +yd +cD +bf +av +aT +aS +bd +be +bi +aV +aU bZ bZ bR @@ -1511,15 +1592,15 @@ cH "} (18,1,1) = {" aa -aa -aa -ad -aq -aq -aq -aq -aq +dI +Fu ac +aq +bs +aq +aq +aq +aq bs ac ac @@ -1527,7 +1608,7 @@ ac ac ac ac -bs +aq ac ac bs From 217ee6d358ab244e6025b91edcf3aa303767ad6c Mon Sep 17 00:00:00 2001 From: Kyep Date: Sun, 26 Jul 2020 15:59:22 -0700 Subject: [PATCH 09/10] symmetry for doors --- _maps/map_files/shuttles/emergency_dept.dmm | 186 ++++++-------------- 1 file changed, 58 insertions(+), 128 deletions(-) diff --git a/_maps/map_files/shuttles/emergency_dept.dmm b/_maps/map_files/shuttles/emergency_dept.dmm index 28a9d158662..12227bfb1bb 100644 --- a/_maps/map_files/shuttles/emergency_dept.dmm +++ b/_maps/map_files/shuttles/emergency_dept.dmm @@ -931,53 +931,7 @@ icon_state = "wall3" }, /area/shuttle/escape) -"cS" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall12"; - dir = 2 - }, -/area/space) -"dI" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f10"; - dir = 2 - }, -/area/space) -"eJ" = ( -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "cmo" - }, -/area/space) -"ir" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/shuttle/floor4, -/area/space) -"lz" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/turf/simulated/shuttle/floor4, -/area/space) -"mp" = ( -/obj/machinery/defibrillator_mount/loaded, -/turf/simulated/shuttle/wall{ - icon_state = "swall12"; - dir = 2 - }, -/area/shuttle/escape) -"sD" = ( -/obj/structure/chair/comfy/shuttle, -/obj/machinery/light{ - dir = 1; - on = 1 - }, -/turf/simulated/shuttle/floor4, -/area/shuttle/escape) -"sX" = ( +"sc" = ( /obj/machinery/door/airlock/medical/glass{ id_tag = null; name = "Escape Shuttle Medical Seating"; @@ -989,10 +943,21 @@ icon_state = "cmo" }, /area/shuttle/escape) -"xB" = ( -/turf/simulated/shuttle/floor4, -/area/space) -"yd" = ( +"xD" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/iv_bag/blood/random, +/obj/item/reagent_containers/iv_bag/blood/random, +/obj/item/reagent_containers/iv_bag/blood/random, +/obj/item/reagent_containers/iv_bag/blood/random, +/obj/item/reagent_containers/iv_bag/blood/random, +/obj/item/reagent_containers/iv_bag/blood/random, +/turf/simulated/floor/plasteel{ + tag = "icon-whiteblue (EAST)"; + icon_state = "whiteblue"; + dir = 4 + }, +/area/shuttle/escape) +"PY" = ( /obj/structure/table/reinforced, /obj/item/storage/firstaid/machine{ pixel_x = -5; @@ -1008,65 +973,30 @@ icon_state = "cmo" }, /area/shuttle/escape) -"Ex" = ( -/turf/space, +"Qf" = ( +/obj/machinery/defibrillator_mount/loaded, /turf/simulated/shuttle/wall{ - icon_state = "swall_f6"; + icon_state = "swall12"; dir = 2 }, -/area/space) -"Fu" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall3"; - dir = 2 - }, -/area/space) -"Jk" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "cmo" - }, -/area/space) -"Qt" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "cmo" - }, -/area/space) -"Qu" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle, -/turf/simulated/floor/plating, -/area/space) -"Wi" = ( +/area/shuttle/escape) +"UN" = ( /obj/structure/chair/comfy/shuttle, /turf/simulated/shuttle/floor4, /area/shuttle/escape) -"XD" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/iv_bag/blood/random, -/obj/item/reagent_containers/iv_bag/blood/random, -/obj/item/reagent_containers/iv_bag/blood/random, -/obj/item/reagent_containers/iv_bag/blood/random, -/obj/item/reagent_containers/iv_bag/blood/random, -/obj/item/reagent_containers/iv_bag/blood/random, -/turf/simulated/floor/plasteel{ - tag = "icon-whiteblue (EAST)"; - icon_state = "whiteblue"; - dir = 4 +"Wy" = ( +/obj/structure/chair/comfy/shuttle, +/obj/machinery/light{ + dir = 1; + on = 1 }, +/turf/simulated/shuttle/floor4, /area/shuttle/escape) (1,1,1) = {" aa -Ex -Fu +ab +aq ac aq aP @@ -1096,8 +1026,8 @@ aa "} (2,1,1) = {" aa -cS -ir +av +az bl az ac @@ -1127,8 +1057,8 @@ cH "} (3,1,1) = {" aa -Qu -xB +ac +aH aH aH bj @@ -1136,7 +1066,7 @@ aH aH aH aH -aW +av ba ba ba @@ -1158,16 +1088,16 @@ bw "} (4,1,1) = {" aa -cS -lz +av +aX bp aX ac aH aH aH -aH -aW +aR +av ba bQ bQ @@ -1194,7 +1124,7 @@ aq aq aq aw -sD +Wy aH aH bg @@ -1228,8 +1158,8 @@ aD aJ aH aH -aR -aD +aH +aW ba ba ba @@ -1256,11 +1186,11 @@ an as aA av -Wi +UN aG aH -aR -av +aH +aW ba bQ bQ @@ -1499,11 +1429,11 @@ cH "} (15,1,1) = {" aa -cS -Qt +av +bF aM bF -mp +Qf cE cp cp @@ -1530,15 +1460,15 @@ bw "} (16,1,1) = {" aa -Qu -eJ -cp -cp -sX +ac cp cp cp -XD +sc +cp +cp +cp +xD av ba aS @@ -1561,13 +1491,13 @@ bw "} (17,1,1) = {" aa -cS -Jk +av +aF bH aF av cG -yd +PY cD bf av @@ -1592,8 +1522,8 @@ cH "} (18,1,1) = {" aa -dI -Fu +ad +aq ac aq bs From 77f041ae58d0a9367d96eab265b91b556829e803 Mon Sep 17 00:00:00 2001 From: Kyep Date: Tue, 11 Aug 2020 06:55:21 -0700 Subject: [PATCH 10/10] tweak last engine bits --- _maps/map_files/shuttles/emergency_dept.dmm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/_maps/map_files/shuttles/emergency_dept.dmm b/_maps/map_files/shuttles/emergency_dept.dmm index 12227bfb1bb..fb479c23995 100644 --- a/_maps/map_files/shuttles/emergency_dept.dmm +++ b/_maps/map_files/shuttles/emergency_dept.dmm @@ -1207,8 +1207,8 @@ by by bn av -bu -bw +cH +cH "} (8,1,1) = {" ac @@ -1269,8 +1269,8 @@ bz bz br ac -cH -cH +bu +bw "} (10,1,1) = {" ac @@ -1300,8 +1300,8 @@ bz bz br av -cH -cH +bu +bw "} (11,1,1) = {" ac @@ -1362,8 +1362,8 @@ bR bX bY aw -bu -bw +cH +cH "} (13,1,1) = {" av