From b5aec4d98f55399abe1fc383cdadba07aa61209f Mon Sep 17 00:00:00 2001 From: Nichlas Pihl Date: Tue, 24 Oct 2017 17:16:31 +0200 Subject: [PATCH 01/21] Adds buyable shuttles --- code/__HELPERS/lists.dm | 8 ++++ code/controllers/subsystem/shuttles.dm | 3 +- code/datums/shuttles.dm | 8 ++++ .../game/machinery/computer/communications.dm | 39 +++++++++++++++++++ 4 files changed, 57 insertions(+), 1 deletion(-) diff --git a/code/__HELPERS/lists.dm b/code/__HELPERS/lists.dm index 21e9c73582..fab82a881e 100644 --- a/code/__HELPERS/lists.dm +++ b/code/__HELPERS/lists.dm @@ -391,6 +391,14 @@ if(islist(.[i])) .[i] = .(.[i]) +//Flattens a keyed list into a list of it's contents +/proc/flatten_list(list/key_list) + if(!islist(key_list)) + return null + . = list() + for(var/key in key_list) + . |= key_list[key] + //Picks from the list, with some safeties, and returns the "default" arg if it fails #define DEFAULTPICK(L, default) ((istype(L, /list) && L:len) ? pick(L) : default) diff --git a/code/controllers/subsystem/shuttles.dm b/code/controllers/subsystem/shuttles.dm index 9a027260b3..82f15e56ae 100644 --- a/code/controllers/subsystem/shuttles.dm +++ b/code/controllers/subsystem/shuttles.dm @@ -34,6 +34,8 @@ var/datum/subsystem/shuttle/SSshuttle var/datum/round_event/shuttle_loan/shuttle_loan + var/shuttle_purchased = FALSE //If the station has purchased a replacement escape shuttle this round + var/list/cooldown_ids = list() @@ -253,4 +255,3 @@ var/datum/subsystem/shuttle/SSshuttle centcom_message = SSshuttle.centcom_message ordernum = SSshuttle.ordernum points = SSshuttle.points - diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm index 103f492b90..5dde9415f5 100644 --- a/code/datums/shuttles.dm +++ b/code/datums/shuttles.dm @@ -8,6 +8,8 @@ var/description var/admin_notes + var/credit_cost = INFINITY + /datum/map_template/shuttle/New() shuttle_id = "[port_id]_[suffix]" mappath = "[prefix][shuttle_id].dmm" @@ -49,6 +51,7 @@ small gambling table." admin_notes = "Bardrone should be controlled by a player, either admin \ or ghost, has modified drone laws, can speak human and see normally." + credit_cost = 5000 /datum/map_template/shuttle/emergency/birdboat suffix = "birdboat" @@ -72,6 +75,7 @@ admin_notes = "Brig is replaced by anchored greentext book surrounded by \ lavaland chasms, stationside door has been removed to prevent \ accidental dropping." + credit_cost = 8000 /datum/map_template/shuttle/emergency/cramped suffix = "cramped" @@ -90,10 +94,12 @@ /datum/map_template/shuttle/emergency/meta suffix = "meta" name = "Meta emergency shuttle" + credit_cost = 4000 /datum/map_template/shuttle/emergency/mini suffix = "mini" name = "Mini emergency shuttle" + credit_cost = 1000 /datum/map_template/shuttle/emergency/narnar suffix = "narnar" @@ -138,6 +144,7 @@ description = "The Nanotrasen Emergency Shuttle Port(NES Port for short) \ is a shuttle used at other less known nanotrasen facilities \ and has a more open inside for larger crowds." + credit_cost = 3000 /datum/map_template/shuttle/emergency/wabbajack suffix = "wabbajack" @@ -151,6 +158,7 @@ admin_notes = "If the crew can solve the puzzle, they will wake the \ wabbajack statue. It will likely not end well. There's a reason it's \ boarded up. Maybe they should have just left it alone." + credit_cost = 15000 /datum/map_template/shuttle/emergency/yogstation suffix = "yogstation" diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 9961cbaaca..d2cf3d531b 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -30,6 +30,7 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 var/const/STATE_ALERT_LEVEL = 8 var/const/STATE_CONFIRM_LEVEL = 9 var/const/STATE_TOGGLE_EMERGENCY = 10 + var/const/STATE_PURCHASE = 11 var/status_display_freq = "1435" var/stat_msg1 @@ -118,6 +119,35 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 else if (src.authenticated==2 && message_cooldown) to_chat(usr, "Intercomms recharging. Please stand by.") + if("purchase_menu") + src.state = STATE_PURCHASE + + if("buyshuttle") + if(src.authenticated==2) + var/list/shuttles = flatten_list(shuttle_templates) + var/datum/map_template/shuttle/S = locate(href_list["chosen_shuttle"]) in shuttles + if(S && istype(S)) + if(SSshuttle.shuttle_purchased) + usr << "A replacement shuttle has already been purchased." + else + if(SSshuttle.points >= S.credit_cost) + var/obj/machinery/shuttle_manipulator/M = locate() in machines + if(M) + SSshuttle.shuttle_purchased = TRUE + M.unload_preview() + M.load_template(S) + M.existing_shuttle = SSshuttle.emergency + M.action_load(S) + SSshuttle.points -= S.credit_cost + minor_announce("[usr.name] has purchased [S.name] for [S.credit_cost] credits." , "Shuttle Purchase") + message_admins("[key_name_admin(usr)] purchased [S.name].") + feedback_add_details("shuttle_manipulator", S.name) + else + usr << "Something went wrong! The shuttle exchange system seems to be down." + else + usr << "Not enough credits." + + if("callshuttle") src.state = STATE_DEFAULT if(src.authenticated) @@ -387,6 +417,7 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 if (src.authenticated==2) dat += "

Captain Functions" dat += "
\[ Make a Captain's Announcement \]" + dat += "
\[ Purchase Shuttle \]" dat += "
\[ Change Alert Level \]" dat += "
\[ Emergency Maintenance Access \]" dat += "
\[ Request Nuclear Authentication Codes \]" @@ -450,6 +481,14 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 else dat += "Emergency Maintenance Access is currently DISABLED" dat += "
Lift access restrictions on maintenance and external airlocks?
\[ OK | Cancel \]" + if(STATE_PURCHASE) + dat += "Budget: [SSshuttle.points] Credits.
" + for(var/shuttle_id in shuttle_templates) + var/datum/map_template/shuttle/S = shuttle_templates[shuttle_id] + if(S.credit_cost < INFINITY) + dat += "[S.name] | [S.credit_cost] Credits
" + dat += "[S.description]
" + dat += "(Purchase)
" dat += "

\[ [(src.state != STATE_DEFAULT) ? "Main Menu | " : ""]Close \]" //user << browse(dat, "window=communications;size=400x500") From f401cf419c99c6adc95a76fea35ceb6ddfd4df03 Mon Sep 17 00:00:00 2001 From: Nichlas Pihl Date: Tue, 24 Oct 2017 19:34:59 +0200 Subject: [PATCH 02/21] Removes the "griefy" "bad" shuttles. I'll just send snappop as an admin instead :^) --- code/datums/shuttles.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm index 5dde9415f5..170e5c7e56 100644 --- a/code/datums/shuttles.dm +++ b/code/datums/shuttles.dm @@ -75,7 +75,6 @@ admin_notes = "Brig is replaced by anchored greentext book surrounded by \ lavaland chasms, stationside door has been removed to prevent \ accidental dropping." - credit_cost = 8000 /datum/map_template/shuttle/emergency/cramped suffix = "cramped" @@ -158,7 +157,6 @@ admin_notes = "If the crew can solve the puzzle, they will wake the \ wabbajack statue. It will likely not end well. There's a reason it's \ boarded up. Maybe they should have just left it alone." - credit_cost = 15000 /datum/map_template/shuttle/emergency/yogstation suffix = "yogstation" From 6174ab4c1666c77a3aa99b09c5d01dca9d14def6 Mon Sep 17 00:00:00 2001 From: Nichlas Pihl Date: Thu, 26 Oct 2017 15:06:00 +0200 Subject: [PATCH 03/21] Adds the asteroid shuttle, and changes the prices --- _maps/shuttles/emergency_asteroid.dmm | 99 +++++++++++++++++++++++++++ code/datums/shuttles.dm | 9 +-- code/modules/shuttle/emergency.dm | 3 + 3 files changed, 107 insertions(+), 4 deletions(-) create mode 100644 _maps/shuttles/emergency_asteroid.dmm diff --git a/_maps/shuttles/emergency_asteroid.dmm b/_maps/shuttles/emergency_asteroid.dmm new file mode 100644 index 0000000000..7cd3d6ec3a --- /dev/null +++ b/_maps/shuttles/emergency_asteroid.dmm @@ -0,0 +1,99 @@ +"aa" = (/turf/open/space,/area/space) +"ab" = (/turf/closed/wall/shuttle,/area/shuttle/escape) +"ac" = (/obj/structure/grille,/obj/structure/window/shuttle,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"ad" = (/obj/structure/bed,/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"ae" = (/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"af" = (/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"ag" = (/obj/structure/bed,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"ah" = (/obj/machinery/door/airlock/glass_security{name = "Emergency Shuttle Brig"; req_access_txt = "2"},/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"ai" = (/obj/machinery/door/airlock/glass_medical{id_tag = null; name = "Escape Shuttle Infirmary"; req_access_txt = "5"},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"aj" = (/obj/structure/chair,/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"ak" = (/obj/machinery/light/built{tag = "icon-tube1 (EAST)"; icon_state = "tube1"; dir = 4},/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"al" = (/obj/machinery/light/built{tag = "icon-tube1 (WEST)"; icon_state = "tube1"; dir = 8},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"am" = (/obj/machinery/sleeper,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"an" = (/obj/structure/closet/secure_closet/medical2,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"ao" = (/obj/structure/table,/obj/item/weapon/surgical_drapes,/obj/item/weapon/circular_saw,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"ap" = (/obj/machinery/door/airlock/shuttle,/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"aq" = (/obj/structure/table/optable,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"ar" = (/obj/structure/chair{dir = 1},/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"as" = (/obj/structure/chair{dir = 1},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 0; pixel_y = -30},/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"at" = (/obj/machinery/computer/security,/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"au" = (/obj/machinery/computer/crew,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"av" = (/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 0; pixel_y = -30},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"aw" = (/obj/structure/table,/obj/item/weapon/hemostat,/obj/item/weapon/retractor,/obj/item/weapon/scalpel,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"ax" = (/obj/structure/bed/roller,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"ay" = (/obj/structure/closet/emcloset,/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = -30},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"az" = (/obj/structure/chair{dir = 1},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aA" = (/obj/structure/closet,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aB" = (/obj/structure/table,/obj/item/weapon/storage/firstaid/fire,/obj/item/weapon/storage/firstaid/regular,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aC" = (/obj/structure/chair{dir = 8},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aD" = (/obj/structure/chair{dir = 4},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aE" = (/obj/structure/table,/obj/item/weapon/crowbar,/obj/item/weapon/extinguisher,/obj/machinery/recharger,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aF" = (/obj/machinery/door/airlock/shuttle,/obj/docking_port/mobile/emergency{dheight = 0; dir = 4; dwidth = 10; height = 13; name = "Asteroid emergency shuttle"; timid = 1; width = 28},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"aG" = (/obj/machinery/light/built{tag = "icon-tube1 (EAST)"; icon_state = "tube1"; dir = 4},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aH" = (/obj/structure/chair{dir = 4},/obj/machinery/light/built{tag = "icon-tube1 (WEST)"; icon_state = "tube1"; dir = 8},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aI" = (/obj/structure/chair{dir = 8},/obj/structure/extinguisher_cabinet{pixel_x = 30},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aJ" = (/obj/structure/chair{dir = 8},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aK" = (/obj/machinery/door/airlock/shuttle,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"aL" = (/obj/structure/table,/obj/item/weapon/crowbar,/obj/item/weapon/extinguisher,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aM" = (/obj/structure/chair,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aN" = (/obj/structure/closet/emcloset,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aO" = (/obj/structure/extinguisher_cabinet{pixel_x = -30},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"aP" = (/obj/machinery/door/airlock/glass_mining{name = "Emergency Shuttle Storage"},/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) +"aQ" = (/obj/machinery/door/airlock/glass_command{name = "Emergency Shuttle Cockpit"; req_access_txt = "19"},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aR" = (/obj/machinery/door/airlock{name = "Emergency Shuttle Restroom"},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"aS" = (/obj/machinery/recharge_station,/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) +"aT" = (/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) +"aU" = (/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = -30},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aV" = (/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aW" = (/obj/structure/extinguisher_cabinet{pixel_x = 30},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aX" = (/obj/machinery/disposal/bin/toilet{dir = 8},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"aY" = (/obj/machinery/door/airlock/shuttle,/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) +"aZ" = (/obj/structure/chair/office/light{dir = 4; name = "Head of Security"},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"ba" = (/obj/structure/table,/obj/item/weapon/pen,/obj/item/weapon/folder/blue,/obj/machinery/recharger,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"bb" = (/obj/structure/chair/office/light{dir = 8; name = "Chief Medical Officer"},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"bc" = (/obj/structure/ore_box,/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) +"bd" = (/obj/machinery/light/built{tag = "icon-tube1 (EAST)"; icon_state = "tube1"; dir = 4},/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) +"be" = (/obj/structure/chair/office/light{dir = 4; name = "Captain"},/obj/machinery/light/built{tag = "icon-tube1 (WEST)"; icon_state = "tube1"; dir = 8},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"bf" = (/obj/machinery/computer/shuttle,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"bg" = (/obj/structure/chair/office/light{dir = 8; name = "Head of Personnel"},/obj/machinery/light/built{tag = "icon-tube1 (EAST)"; icon_state = "tube1"; dir = 4},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"bh" = (/obj/machinery/suit_storage_unit,/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) +"bi" = (/obj/structure/chair/office/light{dir = 4; name = "Chief Engineer"},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"bj" = (/obj/structure/table,/obj/item/weapon/paper_bin,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"bk" = (/obj/structure/chair/office/light{dir = 8; name = "Research Director"},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"bl" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/structure/mirror{pixel_x = 30},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"bm" = (/obj/structure/shuttle/engine/heater,/turf/open/floor/plating/airless,/area/shuttle/escape) +"bn" = (/obj/structure/shuttle/engine/propulsion,/turf/open/floor/plating/airless,/area/shuttle/escape) +"bo" = (/obj/machinery/computer/station_alert,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"bp" = (/obj/machinery/computer/communications,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) + +(1,1,1) = {" +aaaaaaababacabacababaaaaaa +aaaaababadaeacafagababaaaa +ababababacahabaiacabababab +abajajajaeakabalafamanaoab +apaeaeaeaeaeacafafafafaqac +abarasaraeatabauafafavawab +abababacahacabacaiacababab +aaababaxafafafafafaxababaa +aaaaabayafazazazafaAabaaaa +acacabaBafaCacaDafaEabaaaa +aFafafafafaCacaDafaGabaaaa +acacabaHafaCacaDafaIabaaaa +aaaaacaDafaCacaDafaCacaaaa +aaaaacaDafafafafafaCacaaaa +aaaaacaDafaCacaDafaCacaaaa +acacabaHafaCacaDafaJabaaaa +aKafafafafaCacaDafaGabaaaa +acacabaLafaCacaDafaBabaaaa +aaaaabaAafaMaMaMafaNabaaaa +aaababaOafafafafafafababaa +abababaPababaQababaRababab +acaSaTaTabaUaVaWabafaRaXac +aYaTaTaTabaZbabbabafababab +acbcaTbdabbebfbgabalaRaXac +abababbhabbibjbkabblababab +abbmabababaVaVaVabababbmab +abbnabbmabboaVbpabbmabbnab +aaaaabbnabacacacabbnabaaaa +"} diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm index 170e5c7e56..5798c80fc4 100644 --- a/code/datums/shuttles.dm +++ b/code/datums/shuttles.dm @@ -42,6 +42,7 @@ /datum/map_template/shuttle/emergency/asteroid suffix = "asteroid" name = "Asteroid emergency shuttle" + credit_cost = 20000 /datum/map_template/shuttle/emergency/bar suffix = "bar" @@ -51,7 +52,7 @@ small gambling table." admin_notes = "Bardrone should be controlled by a player, either admin \ or ghost, has modified drone laws, can speak human and see normally." - credit_cost = 5000 + credit_cost = 25000 /datum/map_template/shuttle/emergency/birdboat suffix = "birdboat" @@ -93,12 +94,12 @@ /datum/map_template/shuttle/emergency/meta suffix = "meta" name = "Meta emergency shuttle" - credit_cost = 4000 + credit_cost = 15000 /datum/map_template/shuttle/emergency/mini suffix = "mini" name = "Mini emergency shuttle" - credit_cost = 1000 + credit_cost = 10000 /datum/map_template/shuttle/emergency/narnar suffix = "narnar" @@ -143,7 +144,7 @@ description = "The Nanotrasen Emergency Shuttle Port(NES Port for short) \ is a shuttle used at other less known nanotrasen facilities \ and has a more open inside for larger crowds." - credit_cost = 3000 + credit_cost = 12500 /datum/map_template/shuttle/emergency/wabbajack suffix = "wabbajack" diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm index 3d9f4f8351..596d033d42 100644 --- a/code/modules/shuttle/emergency.dm +++ b/code/modules/shuttle/emergency.dm @@ -195,6 +195,9 @@ . = ..() +/obj/docking_port/mobile/emergency/canDock(obj/docking_port/stationary/S) + return FALSE //If the emergency shuttle can't move, the whole game breaks, so it will force itself to land even if it has to crush a few departments in the process + /obj/docking_port/mobile/emergency/timeLeft(divisor) if(divisor <= 0) divisor = 10 From 395fa7ed70d02d3d2d223aba9a12c92b49131f44 Mon Sep 17 00:00:00 2001 From: Nichlas Pihl Date: Fri, 27 Oct 2017 17:33:43 +0200 Subject: [PATCH 04/21] Changed prices again --- code/datums/shuttles.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm index 5798c80fc4..b19b2671c2 100644 --- a/code/datums/shuttles.dm +++ b/code/datums/shuttles.dm @@ -42,7 +42,7 @@ /datum/map_template/shuttle/emergency/asteroid suffix = "asteroid" name = "Asteroid emergency shuttle" - credit_cost = 20000 + credit_cost = 10000 /datum/map_template/shuttle/emergency/bar suffix = "bar" @@ -52,7 +52,7 @@ small gambling table." admin_notes = "Bardrone should be controlled by a player, either admin \ or ghost, has modified drone laws, can speak human and see normally." - credit_cost = 25000 + credit_cost = 15000 /datum/map_template/shuttle/emergency/birdboat suffix = "birdboat" @@ -94,12 +94,12 @@ /datum/map_template/shuttle/emergency/meta suffix = "meta" name = "Meta emergency shuttle" - credit_cost = 15000 + credit_cost = 7500 /datum/map_template/shuttle/emergency/mini suffix = "mini" name = "Mini emergency shuttle" - credit_cost = 10000 + credit_cost = 6000 /datum/map_template/shuttle/emergency/narnar suffix = "narnar" @@ -144,7 +144,7 @@ description = "The Nanotrasen Emergency Shuttle Port(NES Port for short) \ is a shuttle used at other less known nanotrasen facilities \ and has a more open inside for larger crowds." - credit_cost = 12500 + credit_cost = 7500 /datum/map_template/shuttle/emergency/wabbajack suffix = "wabbajack" From 2647e77020f8805607bac82edc9db68239a9b9c4 Mon Sep 17 00:00:00 2001 From: Nichlas Pihl Date: Fri, 27 Oct 2017 17:56:31 +0200 Subject: [PATCH 05/21] Fixes the asteroid shuttle --- _maps/shuttles/emergency_asteroid.dmm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/_maps/shuttles/emergency_asteroid.dmm b/_maps/shuttles/emergency_asteroid.dmm index 7cd3d6ec3a..ca68dfa9cb 100644 --- a/_maps/shuttles/emergency_asteroid.dmm +++ b/_maps/shuttles/emergency_asteroid.dmm @@ -8,8 +8,8 @@ "ah" = (/obj/machinery/door/airlock/glass_security{name = "Emergency Shuttle Brig"; req_access_txt = "2"},/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) "ai" = (/obj/machinery/door/airlock/glass_medical{id_tag = null; name = "Escape Shuttle Infirmary"; req_access_txt = "5"},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) "aj" = (/obj/structure/chair,/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) -"ak" = (/obj/machinery/light/built{tag = "icon-tube1 (EAST)"; icon_state = "tube1"; dir = 4},/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) -"al" = (/obj/machinery/light/built{tag = "icon-tube1 (WEST)"; icon_state = "tube1"; dir = 8},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"ak" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"al" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) "am" = (/obj/machinery/sleeper,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) "an" = (/obj/structure/closet/secure_closet/medical2,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) "ao" = (/obj/structure/table,/obj/item/weapon/surgical_drapes,/obj/item/weapon/circular_saw,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) @@ -30,8 +30,8 @@ "aD" = (/obj/structure/chair{dir = 4},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) "aE" = (/obj/structure/table,/obj/item/weapon/crowbar,/obj/item/weapon/extinguisher,/obj/machinery/recharger,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) "aF" = (/obj/machinery/door/airlock/shuttle,/obj/docking_port/mobile/emergency{dheight = 0; dir = 4; dwidth = 10; height = 13; name = "Asteroid emergency shuttle"; timid = 1; width = 28},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) -"aG" = (/obj/machinery/light/built{tag = "icon-tube1 (EAST)"; icon_state = "tube1"; dir = 4},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"aH" = (/obj/structure/chair{dir = 4},/obj/machinery/light/built{tag = "icon-tube1 (WEST)"; icon_state = "tube1"; dir = 8},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aG" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aH" = (/obj/structure/chair{dir = 4},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) "aI" = (/obj/structure/chair{dir = 8},/obj/structure/extinguisher_cabinet{pixel_x = 30},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) "aJ" = (/obj/structure/chair{dir = 8},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) "aK" = (/obj/machinery/door/airlock/shuttle,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) @@ -53,10 +53,10 @@ "ba" = (/obj/structure/table,/obj/item/weapon/pen,/obj/item/weapon/folder/blue,/obj/machinery/recharger,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) "bb" = (/obj/structure/chair/office/light{dir = 8; name = "Chief Medical Officer"},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) "bc" = (/obj/structure/ore_box,/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) -"bd" = (/obj/machinery/light/built{tag = "icon-tube1 (EAST)"; icon_state = "tube1"; dir = 4},/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) -"be" = (/obj/structure/chair/office/light{dir = 4; name = "Captain"},/obj/machinery/light/built{tag = "icon-tube1 (WEST)"; icon_state = "tube1"; dir = 8},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"bd" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) +"be" = (/obj/structure/chair/office/light{dir = 4; name = "Captain"},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) "bf" = (/obj/machinery/computer/shuttle,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"bg" = (/obj/structure/chair/office/light{dir = 8; name = "Head of Personnel"},/obj/machinery/light/built{tag = "icon-tube1 (EAST)"; icon_state = "tube1"; dir = 4},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"bg" = (/obj/structure/chair/office/light{dir = 8; name = "Head of Personnel"},/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) "bh" = (/obj/machinery/suit_storage_unit,/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) "bi" = (/obj/structure/chair/office/light{dir = 4; name = "Chief Engineer"},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) "bj" = (/obj/structure/table,/obj/item/weapon/paper_bin,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) From 878f7aaa2351d3f8fdfb8ba4a193676653a7084a Mon Sep 17 00:00:00 2001 From: Nichlas Pihl Date: Fri, 27 Oct 2017 18:33:38 +0200 Subject: [PATCH 06/21] Adds the pubby station shuttle --- _maps/shuttles/emergency_pubby.dmm | 75 ++++++++++++++++++++++++++++++ code/datums/shuttles.dm | 6 +++ 2 files changed, 81 insertions(+) create mode 100644 _maps/shuttles/emergency_pubby.dmm diff --git a/_maps/shuttles/emergency_pubby.dmm b/_maps/shuttles/emergency_pubby.dmm new file mode 100644 index 0000000000..24b62de2d2 --- /dev/null +++ b/_maps/shuttles/emergency_pubby.dmm @@ -0,0 +1,75 @@ +"aa" = (/turf/open/space,/area/space) +"ab" = (/turf/closed/wall/shuttle/smooth,/area/shuttle/escape) +"ac" = (/obj/structure/grille,/obj/structure/window/shuttle/tinted,/turf/open/floor/plating,/area/shuttle/escape) +"ad" = (/obj/structure/table,/obj/item/weapon/storage/firstaid,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"ae" = (/obj/machinery/computer/emergency_shuttle,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"af" = (/obj/structure/table,/obj/machinery/recharger,/obj/structure/extinguisher_cabinet{pixel_x = 30},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"ag" = (/turf/closed/wall/shuttle/smooth/nodiagonal,/area/shuttle/escape) +"ah" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"ai" = (/obj/structure/chair/comfy{tag = "icon-comfychair (NORTH)"; icon_state = "comfychair"; dir = 1},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aj" = (/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"ak" = (/obj/structure/closet,/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) +"al" = (/obj/machinery/recharge_station,/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) +"am" = (/obj/machinery/vending/cola,/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) +"an" = (/obj/machinery/computer/atmos_alert,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"ao" = (/obj/structure/chair{dir = 8},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"ap" = (/obj/structure/chair{dir = 4},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aq" = (/obj/machinery/computer/security,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"ar" = (/obj/structure/chair,/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"as" = (/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) +"at" = (/obj/structure/extinguisher_cabinet{pixel_x = 30},/obj/machinery/light/small{dir = 4},/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) +"au" = (/obj/machinery/computer/crew,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"av" = (/obj/machinery/computer/communications,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"aw" = (/obj/machinery/flasher{id = "shuttleflash"; pixel_x = -25; pixel_y = 7},/obj/machinery/button/flasher{id = "shuttleflash"; pixel_x = -25; pixel_y = -7},/obj/machinery/light/small{dir = 8},/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"ax" = (/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"ay" = (/obj/machinery/door/airlock/shuttle,/obj/docking_port/mobile/emergency{dwidth = 5; height = 15; timid = 1; width = 18},/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) +"az" = (/obj/structure/reagent_dispensers/fueltank,/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) +"aA" = (/obj/machinery/door/airlock/glass{name = "Emergency Shuttle Cockpit"; req_access_txt = "19"},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aB" = (/obj/structure/chair{dir = 1},/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"aC" = (/obj/machinery/door/airlock/shuttle,/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"aD" = (/obj/machinery/door/airlock/glass{name = "Emergency Shuttle Cargo Hold"},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aE" = (/obj/structure/flora/kirbyplants,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aF" = (/obj/machinery/door/airlock/glass{name = "Emergency Shuttle Brig"; req_access_txt = "2"},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aG" = (/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"aH" = (/obj/machinery/light{dir = 1},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aI" = (/obj/structure/chair{dir = 4},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"aJ" = (/obj/structure/chair{dir = 8},/obj/structure/window{icon_state = "rwindow"; dir = 4},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"aK" = (/obj/structure/chair{dir = 4},/obj/structure/window{icon_state = "rwindow"; dir = 8},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"aL" = (/turf/open/floor/carpet,/area/shuttle/escape) +"aM" = (/obj/structure/chair/comfy,/turf/open/floor/carpet,/area/shuttle/escape) +"aN" = (/obj/structure/chair{dir = 8},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"aO" = (/obj/structure/chair/comfy{tag = "icon-comfychair (EAST)"; icon_state = "comfychair"; dir = 4},/turf/open/floor/carpet,/area/shuttle/escape) +"aP" = (/obj/structure/table/wood/poker,/obj/item/toy/cards/deck,/turf/open/floor/carpet,/area/shuttle/escape) +"aQ" = (/obj/structure/chair/comfy{tag = "icon-comfychair (WEST)"; icon_state = "comfychair"; dir = 8},/turf/open/floor/carpet,/area/shuttle/escape) +"aR" = (/obj/structure/chair/comfy{tag = "icon-comfychair (NORTH)"; icon_state = "comfychair"; dir = 1},/turf/open/floor/carpet,/area/shuttle/escape) +"aS" = (/obj/machinery/door/airlock/shuttle,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"aT" = (/obj/machinery/light,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aU" = (/obj/machinery/door/airlock/glass{name = "Emergency Shuttle Infirmary"},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aV" = (/obj/machinery/sleeper{icon_state = "sleeper-open"; dir = 4},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"aW" = (/obj/machinery/vending/medical,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"aX" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"aY" = (/obj/structure/table,/obj/item/weapon/storage/firstaid,/obj/item/weapon/storage/firstaid/fire,/obj/item/weapon/crowbar,/obj/structure/sign/nosmoking_2{pixel_x = 30},/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"aZ" = (/obj/structure/shuttle/engine/heater,/obj/structure/window/shuttle/tinted,/turf/open/floor/plating,/area/shuttle/escape) +"ba" = (/obj/structure/table,/obj/item/weapon/defibrillator/loaded,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"bb" = (/obj/structure/shuttle/engine/propulsion,/turf/open/floor/plating,/area/shuttle/escape) + +(1,1,1) = {" +aaaaaaaaaaabacacacabaaaaaaaaaa +aaaaaaaaaaabadaeafabaaaaaaaaaa +abababababagahaiajagababababab +acakalamabanaoajapaqabarararac +acasasatabauaoajapavabawaxaxac +ayasasazababacaAacababaBaxaxaC +agacaDacagaEajajajaEagacaFacag +abaGajajaHajajajajajaHajajaGab +acaIajaJaKajaLaMaLajaJaKajaNac +acaIajaJaKajaOaPaQajaJaKajaNac +abaIajaJaKajaLaRaLajaJaKajaNab +aSaGajajaTajajajajajaTajajaGaS +abaIajajagabacaUacabagajajaNab +aSaGajaNabaVaGaGaGaWabaIajaGaS +abaIajaNabaXaGaGaIaYabaIajaNab +abaZaZaZabaVaGaGaIbaabaZaZaZab +abbbbbbbabaZaZaZaZaZabbbbbbbab +aaaaaaaaabbbbbbbbbbbabaaaaaaaa +"} diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm index b19b2671c2..37cc112401 100644 --- a/code/datums/shuttles.dm +++ b/code/datums/shuttles.dm @@ -164,6 +164,12 @@ name = "The Undying Classic" description = "The old and faithful Yogstation shuttle." +/datum/map_template/shuttle/emergency/pubby + suffix = "pubby" + name = "Puppy Station Emergency Shuttle" + description = "A small, but feature complete shuttle. It boasts a card table to keep crew members occupied on the long flight home." + credit_cost = 7500 + /datum/map_template/shuttle/ferry/base suffix = "base" name = "transport ferry" From 897352878008a7540cb266b517a183b929de274a Mon Sep 17 00:00:00 2001 From: Nichlas Pihl Date: Sat, 28 Oct 2017 02:36:50 +0200 Subject: [PATCH 07/21] Adds the deltastation shuttle --- _maps/shuttles/emergency_delta.dmm | 154 +++++++++++++++++++++ code/datums/shuttles.dm | 6 + code/game/turfs/simulated/walls_mineral.dm | 40 ++++++ icons/turf/walls/plastitanium_wall.dmi | Bin 0 -> 2914 bytes yogstation.dme | 1 + 5 files changed, 201 insertions(+) create mode 100644 _maps/shuttles/emergency_delta.dmm create mode 100644 icons/turf/walls/plastitanium_wall.dmi diff --git a/_maps/shuttles/emergency_delta.dmm b/_maps/shuttles/emergency_delta.dmm new file mode 100644 index 0000000000..c6b419fe12 --- /dev/null +++ b/_maps/shuttles/emergency_delta.dmm @@ -0,0 +1,154 @@ +"aa" = (/turf/open/space,/area/space) +"ab" = (/turf/closed/wall/shuttle/smooth,/area/shuttle/escape) +"ac" = (/obj/structure/grille,/obj/structure/window/shuttle,/turf/open/floor/plating,/area/shuttle/escape) +"ad" = (/obj/structure/table/reinforced,/obj/item/weapon/paper_bin,/obj/item/weapon/pen,/turf/open/floor/plasteel/vault{tag = "icon-vault (EAST)"; icon_state = "vault"; dir = 4},/area/shuttle/escape) +"ae" = (/obj/structure/table/reinforced,/obj/item/weapon/folder/red,/obj/item/device/assembly/flash,/obj/item/weapon/restraints/handcuffs,/turf/open/floor/plasteel/vault,/area/shuttle/escape) +"af" = (/obj/machinery/computer/crew,/turf/open/floor/plasteel/darkblue/side{tag = "icon-darkblue (NORTH)"; icon_state = "darkblue"; dir = 1},/area/shuttle/escape) +"ag" = (/obj/machinery/computer/med_data,/turf/open/floor/plasteel/darkblue/side{tag = "icon-darkblue (NORTHEAST)"; icon_state = "darkblue"; dir = 5},/area/shuttle/escape) +"ah" = (/obj/machinery/computer/emergency_shuttle,/turf/open/floor/plasteel/darkblue/side{tag = "icon-darkblue (NORTHWEST)"; icon_state = "darkblue"; dir = 9},/area/shuttle/escape) +"ai" = (/obj/machinery/computer/communications,/turf/open/floor/plasteel/darkblue/side{tag = "icon-darkblue (NORTH)"; icon_state = "darkblue"; dir = 1},/area/shuttle/escape) +"aj" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/toolbox/mechanical,/turf/open/floor/plasteel/vault,/area/shuttle/escape) +"ak" = (/obj/structure/table/reinforced,/obj/machinery/cell_charger,/obj/item/weapon/stock_parts/cell/high,/turf/open/floor/plasteel/vault{tag = "icon-vault (EAST)"; icon_state = "vault"; dir = 4},/area/shuttle/escape) +"al" = (/obj/machinery/computer/secure_data,/turf/open/floor/plasteel/darkred/side{tag = "icon-darkred (NORTHWEST)"; icon_state = "darkred"; dir = 9},/area/shuttle/escape) +"am" = (/obj/structure/chair/office/dark{dir = 8},/turf/open/floor/plasteel/vault,/area/shuttle/escape) +"an" = (/obj/structure/chair/office/dark{dir = 1},/turf/open/floor/plasteel/vault,/area/shuttle/escape) +"ao" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/firstaid,/turf/open/floor/plasteel/vault,/area/shuttle/escape) +"ap" = (/obj/structure/table/reinforced,/obj/item/weapon/pen,/obj/item/weapon/folder/blue,/turf/open/floor/plasteel/vault,/area/shuttle/escape) +"aq" = (/obj/structure/chair/office/dark{dir = 4},/turf/open/floor/plasteel/vault,/area/shuttle/escape) +"ar" = (/obj/machinery/computer/atmos_alert,/turf/open/floor/plasteel/darkyellow/side{tag = "icon-darkyellow (NORTHEAST)"; icon_state = "darkyellow"; dir = 5},/area/shuttle/escape) +"as" = (/obj/machinery/computer/security,/turf/open/floor/plasteel/darkred/side{tag = "icon-darkred (SOUTHWEST)"; icon_state = "darkred"; dir = 10},/area/shuttle/escape) +"at" = (/obj/structure/chair/office/dark{dir = 8},/turf/open/floor/plasteel/vault{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/shuttle/escape) +"au" = (/turf/open/floor/plasteel/vault{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/shuttle/escape) +"av" = (/obj/structure/chair/office/dark{dir = 4},/turf/open/floor/plasteel/vault{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/shuttle/escape) +"aw" = (/obj/machinery/computer/station_alert,/turf/open/floor/plasteel/darkyellow/side{tag = "icon-darkyellow (SOUTHEAST)"; icon_state = "darkyellow"; dir = 6},/area/shuttle/escape) +"ax" = (/obj/structure/table/reinforced,/obj/machinery/recharger,/turf/open/floor/plasteel/vault{tag = "icon-vault (EAST)"; icon_state = "vault"; dir = 4},/area/shuttle/escape) +"ay" = (/obj/structure/flora/kirbyplants{tag = "icon-plant-21"; icon_state = "plant-21"},/obj/machinery/light,/turf/open/floor/plasteel/vault{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/shuttle/escape) +"az" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/fancy/donut_box,/turf/open/floor/plasteel/vault{tag = "icon-vault (EAST)"; icon_state = "vault"; dir = 4},/area/shuttle/escape) +"aA" = (/obj/machinery/status_display,/turf/closed/wall/shuttle/smooth,/area/shuttle/escape) +"aB" = (/obj/machinery/door/airlock/glass_command{name = "Cockpit"; req_access_txt = "19"},/turf/open/floor/plasteel,/area/shuttle/escape) +"aC" = (/obj/structure/chair,/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"aD" = (/obj/structure/chair,/obj/machinery/light{tag = "icon-tube1 (NORTH)"; icon_state = "tube1"; dir = 1},/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"aE" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box/zipties,/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"aF" = (/obj/structure/table/reinforced,/obj/item/weapon/paper_bin,/obj/item/weapon/pen,/turf/open/floor/plasteel/red/corner{tag = "icon-redcorner (NORTH)"; icon_state = "redcorner"; dir = 1},/area/shuttle/escape) +"aG" = (/turf/open/floor/plasteel/blue/side{tag = "icon-blue (NORTH)"; icon_state = "blue"; dir = 1},/area/shuttle/escape) +"aH" = (/turf/open/floor/plasteel/neutral/corner{tag = "icon-neutralcorner (EAST)"; icon_state = "neutralcorner"; dir = 4},/area/shuttle/escape) +"aI" = (/obj/machinery/door/airlock/glass_command{name = "Emergency Recovery Airlock"; req_access_txt = "19"},/turf/open/floor/plasteel/warning{tag = "icon-warning (WEST)"; icon_state = "warning"; dir = 8},/area/shuttle/escape) +"aJ" = (/obj/machinery/light/small{tag = "icon-bulb1 (NORTH)"; icon_state = "bulb1"; dir = 1},/turf/open/floor/plasteel/bot,/area/shuttle/escape) +"aK" = (/obj/machinery/suit_storage_unit,/turf/open/floor/plasteel/delivery,/area/shuttle/escape) +"aL" = (/obj/structure/chair{dir = 4},/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"aM" = (/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"aN" = (/obj/structure/chair{dir = 8},/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"aO" = (/obj/structure/table/reinforced,/obj/item/weapon/paper_bin,/obj/item/weapon/pen,/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"aP" = (/obj/structure/table/reinforced,/obj/machinery/recharger,/turf/open/floor/plasteel/red/corner{tag = "icon-redcorner (NORTH)"; icon_state = "redcorner"; dir = 1},/area/shuttle/escape) +"aQ" = (/turf/open/floor/plasteel/neutral,/area/shuttle/escape) +"aR" = (/obj/structure/fireaxecabinet{pixel_x = 33},/turf/open/floor/plasteel/neutral/corner{tag = "icon-neutralcorner (EAST)"; icon_state = "neutralcorner"; dir = 4},/area/shuttle/escape) +"aS" = (/obj/machinery/door/airlock/external,/turf/open/floor/plasteel,/area/shuttle/escape) +"aT" = (/turf/closed/wall/shuttle/smooth/nodiagonal,/area/shuttle/escape) +"aU" = (/turf/open/floor/plasteel/neutral/corner,/area/shuttle/escape) +"aV" = (/turf/open/floor/plasteel/neutral/side,/area/shuttle/escape) +"aW" = (/turf/open/floor/plasteel/neutral/corner{tag = "icon-neutralcorner (WEST)"; icon_state = "neutralcorner"; dir = 8},/area/shuttle/escape) +"aX" = (/obj/machinery/door/airlock/external,/turf/open/floor/plasteel/warning{tag = "icon-warning (WEST)"; icon_state = "warning"; dir = 8},/area/shuttle/escape) +"aY" = (/obj/machinery/door/airlock/glass_security{name = "Holding Area"},/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"aZ" = (/turf/open/floor/plasteel/red/corner{tag = "icon-redcorner (WEST)"; icon_state = "redcorner"; dir = 8},/area/shuttle/escape) +"ba" = (/obj/structure/extinguisher_cabinet{pixel_x = 30},/obj/machinery/light{tag = "icon-tube1 (EAST)"; icon_state = "tube1"; dir = 4},/turf/open/floor/plasteel/neutral/corner,/area/shuttle/escape) +"bb" = (/turf/open/floor/plasteel,/area/shuttle/escape) +"bc" = (/obj/machinery/light{tag = "icon-tube1 (NORTH)"; icon_state = "tube1"; dir = 1},/turf/open/floor/plasteel,/area/shuttle/escape) +"bd" = (/turf/open/floor/plasteel/neutral/side{tag = "icon-neutral (NORTH)"; icon_state = "neutral"; dir = 1},/area/shuttle/escape) +"be" = (/turf/open/floor/plasteel/neutral/corner{tag = "icon-neutralcorner (NORTH)"; icon_state = "neutralcorner"; dir = 1},/area/shuttle/escape) +"bf" = (/obj/machinery/door/airlock/shuttle{name = "Emergency Shuttle Airlock"; req_access_txt = "2"},/turf/open/floor/plasteel/white,/area/shuttle/escape) +"bg" = (/obj/structure/chair{dir = 1},/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"bh" = (/obj/structure/table/reinforced,/obj/machinery/recharger,/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"bi" = (/obj/structure/flora/kirbyplants{tag = "icon-plant-21"; icon_state = "plant-21"},/obj/machinery/button/flasher{pixel_x = -26; pixel_y = -24},/turf/open/floor/plasteel/red/corner{tag = "icon-redcorner (WEST)"; icon_state = "redcorner"; dir = 8},/area/shuttle/escape) +"bj" = (/obj/structure/flora/kirbyplants{tag = "icon-plant-21"; icon_state = "plant-21"},/turf/open/floor/plasteel/neutral/corner,/area/shuttle/escape) +"bk" = (/obj/structure/table,/obj/item/weapon/clipboard,/obj/item/toy/figure/ninja,/turf/open/floor/plasteel/bot,/area/shuttle/escape) +"bl" = (/obj/structure/chair{dir = 1},/turf/open/floor/plasteel/bot,/area/shuttle/escape) +"bm" = (/obj/structure/closet/crate/internals,/obj/item/clothing/suit/hazardvest{name = "Emergency Lifejacket"},/obj/item/clothing/suit/hazardvest{name = "Emergency Lifejacket"},/obj/item/clothing/suit/hazardvest{name = "Emergency Lifejacket"},/obj/item/clothing/suit/hazardvest{name = "Emergency Lifejacket"},/obj/item/clothing/suit/hazardvest{name = "Emergency Lifejacket"},/obj/item/weapon/tank/internals/emergency_oxygen/double,/obj/item/weapon/tank/internals/emergency_oxygen/double,/obj/item/weapon/tank/internals/emergency_oxygen/double,/obj/item/weapon/tank/internals/emergency_oxygen/double,/obj/item/weapon/tank/internals/emergency_oxygen/double,/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/obj/item/clothing/head/hardhat/orange{name = "Protective Helmet"},/obj/item/clothing/head/hardhat/orange{name = "Protective Helmet"},/obj/item/clothing/head/hardhat/orange{name = "Protective Helmet"},/obj/item/clothing/head/hardhat/orange{name = "Protective Helmet"},/obj/item/clothing/head/hardhat/orange{name = "Protective Helmet"},/turf/open/floor/plasteel/bot,/area/shuttle/escape) +"bn" = (/obj/machinery/door/airlock/shuttle{name = "Emergency Shuttle Airlock"},/obj/docking_port/mobile/emergency{dwidth = 11; height = 18; timid = 1; width = 29},/turf/open/floor/plasteel/white,/area/shuttle/escape) +"bo" = (/turf/open/floor/plasteel/delivery,/area/shuttle/escape) +"bp" = (/obj/machinery/light{tag = "icon-tube1 (NORTH)"; icon_state = "tube1"; dir = 1},/obj/machinery/flasher{pixel_y = 20},/turf/open/floor/plasteel/neutral/side{tag = "icon-neutral (NORTH)"; icon_state = "neutral"; dir = 1},/area/shuttle/escape) +"bq" = (/obj/structure/table,/obj/item/weapon/clipboard,/obj/item/weapon/pen,/obj/item/hand_labeler_refill,/obj/item/weapon/folder/yellow,/turf/open/floor/plasteel/bot,/area/shuttle/escape) +"br" = (/obj/machinery/recharge_station,/turf/open/floor/plasteel/delivery,/area/shuttle/escape) +"bs" = (/obj/structure/table,/obj/machinery/cell_charger,/obj/item/weapon/stock_parts/cell/high,/turf/open/floor/plasteel/bot,/area/shuttle/escape) +"bt" = (/obj/structure/flora/kirbyplants{tag = "icon-plant-21"; icon_state = "plant-21"},/obj/machinery/light{tag = "icon-tube1 (WEST)"; icon_state = "tube1"; dir = 8},/turf/open/floor/plasteel/neutral/side{tag = "icon-neutral (WEST)"; icon_state = "neutral"; dir = 8},/area/shuttle/escape) +"bu" = (/obj/structure/flora/kirbyplants{tag = "icon-plant-21"; icon_state = "plant-21"},/obj/machinery/light{tag = "icon-tube1 (EAST)"; icon_state = "tube1"; dir = 4},/turf/open/floor/plasteel/neutral/side{tag = "icon-neutral (EAST)"; icon_state = "neutral"; dir = 4},/area/shuttle/escape) +"bv" = (/obj/structure/rack,/obj/item/clothing/suit/fire/firefighter,/obj/item/clothing/mask/gas,/obj/item/clothing/head/hardhat/red,/obj/item/weapon/tank/internals/oxygen/red,/obj/machinery/light{tag = "icon-tube1 (WEST)"; icon_state = "tube1"; dir = 8},/turf/open/floor/plasteel/bot,/area/shuttle/escape) +"bw" = (/turf/open/floor/plasteel/warning{tag = "icon-warning (NORTHWEST)"; icon_state = "warning"; dir = 9},/area/shuttle/escape) +"bx" = (/turf/open/floor/plasteel/warning{dir = 5},/area/shuttle/escape) +"by" = (/obj/structure/chair{dir = 4},/turf/open/floor/plasteel/bot,/area/shuttle/escape) +"bz" = (/obj/structure/chair{dir = 8},/turf/open/floor/plasteel/bot,/area/shuttle/escape) +"bA" = (/obj/structure/flora/ausbushes/fernybush,/obj/structure/flora/ausbushes/ywflowers,/obj/structure/flora/ausbushes/lavendergrass,/obj/structure/flora/ausbushes/grassybush,/obj/structure/window/shuttle,/turf/open/floor/grass,/area/shuttle/escape) +"bB" = (/obj/machinery/door/airlock/shuttle{name = "Emergency Shuttle Cargo Hold"},/turf/open/floor/plasteel/warning{tag = "icon-warning (WEST)"; icon_state = "warning"; dir = 8},/area/shuttle/escape) +"bC" = (/turf/open/floor/plasteel/warning{tag = "icon-warning (WEST)"; icon_state = "warning"; dir = 8},/area/shuttle/escape) +"bD" = (/turf/open/floor/plasteel/warning{dir = 4},/area/shuttle/escape) +"bE" = (/turf/open/floor/plasteel/bot,/area/shuttle/escape) +"bF" = (/obj/machinery/status_display,/turf/closed/wall/shuttle/smooth/nodiagonal,/area/shuttle/escape) +"bG" = (/obj/structure/extinguisher_cabinet,/turf/closed/wall/shuttle/smooth/nodiagonal,/area/shuttle/escape) +"bH" = (/obj/structure/reagent_dispensers/watertank,/turf/open/floor/plasteel/bot,/area/shuttle/escape) +"bI" = (/obj/structure/closet/crate{name = "Emergency Supplies Crate"},/obj/item/weapon/storage/toolbox/emergency,/obj/item/weapon/crowbar,/obj/item/weapon/wrench,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/radio,/turf/open/floor/plasteel/bot,/area/shuttle/escape) +"bJ" = (/obj/structure/flora/kirbyplants{tag = "icon-plant-21"; icon_state = "plant-21"},/turf/open/floor/plasteel/neutral/side{tag = "icon-neutral (WEST)"; icon_state = "neutral"; dir = 8},/area/shuttle/escape) +"bK" = (/obj/structure/reagent_dispensers/fueltank,/turf/open/floor/plasteel/bot,/area/shuttle/escape) +"bL" = (/turf/open/floor/plasteel/warning{tag = "icon-warning (SOUTHWEST)"; icon_state = "warning"; dir = 10},/area/shuttle/escape) +"bM" = (/turf/open/floor/plasteel/warning{tag = "icon-warning (SOUTHEAST)"; icon_state = "warning"; dir = 6},/area/shuttle/escape) +"bN" = (/obj/structure/closet/crate/medical,/obj/item/weapon/storage/firstaid/regular,/obj/item/weapon/storage/firstaid/toxin,/obj/item/weapon/storage/firstaid/o2,/turf/open/floor/plasteel/bot,/area/shuttle/escape) +"bO" = (/obj/machinery/door/airlock/shuttle{name = "Emergency Shuttle Airlock"},/turf/open/floor/plasteel/white,/area/shuttle/escape) +"bP" = (/obj/structure/extinguisher_cabinet{pixel_x = -30},/obj/machinery/shieldgen,/turf/open/floor/plasteel/bot,/area/shuttle/escape) +"bQ" = (/obj/structure/rack,/obj/item/weapon/storage/toolbox/electrical,/obj/item/weapon/storage/toolbox/emergency,/obj/item/weapon/storage/toolbox/mechanical,/obj/machinery/light/small,/turf/open/floor/plasteel/bot,/area/shuttle/escape) +"bR" = (/obj/machinery/light{tag = "icon-tube1 (WEST)"; icon_state = "tube1"; dir = 8},/turf/open/floor/plasteel/bot,/area/shuttle/escape) +"bS" = (/obj/structure/chair{dir = 8},/obj/machinery/light{tag = "icon-tube1 (EAST)"; icon_state = "tube1"; dir = 4},/turf/open/floor/plasteel/bot,/area/shuttle/escape) +"bT" = (/obj/machinery/door/airlock/glass_medical{name = "Emergency Shuttle Infirmary"},/turf/open/floor/plasteel/warning{dir = 1},/area/shuttle/escape) +"bU" = (/obj/machinery/sleeper{tag = "icon-sleeper (EAST)"; icon_state = "sleeper"; dir = 4},/turf/open/floor/plasteel/cmo,/area/shuttle/escape) +"bV" = (/turf/open/floor/plasteel/cmo,/area/shuttle/escape) +"bW" = (/obj/machinery/sleeper{tag = "icon-sleeper (WEST)"; icon_state = "sleeper"; dir = 8},/turf/open/floor/plasteel/cmo,/area/shuttle/escape) +"bX" = (/obj/machinery/iv_drip,/obj/structure/bed/roller,/turf/open/floor/plasteel/whiteblue/side{baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface; dir = 1; icon_state = "whiteblue"; tag = "icon-whiteblue (NORTH)"},/area/shuttle/escape) +"bY" = (/turf/open/floor/plasteel/whiteblue/side{baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface; dir = 1; icon_state = "whiteblue"; tag = "icon-whiteblue (NORTH)"},/area/shuttle/escape) +"bZ" = (/obj/structure/extinguisher_cabinet{pixel_x = 30},/obj/machinery/iv_drip,/obj/structure/bed/roller,/obj/machinery/light/small{tag = "icon-bulb1 (EAST)"; icon_state = "bulb1"; dir = 4},/turf/open/floor/plasteel/whiteblue/side{baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface; dir = 5; icon_state = "whiteblue"; tag = "icon-whiteblue (NORTHEAST)"},/area/shuttle/escape) +"ca" = (/obj/machinery/door/airlock/glass_medical{name = "Emergency Shuttle Infirmary"},/turf/open/floor/plasteel/warning{tag = "icon-warning (WEST)"; icon_state = "warning"; dir = 8},/area/shuttle/escape) +"cb" = (/obj/machinery/shower{tag = "icon-shower (WEST)"; icon_state = "shower"; dir = 8},/turf/open/floor/plasteel/whiteblue/side{tag = "icon-whiteblue (EAST)"; icon_state = "whiteblue"; dir = 4; baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface},/area/shuttle/escape) +"cc" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/firstaid/fire,/obj/item/weapon/storage/firstaid,/turf/open/floor/plasteel/whiteblue/side{tag = "icon-whiteblue (EAST)"; icon_state = "whiteblue"; dir = 4; baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface},/area/shuttle/escape) +"cd" = (/obj/machinery/computer/med_data,/turf/open/floor/plasteel/whiteblue/side,/area/shuttle/escape) +"ce" = (/obj/structure/chair/office/light{dir = 8},/turf/open/floor/plasteel/whiteblue/side,/area/shuttle/escape) +"cf" = (/turf/open/floor/plasteel/whiteblue/side,/area/shuttle/escape) +"cg" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/firstaid/toxin,/obj/item/weapon/storage/firstaid/o2,/turf/open/floor/plasteel/whiteblue/side{tag = "icon-whiteblue (SOUTHEAST)"; icon_state = "whiteblue"; dir = 6; baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface},/area/shuttle/escape) +"ch" = (/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/glass/bottle/epinephrine,/obj/item/weapon/reagent_containers/glass/bottle/charcoal,/obj/item/weapon/reagent_containers/glass/bottle/epinephrine,/obj/item/weapon/reagent_containers/glass/bottle/charcoal,/obj/item/weapon/reagent_containers/syringe/epinephrine,/obj/item/weapon/reagent_containers/syringe/epinephrine,/obj/item/weapon/reagent_containers/syringe/epinephrine,/obj/item/weapon/reagent_containers/syringe/epinephrine,/obj/machinery/light{tag = "icon-tube1 (WEST)"; icon_state = "tube1"; dir = 8},/turf/open/floor/plasteel/cmo,/area/shuttle/escape) +"ci" = (/obj/structure/chair/office/light,/turf/open/floor/plasteel/cmo,/area/shuttle/escape) +"cj" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 10; tag = "icon-sink (EAST)"},/turf/open/floor/plasteel/cmo,/area/shuttle/escape) +"ck" = (/obj/machinery/light,/turf/open/floor/plasteel/neutral/side,/area/shuttle/escape) +"cl" = (/obj/structure/table/reinforced,/obj/item/weapon/defibrillator/loaded,/turf/open/floor/plasteel/cmo,/area/shuttle/escape) +"cm" = (/obj/machinery/computer/operating,/turf/open/floor/plasteel/cmo,/area/shuttle/escape) +"cn" = (/obj/structure/table/optable,/turf/open/floor/plasteel/cmo,/area/shuttle/escape) +"co" = (/obj/structure/table/reinforced,/obj/item/clothing/mask/surgical,/obj/item/clothing/gloves/color/latex,/obj/item/weapon/retractor,/obj/item/weapon/scalpel,/obj/item/weapon/circular_saw,/obj/item/weapon/hemostat,/turf/open/floor/plasteel/cmo,/area/shuttle/escape) +"cp" = (/turf/closed/wall/mineral/plastitanium,/area/shuttle/escape) +"cq" = (/obj/structure/shuttle/engine/heater,/obj/structure/window/reinforced{tag = "icon-rwindow (NORTH)"; icon_state = "rwindow"; dir = 1},/turf/open/floor/plating,/area/shuttle/escape) +"cr" = (/obj/structure/shuttle/engine/propulsion,/turf/open/floor/plating,/area/shuttle/escape) + +(1,1,1) = {" +aaaaaaaaababacacacacacacababaaaaaaaa +aaaaaaaaabadaeafagahaiajakabaaaaaaaa +aaaaaaaaacalamanaoapanaqaracaaaaaaaa +aaaaaaaaabasatauauauauavawabaaaaaaaa +aaaaaaaaabaxayauauauauayazabaaaaaaaa +ababacababababaAaBaBaAababababacabab +abaCaCaDaCaEabaFaGaGaHaIaJabaKaKaKac +aAaLaMaMaNaOacaPaQaQaRabaSaTaUaVaWaX +abaLaMaMaMaMaYaZaQaQbaabbbbcaHbdbeaX +bfaMaMbgbgbhabbiaVaVbjabbkblblblbmac +ababaYabacababacaBaBacabababaAababab +bnbobdbdbdbdbpbdbdbdbdbmabbqbrbrbsab +abbtaQaQaQaQaQaQaQaQaQbuabbvbwbxbmac +acbyaQbzbAbyaQbzbAbyaQbobBbobCbDbEac +acbyaQbzbFbyaQbzbGbyaQbobBbobCbDbEac +acbyaQbzbAbyaQbzbAbyaQbzabbHbCbDbIac +abbJaQbzbGbyaQbzbFbyaQbzabbKbLbMbNac +bOboaQbzbAbyaQbzbAbyaQbzabbPbobobQab +abbRaQaQaQaQaQaQaQaQaQbSababbTbTabab +bOboaQbzbAbyaQbzbAbyaQbzabbUbVbVbWab +abbJaQbzbGbyaQbzbGbyaQbzacbXbYbYbZab +abbyaQbzbAbyaQbzbAbyaQbocaboaQaQcbac +acbyaQbzbFbyaQbzbFbyaQbocaboaQaQccac +acbyaQbzbAbyaQbzbAbyaQbzaccdcecfcgac +abbtaQaQaQaQaQaQaQaQaQbuaAchcibVcjac +abbmaVaVaVckaVckaVaVaVbmabclcmcncoab +aTabacacababacabacacabacababacacabaT +cpcqcqcqcpcqcqcpcqcqcpcqcqcpcqcqcqcp +aacrcrcrcpcrcrcpcrcrcpcrcrcpcrcrcraa +"} diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm index 37cc112401..8ab04203e3 100644 --- a/code/datums/shuttles.dm +++ b/code/datums/shuttles.dm @@ -170,6 +170,12 @@ description = "A small, but feature complete shuttle. It boasts a card table to keep crew members occupied on the long flight home." credit_cost = 7500 +/datum/map_template/shuttle/emergency/delta + suffix = "delta" + name = "Delta Station Emergency Shuttle" + description = "A large shuttle for a large station, this shuttle can comfortably fit all your overpopulation and crowding needs. Complete with all facilities plus additional equipment." + credit_cost = 12500 + /datum/map_template/shuttle/ferry/base suffix = "base" name = "transport ferry" diff --git a/code/game/turfs/simulated/walls_mineral.dm b/code/game/turfs/simulated/walls_mineral.dm index 2207e65ec3..3b49b63cf1 100644 --- a/code/game/turfs/simulated/walls_mineral.dm +++ b/code/game/turfs/simulated/walls_mineral.dm @@ -187,3 +187,43 @@ slicing_duration = 200 //alien wall takes twice as much time to slice explosion_block = 3 canSmoothWith = list(/turf/closed/wall/mineral/abductor, /obj/structure/falsewall/abductor) + +/turf/closed/wall/mineral/plastitanium + name = "wall" + desc = "An evil wall of plasma and titanium." + icon = 'icons/turf/walls/plastitanium_wall.dmi' + icon_state = "map-shuttle" + explosion_block = 4 + smooth = SMOOTH_MORE|SMOOTH_DIAGONAL + canSmoothWith = list(/turf/closed/wall/mineral/plastitanium, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock, /obj/structure/shuttle/engine) + +/turf/closed/wall/mineral/plastitanium/nodiagonal + smooth = SMOOTH_MORE + icon_state = "map-shuttle_nd" + +/turf/closed/wall/mineral/plastitanium/nosmooth + icon = 'icons/turf/shuttle.dmi' + icon_state = "wall" + smooth = SMOOTH_FALSE + +/turf/closed/wall/mineral/plastitanium/overspace + icon_state = "map-overspace" + fixed_underlay = list("space"=1) + +/turf/closed/wall/mineral/plastitanium/interior/copyTurf(turf/T) + if(T.type != type) + T.ChangeTurf(type) + if(underlays.len) + T.underlays = underlays + if(T.icon_state != icon_state) + T.icon_state = icon_state + if(T.icon != icon) + T.icon = icon + if(T.dir != dir) + T.dir = dir + T.transform = transform + return T + +/turf/closed/wall/mineral/plastitanium/copyTurf(turf/T) + . = ..() + T.transform = transform diff --git a/icons/turf/walls/plastitanium_wall.dmi b/icons/turf/walls/plastitanium_wall.dmi new file mode 100644 index 0000000000000000000000000000000000000000..3cd7332b6a77c42e366eed8845e71dc7cc296818 GIT binary patch literal 2914 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 M07*qoM6N<$f>BV5VE_OC literal 0 HcmV?d00001 diff --git a/yogstation.dme b/yogstation.dme index fef884c9cd..bf071c154d 100644 --- a/yogstation.dme +++ b/yogstation.dme @@ -15,6 +15,7 @@ // BEGIN_INCLUDE #include "_maps\__MAP_DEFINES.dm" #include "_maps\tgstation2.dm" +#include "_maps\shuttles\emergency_delta.dmm" #include "code\_compile_options.dm" #include "code\hub.dm" #include "code\world.dm" From 613637e5a0630d0a16f3cbf2d8bde27db21dc3fb Mon Sep 17 00:00:00 2001 From: Nichlas Pihl Date: Sat, 28 Oct 2017 04:29:25 +0200 Subject: [PATCH 08/21] unincludes the delta shuttle map --- yogstation.dme | 1 - 1 file changed, 1 deletion(-) diff --git a/yogstation.dme b/yogstation.dme index bf071c154d..fef884c9cd 100644 --- a/yogstation.dme +++ b/yogstation.dme @@ -15,7 +15,6 @@ // BEGIN_INCLUDE #include "_maps\__MAP_DEFINES.dm" #include "_maps\tgstation2.dm" -#include "_maps\shuttles\emergency_delta.dmm" #include "code\_compile_options.dm" #include "code\hub.dm" #include "code\world.dm" From 93c63775b32dfc90d0ae05788b7ab250abea8cf2 Mon Sep 17 00:00:00 2001 From: Nichlas Pihl Date: Sun, 29 Oct 2017 01:29:54 +0200 Subject: [PATCH 09/21] Adds emag-specific shuttles --- code/controllers/subsystem/shuttles.dm | 1 + code/datums/shuttles.dm | 7 +++++++ code/game/machinery/computer/communications.dm | 6 +++++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/code/controllers/subsystem/shuttles.dm b/code/controllers/subsystem/shuttles.dm index 82f15e56ae..015e91ef4e 100644 --- a/code/controllers/subsystem/shuttles.dm +++ b/code/controllers/subsystem/shuttles.dm @@ -35,6 +35,7 @@ var/datum/subsystem/shuttle/SSshuttle var/datum/round_event/shuttle_loan/shuttle_loan var/shuttle_purchased = FALSE //If the station has purchased a replacement escape shuttle this round + var/emag_shuttle_purchased = FALSE //If an emagged comms console has bought an escape shuttle var/list/cooldown_ids = list() diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm index 8ab04203e3..dde1f2a0b7 100644 --- a/code/datums/shuttles.dm +++ b/code/datums/shuttles.dm @@ -9,6 +9,7 @@ var/admin_notes var/credit_cost = INFINITY + var/emag_buy = FALSE /datum/map_template/shuttle/New() shuttle_id = "[port_id]_[suffix]" @@ -76,6 +77,8 @@ admin_notes = "Brig is replaced by anchored greentext book surrounded by \ lavaland chasms, stationside door has been removed to prevent \ accidental dropping." + emag_buy = TRUE + credit_cost = 15000 /datum/map_template/shuttle/emergency/cramped suffix = "cramped" @@ -137,6 +140,8 @@ I cannot tell you; it's space confidential. \ Aw, come space on. Why not? \ No, I can't. Anyway, how is your space roleplay life?" + emag_buy = TRUE + credit_cost = 5000 /datum/map_template/shuttle/emergency/goon suffix = "goon" @@ -158,6 +163,8 @@ admin_notes = "If the crew can solve the puzzle, they will wake the \ wabbajack statue. It will likely not end well. There's a reason it's \ boarded up. Maybe they should have just left it alone." + emag_buy = TRUE + credit_cost = 7500 /datum/map_template/shuttle/emergency/yogstation suffix = "yogstation" diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index d2cf3d531b..c8feac6211 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -127,13 +127,15 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 var/list/shuttles = flatten_list(shuttle_templates) var/datum/map_template/shuttle/S = locate(href_list["chosen_shuttle"]) in shuttles if(S && istype(S)) - if(SSshuttle.shuttle_purchased) + if((SSshuttle.shuttle_purchased && !src.emagged) || SSshuttle.emag_shuttle_purchased) usr << "A replacement shuttle has already been purchased." else if(SSshuttle.points >= S.credit_cost) var/obj/machinery/shuttle_manipulator/M = locate() in machines if(M) SSshuttle.shuttle_purchased = TRUE + if(src.emagged) + SSshuttle.emag_shuttle_purchased = TRUE M.unload_preview() M.load_template(S) M.existing_shuttle = SSshuttle.emergency @@ -485,6 +487,8 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 dat += "Budget: [SSshuttle.points] Credits.
" for(var/shuttle_id in shuttle_templates) var/datum/map_template/shuttle/S = shuttle_templates[shuttle_id] + if(!src.emagged && S.emag_buy) + continue if(S.credit_cost < INFINITY) dat += "[S.name] | [S.credit_cost] Credits
" dat += "[S.description]
" From d0afedbbaa94d5b6eef05ee6e4efbfb72238a31e Mon Sep 17 00:00:00 2001 From: Nichlas Pihl Date: Sun, 29 Oct 2017 02:08:32 +0200 Subject: [PATCH 10/21] Makes it less of a death sentence --- code/game/machinery/computer/communications.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index c8feac6211..18251b3ee0 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -141,7 +141,10 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 M.existing_shuttle = SSshuttle.emergency M.action_load(S) SSshuttle.points -= S.credit_cost - minor_announce("[usr.name] has purchased [S.name] for [S.credit_cost] credits." , "Shuttle Purchase") + if(!src.emagged) + minor_announce("[usr.name] has purchased [S.name] for [S.credit_cost] credits." , "Shuttle Purchase") + else + minor_announce("Unknown has purchased [S.name] for [S.credit_cost] credits." , "Shuttle Purchase") message_admins("[key_name_admin(usr)] purchased [S.name].") feedback_add_details("shuttle_manipulator", S.name) else From e407e39d79b6f0f35188586b41990d3ef7990e39 Mon Sep 17 00:00:00 2001 From: Nichlas Pihl Date: Sun, 29 Oct 2017 02:01:38 +0100 Subject: [PATCH 11/21] Adds the scrapheap shuttle --- _maps/shuttles/emergency_scrapheap.dmm | 87 ++++++++++++++++++++++++++ code/datums/shuttles.dm | 8 +++ 2 files changed, 95 insertions(+) create mode 100644 _maps/shuttles/emergency_scrapheap.dmm diff --git a/_maps/shuttles/emergency_scrapheap.dmm b/_maps/shuttles/emergency_scrapheap.dmm new file mode 100644 index 0000000000..66448dd3c7 --- /dev/null +++ b/_maps/shuttles/emergency_scrapheap.dmm @@ -0,0 +1,87 @@ +"aa" = (/turf/open/space,/area/space) +"ab" = (/turf/closed/wall/shuttle/smooth,/area/shuttle/escape) +"ac" = (/obj/structure/grille,/obj/structure/window/shuttle/tinted,/turf/open/floor/plating,/area/shuttle/escape) +"ad" = (/turf/closed/wall/shuttle/smooth/nodiagonal,/area/shuttle/escape) +"ae" = (/obj/structure/table/wood,/turf/open/floor/carpet,/area/shuttle/escape) +"af" = (/obj/structure/chair/comfy/brown{tag = "icon-comfychair (NORTH)"; icon_state = "comfychair"; dir = 1},/turf/open/floor/carpet,/area/shuttle/escape) +"ag" = (/obj/machinery/computer/emergency_shuttle,/turf/open/floor/carpet,/area/shuttle/escape) +"ah" = (/obj/structure/window/reinforced{tag = "icon-rwindow (EAST)"; icon_state = "rwindow"; dir = 4},/obj/structure/table/wood,/turf/open/floor/carpet,/area/shuttle/escape) +"ai" = (/obj/machinery/computer/atmos_alert,/turf/open/floor/carpet,/area/shuttle/escape) +"aj" = (/obj/structure/chair/comfy/brown{tag = "icon-comfychair (WEST)"; icon_state = "comfychair"; dir = 8},/turf/open/floor/carpet,/area/shuttle/escape) +"ak" = (/turf/open/floor/carpet,/area/shuttle/escape) +"al" = (/obj/structure/window/reinforced{tag = "icon-rwindow (EAST)"; icon_state = "rwindow"; dir = 4},/obj/structure/window/reinforced,/obj/structure/chair/comfy/brown{tag = "icon-comfychair (EAST)"; icon_state = "comfychair"; dir = 4},/turf/open/floor/carpet,/area/shuttle/escape) +"am" = (/obj/machinery/computer/crew,/turf/open/floor/carpet,/area/shuttle/escape) +"an" = (/obj/structure/table/wood/poker,/obj/machinery/light,/turf/open/floor/carpet,/area/shuttle/escape) +"ao" = (/obj/structure/window/reinforced{tag = "icon-rwindow (EAST)"; icon_state = "rwindow"; dir = 4},/turf/open/floor/carpet,/area/shuttle/escape) +"ap" = (/obj/machinery/door/airlock/shuttle{req_access_txt = "2"},/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"aq" = (/obj/machinery/door/airlock/glass{name = "Emergency Shuttle Cockpit"; req_access_txt = "19"},/turf/open/floor/carpet,/area/shuttle/escape) +"ar" = (/obj/machinery/door/airlock/shuttle,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"as" = (/obj/structure/chair,/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"at" = (/obj/machinery/flasher{id = "cockpit_flasher"; pixel_x = 7; pixel_y = 25},/obj/machinery/button/flasher{id = "cockpit_flasher"; pixel_x = -7; pixel_y = 25},/turf/open/floor/plasteel/bar,/area/shuttle/escape) +"au" = (/turf/open/floor/plasteel/bar,/area/shuttle/escape) +"av" = (/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"aw" = (/obj/machinery/light/small{tag = "icon-bulb1 (WEST)"; icon_state = "bulb1"; dir = 8},/obj/machinery/flasher{id = "shuttle_flasher"; pixel_x = -25; pixel_y = 7},/obj/machinery/button/flasher{id = "shuttle_flasher"; pixel_x = -25; pixel_y = -7},/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"ax" = (/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"ay" = (/obj/structure/grille,/turf/open/floor/plating,/area/shuttle/escape) +"az" = (/obj/structure/grille/broken{tag = "icon-brokengrille"; icon_state = "brokengrille"},/turf/open/floor/plasteel,/area/shuttle/escape) +"aA" = (/obj/machinery/door/airlock/shuttle{req_access_txt = "2"},/turf/open/floor/plating,/area/shuttle/escape) +"aB" = (/obj/structure/table,/obj/structure/extinguisher_cabinet{pixel_y = -30},/obj/item/weapon/extinguisher,/obj/item/weapon/crowbar,/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"aC" = (/obj/structure/chair{tag = "icon-chair (NORTH)"; icon_state = "chair"; dir = 1},/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"aD" = (/obj/structure/flora/kirbyplants,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aE" = (/obj/structure/chair,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aF" = (/obj/structure/chair,/obj/machinery/light{tag = "icon-tube1 (NORTH)"; icon_state = "tube1"; dir = 1},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aG" = (/obj/structure/table,/obj/item/weapon/storage/firstaid,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aH" = (/obj/structure/window/reinforced{tag = "icon-rwindow (EAST)"; icon_state = "rwindow"; dir = 4},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aI" = (/obj/structure/window/reinforced{tag = "icon-rwindow (EAST)"; icon_state = "rwindow"; dir = 4},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"aJ" = (/obj/machinery/door/airlock/shuttle,/obj/docking_port/mobile/emergency{timid = 1},/turf/open/floor/plating,/area/shuttle/escape) +"aK" = (/obj/structure/chair{tag = "icon-chair (NORTH)"; icon_state = "chair"; dir = 1},/obj/machinery/light{tag = "icon-tube1 (NORTH)"; icon_state = "tube1"; dir = 1},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aL" = (/obj/structure/chair{tag = "icon-chair (NORTH)"; icon_state = "chair"; dir = 1},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aM" = (/obj/structure/window/reinforced{tag = "icon-rwindow (EAST)"; icon_state = "rwindow"; dir = 4},/obj/structure/chair{tag = "icon-chair (EAST)"; icon_state = "chair"; dir = 4},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aN" = (/obj/structure/table/wood,/obj/item/toy/cards/deck/cas/black,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aO" = (/obj/structure/table/wood,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aP" = (/obj/structure/table/wood,/obj/item/toy/cards/deck/cas,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"aQ" = (/obj/structure/chair/comfy/brown{tag = "icon-comfychair (WEST)"; icon_state = "comfychair"; dir = 8},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"aR" = (/obj/structure/table_frame,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aS" = (/obj/structure/table/wood,/obj/item/weapon/storage/firstaid/fire,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aT" = (/obj/structure/chair{tag = "icon-chair (NORTH)"; icon_state = "chair"; dir = 1},/obj/structure/extinguisher_cabinet{pixel_y = -30},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aU" = (/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aV" = (/obj/structure/table,/obj/machinery/recharger,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aW" = (/turf/open/floor/plasteel/grimy,/area/shuttle/escape) +"aX" = (/obj/structure/chair/wood{tag = "icon-wooden_chair (NORTH)"; icon_state = "wooden_chair"; dir = 1},/turf/open/floor/plasteel/grimy,/area/shuttle/escape) +"aY" = (/obj/machinery/door/airlock/shuttle,/turf/open/floor/plating,/area/shuttle/escape) +"aZ" = (/obj/structure/extinguisher_cabinet{pixel_y = -30},/turf/open/floor/plasteel/bar,/area/shuttle/escape) +"ba" = (/obj/structure/window/reinforced{tag = "icon-rwindow (EAST)"; icon_state = "rwindow"; dir = 4},/obj/structure/barricade/wooden,/obj/machinery/light,/turf/open/floor/plasteel/bar,/area/shuttle/escape) +"bb" = (/obj/machinery/status_display,/turf/closed/wall/shuttle/smooth,/area/shuttle/escape) +"bc" = (/obj/machinery/door/airlock,/turf/open/floor/plasteel/freezer,/area/shuttle/escape) +"bd" = (/turf/open/floor/plasteel/freezer,/area/shuttle/escape) +"be" = (/obj/machinery/light/small{tag = "icon-bulb1 (NORTH)"; icon_state = "bulb1"; dir = 1},/obj/structure/extinguisher_cabinet{pixel_y = 30},/turf/open/floor/plasteel/freezer,/area/shuttle/escape) +"bf" = (/obj/machinery/disposal/bin/toilet{tag = "icon-toilet10 (EAST)"; icon_state = "toilet10"; dir = 4},/obj/machinery/light/small{tag = "icon-bulb1 (EAST)"; icon_state = "bulb1"; dir = 4},/turf/open/floor/plasteel/freezer,/area/shuttle/escape) +"bg" = (/obj/machinery/recharge_station,/obj/machinery/light/small{tag = "icon-bulb1 (EAST)"; icon_state = "bulb1"; dir = 4},/turf/open/floor/plasteel/freezer,/area/shuttle/escape) +"bh" = (/obj/structure/shuttle/engine/heater,/obj/structure/window/reinforced{tag = "icon-rwindow (NORTH)"; icon_state = "rwindow"; dir = 1},/turf/open/floor/plating,/area/shuttle/escape) +"bi" = (/obj/structure/shuttle/engine/heater,/obj/structure/window/reinforced{tag = "icon-rwindow (NORTH)"; icon_state = "rwindow"; dir = 1},/obj/structure/window/reinforced{tag = "icon-rwindow (EAST)"; icon_state = "rwindow"; dir = 4},/turf/open/floor/plating,/area/shuttle/escape) +"bj" = (/obj/structure/shuttle/engine/propulsion,/turf/open/floor/plating,/area/shuttle/escape) + +(1,1,1) = {" +aaaaabacacacacacaaaaaa +aaabadaeafagafahaaaaaa +aaabaiajakakakalaaaaaa +aaabamakakanaoaaaaaaaa +abacapacababaqacaracaa +abacasacacatauacavacaa +abawaxaxayazacabavabab +aAaBaCaCacaDaEaFavaGaH +ababababadavavavavavaI +aJaKaLaLaLavaLaLaLaLaM +abazacacacavacacacacaM +acaEaNaOaEavaEaEaEaEaM +acavaPaQavavavavavavaI +acaRaSaOaLaLaLaTaUaVaH +abaWaXaXacacacabababab +aYauaZauauaubaaaaaaaaa +ababababbbbcadaaaaaaaa +aYbdbdbebdbdabaaaaaaaa +abbcabbcabbcabaaaaaaaa +abbfabbfabbgabaaaaaaaa +ababbhbhbhbhbiaaaaaaaa +aaabbjbjbjbjbjaaaaaaaa +"} diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm index dde1f2a0b7..1ec1b08028 100644 --- a/code/datums/shuttles.dm +++ b/code/datums/shuttles.dm @@ -183,6 +183,14 @@ description = "A large shuttle for a large station, this shuttle can comfortably fit all your overpopulation and crowding needs. Complete with all facilities plus additional equipment." credit_cost = 12500 +/datum/map_template/shuttle/emergency/scrapheap + suffix = "scrapheap" + name = "Standby Evacuation Vessel \"Scrapheap Challenge\"" + description = "Due to a lack of functional emergency shuttles, we bought this second hand from a scrapyard and pressed it into service. Please do not lean to heavily on the exterior windows, they are fragile." + admin_notes = "An abomination with no functional medbay, sections missing, and some very fragile windows. Surprisingly airtight." + emag_buy = TRUE + credit_cost = 2500 + /datum/map_template/shuttle/ferry/base suffix = "base" name = "transport ferry" From 2f2d4baea370e9bb6cb4154953ed7015237e9568 Mon Sep 17 00:00:00 2001 From: Nichlas Pihl Date: Sun, 29 Oct 2017 14:49:05 +0100 Subject: [PATCH 12/21] Adds the department shuttle from Para --- _maps/shuttles/emergency_dept.dmm | 108 ++++++++++++++++++++++++++++++ code/datums/shuttles.dm | 7 ++ 2 files changed, 115 insertions(+) create mode 100644 _maps/shuttles/emergency_dept.dmm diff --git a/_maps/shuttles/emergency_dept.dmm b/_maps/shuttles/emergency_dept.dmm new file mode 100644 index 0000000000..606fb8e23a --- /dev/null +++ b/_maps/shuttles/emergency_dept.dmm @@ -0,0 +1,108 @@ +"aa" = (/turf/open/space,/area/space) +"ab" = (/turf/closed/wall/shuttle/smooth,/area/shuttle/escape) +"ac" = (/obj/structure/grille,/obj/structure/window/shuttle,/turf/open/floor/plating,/area/shuttle/escape) +"ad" = (/turf/closed/wall/shuttle/smooth/nodiagonal,/area/shuttle/escape) +"ae" = (/obj/machinery/computer/emergency_shuttle,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"af" = (/obj/machinery/computer/communications,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"ag" = (/obj/machinery/light{dir = 1},/obj/machinery/computer/med_data,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"ah" = (/obj/machinery/computer/atmos_alert,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"ai" = (/obj/structure/chair/comfy/beige{dir = 1; icon_state = "comfychair"},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aj" = (/obj/machinery/computer/station_alert,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"ak" = (/obj/machinery/light{dir = 1},/obj/machinery/computer/crew,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"al" = (/obj/machinery/computer/card,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"am" = (/obj/structure/table/wood,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"an" = (/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"ao" = (/obj/machinery/status_display,/turf/closed/wall/shuttle/smooth,/area/shuttle/escape) +"ap" = (/obj/machinery/door/airlock/glass_command{name = "Emergency Shuttle Cockpit"; req_access_txt = "19"},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aq" = (/obj/structure/chair,/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"ar" = (/obj/structure/chair,/obj/machinery/light{dir = 1},/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"as" = (/turf/open/floor/plasteel/cafeteria,/area/shuttle/escape) +"at" = (/obj/structure/chair{tag = "icon-chair (EAST)"; icon_state = "chair"; dir = 4},/turf/open/floor/plasteel/cafeteria,/area/shuttle/escape) +"au" = (/obj/structure/table/wood,/turf/open/floor/plasteel/cafeteria,/area/shuttle/escape) +"av" = (/obj/machinery/light{dir = 1},/turf/open/floor/plasteel/cafeteria,/area/shuttle/escape) +"aw" = (/obj/structure/table/wood,/obj/item/weapon/storage/box/drinkingglasses,/obj/item/weapon/reagent_containers/food/drinks/shaker,/turf/open/floor/plasteel/cafeteria,/area/shuttle/escape) +"ax" = (/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"ay" = (/obj/structure/chair,/turf/open/floor/plasteel/cafeteria,/area/shuttle/escape) +"az" = (/obj/structure/table/wood,/obj/machinery/chem_dispenser/drinks/beer,/turf/open/floor/plasteel/cafeteria,/area/shuttle/escape) +"aA" = (/obj/structure/closet/emcloset,/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"aB" = (/obj/machinery/door/airlock/glass_security{name = "Emergency Shuttle Brig"; req_access_txt = "2"},/turf/open/floor/plating,/area/shuttle/escape) +"aC" = (/obj/structure/table/wood,/obj/item/weapon/storage/box/drinkingglasses,/obj/item/weapon/reagent_containers/food/drinks/shaker,/obj/item/clothing/mask/cigarette/cigar,/turf/open/floor/plasteel/cafeteria,/area/shuttle/escape) +"aD" = (/obj/structure/table/wood,/obj/machinery/chem_dispenser/drinks,/turf/open/floor/plasteel/cafeteria,/area/shuttle/escape) +"aE" = (/obj/machinery/door/airlock/shuttle{req_access_txt = "2"},/turf/open/floor/plating,/area/shuttle/escape) +"aF" = (/obj/structure/chair{tag = "icon-chair (NORTH)"; icon_state = "chair"; dir = 1},/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"aG" = (/obj/structure/chair{tag = "icon-chair (NORTH)"; icon_state = "chair"; dir = 1},/turf/open/floor/plasteel/cafeteria,/area/shuttle/escape) +"aH" = (/obj/machinery/door/airlock/shuttle,/obj/docking_port/mobile/emergency{dwidth = 11; height = 13; timid = 1; width = 24},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aI" = (/turf/open/floor/plasteel,/area/shuttle/escape) +"aJ" = (/obj/structure/closet/emcloset,/turf/open/floor/plasteel,/area/shuttle/escape) +"aK" = (/obj/structure/window/reinforced{tag = "icon-rwindow (NORTH)"; icon_state = "rwindow"; dir = 1},/obj/structure/chair{tag = "icon-chair (EAST)"; icon_state = "chair"; dir = 4},/obj/machinery/light{dir = 8},/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"aL" = (/obj/machinery/door/window{dir = 1; icon_state = "left"; name = "Security Door"; req_access_txt = "2"; tag = "icon-left (NORTH)"},/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"aM" = (/obj/structure/window/reinforced{tag = "icon-rwindow (NORTH)"; icon_state = "rwindow"; dir = 1},/obj/structure/chair{tag = "icon-chair (WEST)"; icon_state = "chair"; dir = 8},/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"aN" = (/obj/structure/window/reinforced{tag = "icon-rwindow (NORTH)"; icon_state = "rwindow"; dir = 1},/obj/structure/chair{tag = "icon-chair (EAST)"; icon_state = "chair"; dir = 4},/turf/open/floor/plasteel,/area/shuttle/escape) +"aO" = (/obj/structure/window/reinforced{tag = "icon-rwindow (NORTH)"; icon_state = "rwindow"; dir = 1},/obj/structure/chair{tag = "icon-chair (WEST)"; icon_state = "chair"; dir = 8},/turf/open/floor/plasteel,/area/shuttle/escape) +"aP" = (/obj/structure/window/reinforced{tag = "icon-rwindow (NORTH)"; icon_state = "rwindow"; dir = 1},/obj/structure/chair{tag = "icon-chair (EAST)"; icon_state = "chair"; dir = 4},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"aQ" = (/obj/machinery/door/window{dir = 1; icon_state = "left"; name = "Medical Door"; req_access_txt = "5"; tag = "icon-left (NORTH)"},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"aR" = (/obj/structure/window/reinforced{tag = "icon-rwindow (NORTH)"; icon_state = "rwindow"; dir = 1},/obj/structure/chair{tag = "icon-chair (WEST)"; icon_state = "chair"; dir = 8},/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"aS" = (/obj/structure/chair{tag = "icon-chair (EAST)"; icon_state = "chair"; dir = 4},/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"aT" = (/obj/structure/chair{tag = "icon-chair (WEST)"; icon_state = "chair"; dir = 8},/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"aU" = (/obj/structure/chair{tag = "icon-chair (EAST)"; icon_state = "chair"; dir = 4},/turf/open/floor/plasteel,/area/shuttle/escape) +"aV" = (/obj/structure/chair{tag = "icon-chair (WEST)"; icon_state = "chair"; dir = 8},/turf/open/floor/plasteel,/area/shuttle/escape) +"aW" = (/obj/structure/chair{tag = "icon-chair (EAST)"; icon_state = "chair"; dir = 4},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"aX" = (/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"aY" = (/obj/structure/chair{tag = "icon-chair (WEST)"; icon_state = "chair"; dir = 8},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"aZ" = (/obj/structure/window/reinforced{tag = "icon-rwindow (NORTH)"; icon_state = "rwindow"; dir = 1},/obj/structure/chair{tag = "icon-chair (EAST)"; icon_state = "chair"; dir = 4},/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) +"ba" = (/obj/structure/window/reinforced{tag = "icon-rwindow (NORTH)"; icon_state = "rwindow"; dir = 1},/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) +"bb" = (/obj/structure/window/reinforced{tag = "icon-rwindow (NORTH)"; icon_state = "rwindow"; dir = 1},/obj/structure/chair{tag = "icon-chair (WEST)"; icon_state = "chair"; dir = 8},/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) +"bc" = (/obj/structure/window/reinforced{tag = "icon-rwindow (NORTH)"; icon_state = "rwindow"; dir = 1},/obj/structure/chair{tag = "icon-chair (EAST)"; icon_state = "chair"; dir = 4},/turf/open/floor/plasteel/shuttle/purple,/area/shuttle/escape) +"bd" = (/obj/structure/window/reinforced{tag = "icon-rwindow (NORTH)"; icon_state = "rwindow"; dir = 1},/turf/open/floor/plasteel/shuttle/purple,/area/shuttle/escape) +"be" = (/obj/structure/window/reinforced{tag = "icon-rwindow (NORTH)"; icon_state = "rwindow"; dir = 1},/obj/structure/chair{tag = "icon-chair (WEST)"; icon_state = "chair"; dir = 8},/turf/open/floor/plasteel/shuttle/purple,/area/shuttle/escape) +"bf" = (/obj/structure/window/reinforced,/obj/structure/chair{tag = "icon-chair (EAST)"; icon_state = "chair"; dir = 4},/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) +"bg" = (/obj/machinery/door/window{name = "Engineering Door"; req_access_txt = "32"},/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) +"bh" = (/obj/structure/window/reinforced,/obj/structure/chair{tag = "icon-chair (WEST)"; icon_state = "chair"; dir = 8},/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) +"bi" = (/obj/structure/window/reinforced,/obj/structure/chair{tag = "icon-chair (EAST)"; icon_state = "chair"; dir = 4},/turf/open/floor/plasteel,/area/shuttle/escape) +"bj" = (/obj/structure/window/reinforced,/obj/structure/chair{tag = "icon-chair (WEST)"; icon_state = "chair"; dir = 8},/turf/open/floor/plasteel,/area/shuttle/escape) +"bk" = (/obj/structure/window/reinforced,/obj/structure/chair{tag = "icon-chair (EAST)"; icon_state = "chair"; dir = 4},/turf/open/floor/plasteel/shuttle/purple,/area/shuttle/escape) +"bl" = (/obj/machinery/door/window{name = "Science Door"; req_access_txt = "47"},/turf/open/floor/plasteel/shuttle/purple,/area/shuttle/escape) +"bm" = (/obj/structure/window/reinforced,/obj/structure/chair{tag = "icon-chair (WEST)"; icon_state = "chair"; dir = 8},/turf/open/floor/plasteel/shuttle/purple,/area/shuttle/escape) +"bn" = (/obj/machinery/light{dir = 8},/turf/open/floor/plasteel,/area/shuttle/escape) +"bo" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/open/floor/plasteel,/area/shuttle/escape) +"bp" = (/obj/machinery/door/airlock/shuttle,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"bq" = (/obj/structure/noticeboard,/turf/closed/wall/shuttle/smooth,/area/shuttle/escape) +"br" = (/obj/machinery/door/airlock/shuttle,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"bs" = (/obj/machinery/door/airlock/glass_virology{name = "Emergency Shuttle Infirmary"},/turf/open/floor/plasteel,/area/shuttle/escape) +"bt" = (/obj/machinery/door/airlock/shuttle,/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) +"bu" = (/obj/machinery/vending/wallmed{pixel_x = 25},/obj/machinery/sleeper{icon_state = "sleeper-open"; dir = 8},/turf/open/floor/plasteel,/area/shuttle/escape) +"bv" = (/obj/item/weapon/extinguisher,/turf/open/floor/plasteel,/area/shuttle/escape) +"bw" = (/obj/structure/closet/cardboard,/obj/machinery/light{dir = 8},/turf/open/floor/plasteel,/area/shuttle/escape) +"bx" = (/obj/machinery/recharge_station,/turf/open/floor/plasteel,/area/shuttle/escape) +"by" = (/obj/structure/bed/roller,/turf/open/floor/plasteel,/area/shuttle/escape) +"bz" = (/obj/structure/table,/obj/item/weapon/storage/firstaid/regular,/obj/item/weapon/storage/firstaid/regular,/obj/item/weapon/storage/firstaid/regular,/obj/item/weapon/storage/firstaid/o2,/obj/item/weapon/storage/firstaid/fire,/turf/open/floor/plasteel,/area/shuttle/escape) +"bA" = (/obj/machinery/sleeper{icon_state = "sleeper-open"; dir = 8},/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/open/floor/plasteel,/area/shuttle/escape) +"bB" = (/obj/structure/window/reinforced{tag = "icon-rwindow (NORTH)"; icon_state = "rwindow"; dir = 1},/obj/structure/shuttle/engine/heater,/turf/open/floor/plating,/area/shuttle/escape) +"bC" = (/obj/structure/shuttle/engine/propulsion,/turf/open/floor/plating,/area/shuttle/escape) + +(1,1,1) = {" +aaaaaaaaaaabacabaaaaaaaaaa +aaaaabababadaeadabababaaaa +aaabadafagahaiajakaladabaa +aaabamaiaiaianaiaiaiamabaa +aaabamanananananananamabaa +abadaoababadapabababaoadab +abaqaraqaqacasatauasavawab +abaxaxaxaxacasatauasayazab +abaAaxaxaxaBasatauasaCaDab +aEaxaxaFaFacasatauasaGaGac +adababababacasatauasasasab +aHaIaIaIaIaIaIaIaIaIaIaJab +abaKaLaMacaNaIaOacaPaQaRab +acaSaxaTacaUaIaVacaWaXaYac +acaZbabbacaUaIaVacbcbdbeac +acbfbgbhacbiaIbjacbkblbmac +abbnaIaIaIaIaIaIaIaIaIboab +bpaIaIaIaIaIaIaIaIaIaIaIac +adabbqbracaNaIaOacbsacabad +btaIaIaIacaUaIaVacaIaIbuab +acaIaIaIacaUaIaVacaIaIbvab +abbwbxbxacaUaIaVacbybzbAab +abadbBbBadabababadbBbBadab +aaabbCbCabaaaaaaabbCbCabaa +"} diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm index 1ec1b08028..ca29ff76ee 100644 --- a/code/datums/shuttles.dm +++ b/code/datums/shuttles.dm @@ -94,6 +94,13 @@ admin_notes = "Due to origin as a solo piloted secure vessel, has an \ active GPS onboard labeled STV5." +/datum/map_template/shuttle/emergency/dept + suffix = "dept" + name = "emergency shuttle (department)" + description = "Features include: areas for each department, and a small bar." + admin_notes = "Designed to reduce chaos. Each dept requires dept access." + credit_cost = 7500 + /datum/map_template/shuttle/emergency/meta suffix = "meta" name = "Meta emergency shuttle" From 717dfcae578a0d6993cfbe6913160601f0948b38 Mon Sep 17 00:00:00 2001 From: Nichlas Pihl Date: Wed, 1 Nov 2017 18:42:25 +0100 Subject: [PATCH 13/21] Removes the arms of the asteroid shuttle --- _maps/shuttles/emergency_asteroid.dmm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/_maps/shuttles/emergency_asteroid.dmm b/_maps/shuttles/emergency_asteroid.dmm index ca68dfa9cb..2e1c07008f 100644 --- a/_maps/shuttles/emergency_asteroid.dmm +++ b/_maps/shuttles/emergency_asteroid.dmm @@ -29,7 +29,7 @@ "aC" = (/obj/structure/chair{dir = 8},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) "aD" = (/obj/structure/chair{dir = 4},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) "aE" = (/obj/structure/table,/obj/item/weapon/crowbar,/obj/item/weapon/extinguisher,/obj/machinery/recharger,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"aF" = (/obj/machinery/door/airlock/shuttle,/obj/docking_port/mobile/emergency{dheight = 0; dir = 4; dwidth = 10; height = 13; name = "Asteroid emergency shuttle"; timid = 1; width = 28},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"aF" = (/obj/docking_port/mobile/emergency{dheight = 2; dir = 4; dwidth = 10; height = 13; name = "Asteroid emergency shuttle"; timid = 1; width = 28},/obj/machinery/door/airlock/shuttle,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) "aG" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) "aH" = (/obj/structure/chair{dir = 4},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) "aI" = (/obj/structure/chair{dir = 8},/obj/structure/extinguisher_cabinet{pixel_x = 30},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) @@ -77,15 +77,15 @@ abarasaraeatabauafafavawab abababacahacabacaiacababab aaababaxafafafafafaxababaa aaaaabayafazazazafaAabaaaa -acacabaBafaCacaDafaEabaaaa -aFafafafafaCacaDafaGabaaaa -acacabaHafaCacaDafaIabaaaa +aaaaabaBafaCacaDafaEabaaaa +aaaaaFafafaCacaDafaGabaaaa +aaaaabaHafaCacaDafaIabaaaa aaaaacaDafaCacaDafaCacaaaa aaaaacaDafafafafafaCacaaaa aaaaacaDafaCacaDafaCacaaaa -acacabaHafaCacaDafaJabaaaa -aKafafafafaCacaDafaGabaaaa -acacabaLafaCacaDafaBabaaaa +aaaaabaHafaCacaDafaJabaaaa +aaaaaKafafaCacaDafaGabaaaa +aaaaabaLafaCacaDafaBabaaaa aaaaabaAafaMaMaMafaNabaaaa aaababaOafafafafafafababaa abababaPababaQababaRababab From a6c89f3c31a208c78e6f9485c9c2c81b30956b02 Mon Sep 17 00:00:00 2001 From: Nichlas Pihl Date: Wed, 1 Nov 2017 18:54:54 +0100 Subject: [PATCH 14/21] some more asteroid shuttle fixes --- _maps/shuttles/emergency_asteroid.dmm | 91 +++++++++++++-------------- 1 file changed, 45 insertions(+), 46 deletions(-) diff --git a/_maps/shuttles/emergency_asteroid.dmm b/_maps/shuttles/emergency_asteroid.dmm index 2e1c07008f..c88d34e3ef 100644 --- a/_maps/shuttles/emergency_asteroid.dmm +++ b/_maps/shuttles/emergency_asteroid.dmm @@ -22,7 +22,7 @@ "av" = (/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 0; pixel_y = -30},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) "aw" = (/obj/structure/table,/obj/item/weapon/hemostat,/obj/item/weapon/retractor,/obj/item/weapon/scalpel,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) "ax" = (/obj/structure/bed/roller,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"ay" = (/obj/structure/closet/emcloset,/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = -30},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"ay" = (/obj/machinery/door/airlock/shuttle,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) "az" = (/obj/structure/chair{dir = 1},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) "aA" = (/obj/structure/closet,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) "aB" = (/obj/structure/table,/obj/item/weapon/storage/firstaid/fire,/obj/item/weapon/storage/firstaid/regular,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) @@ -34,38 +34,37 @@ "aH" = (/obj/structure/chair{dir = 4},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) "aI" = (/obj/structure/chair{dir = 8},/obj/structure/extinguisher_cabinet{pixel_x = 30},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) "aJ" = (/obj/structure/chair{dir = 8},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"aK" = (/obj/machinery/door/airlock/shuttle,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) -"aL" = (/obj/structure/table,/obj/item/weapon/crowbar,/obj/item/weapon/extinguisher,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"aM" = (/obj/structure/chair,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"aN" = (/obj/structure/closet/emcloset,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"aO" = (/obj/structure/extinguisher_cabinet{pixel_x = -30},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) -"aP" = (/obj/machinery/door/airlock/glass_mining{name = "Emergency Shuttle Storage"},/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) -"aQ" = (/obj/machinery/door/airlock/glass_command{name = "Emergency Shuttle Cockpit"; req_access_txt = "19"},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"aR" = (/obj/machinery/door/airlock{name = "Emergency Shuttle Restroom"},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) -"aS" = (/obj/machinery/recharge_station,/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) -"aT" = (/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) -"aU" = (/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = -30},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"aV" = (/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"aW" = (/obj/structure/extinguisher_cabinet{pixel_x = 30},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"aX" = (/obj/machinery/disposal/bin/toilet{dir = 8},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) -"aY" = (/obj/machinery/door/airlock/shuttle,/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) -"aZ" = (/obj/structure/chair/office/light{dir = 4; name = "Head of Security"},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"ba" = (/obj/structure/table,/obj/item/weapon/pen,/obj/item/weapon/folder/blue,/obj/machinery/recharger,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"bb" = (/obj/structure/chair/office/light{dir = 8; name = "Chief Medical Officer"},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"bc" = (/obj/structure/ore_box,/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) -"bd" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) -"be" = (/obj/structure/chair/office/light{dir = 4; name = "Captain"},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"bf" = (/obj/machinery/computer/shuttle,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"bg" = (/obj/structure/chair/office/light{dir = 8; name = "Head of Personnel"},/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"bh" = (/obj/machinery/suit_storage_unit,/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) -"bi" = (/obj/structure/chair/office/light{dir = 4; name = "Chief Engineer"},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"bj" = (/obj/structure/table,/obj/item/weapon/paper_bin,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"bk" = (/obj/structure/chair/office/light{dir = 8; name = "Research Director"},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"bl" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/structure/mirror{pixel_x = 30},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) -"bm" = (/obj/structure/shuttle/engine/heater,/turf/open/floor/plating/airless,/area/shuttle/escape) -"bn" = (/obj/structure/shuttle/engine/propulsion,/turf/open/floor/plating/airless,/area/shuttle/escape) -"bo" = (/obj/machinery/computer/station_alert,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"bp" = (/obj/machinery/computer/communications,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aK" = (/obj/structure/table,/obj/item/weapon/crowbar,/obj/item/weapon/extinguisher,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aL" = (/obj/structure/chair,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aM" = (/obj/structure/closet/emcloset,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aN" = (/obj/structure/extinguisher_cabinet{pixel_x = -30},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"aO" = (/obj/machinery/door/airlock/glass_mining{name = "Emergency Shuttle Storage"},/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) +"aP" = (/obj/machinery/door/airlock/glass_command{name = "Emergency Shuttle Cockpit"; req_access_txt = "19"},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aQ" = (/obj/machinery/door/airlock{name = "Emergency Shuttle Restroom"},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"aR" = (/obj/machinery/recharge_station,/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) +"aS" = (/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) +"aT" = (/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = -30},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aU" = (/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aV" = (/obj/structure/extinguisher_cabinet{pixel_x = 30},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aW" = (/obj/machinery/disposal/bin/toilet{dir = 8},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"aX" = (/obj/machinery/door/airlock/shuttle,/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) +"aY" = (/obj/structure/chair/office/light{dir = 4; name = "Head of Security"},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aZ" = (/obj/structure/table,/obj/item/weapon/pen,/obj/item/weapon/folder/blue,/obj/machinery/recharger,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"ba" = (/obj/structure/chair/office/light{dir = 8; name = "Chief Medical Officer"},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"bb" = (/obj/structure/ore_box,/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) +"bc" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) +"bd" = (/obj/structure/chair/office/light{dir = 4; name = "Captain"},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"be" = (/obj/machinery/computer/shuttle,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"bf" = (/obj/structure/chair/office/light{dir = 8; name = "Head of Personnel"},/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"bg" = (/obj/machinery/suit_storage_unit,/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) +"bh" = (/obj/structure/chair/office/light{dir = 4; name = "Chief Engineer"},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"bi" = (/obj/structure/table,/obj/item/weapon/paper_bin,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"bj" = (/obj/structure/chair/office/light{dir = 8; name = "Research Director"},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"bk" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/structure/mirror{pixel_x = 30},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"bl" = (/obj/structure/shuttle/engine/heater,/turf/open/floor/plating/airless,/area/shuttle/escape) +"bm" = (/obj/structure/shuttle/engine/propulsion,/turf/open/floor/plating/airless,/area/shuttle/escape) +"bn" = (/obj/machinery/computer/station_alert,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"bo" = (/obj/machinery/computer/communications,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) (1,1,1) = {" aaaaaaababacabacababaaaaaa @@ -76,7 +75,7 @@ apaeaeaeaeaeacafafafafaqac abarasaraeatabauafafavawab abababacahacabacaiacababab aaababaxafafafafafaxababaa -aaaaabayafazazazafaAabaaaa +aaaaayafafazazazafaAabaaaa aaaaabaBafaCacaDafaEabaaaa aaaaaFafafaCacaDafaGabaaaa aaaaabaHafaCacaDafaIabaaaa @@ -84,16 +83,16 @@ aaaaacaDafaCacaDafaCacaaaa aaaaacaDafafafafafaCacaaaa aaaaacaDafaCacaDafaCacaaaa aaaaabaHafaCacaDafaJabaaaa -aaaaaKafafaCacaDafaGabaaaa -aaaaabaLafaCacaDafaBabaaaa -aaaaabaAafaMaMaMafaNabaaaa -aaababaOafafafafafafababaa -abababaPababaQababaRababab -acaSaTaTabaUaVaWabafaRaXac -aYaTaTaTabaZbabbabafababab -acbcaTbdabbebfbgabalaRaXac -abababbhabbibjbkabblababab -abbmabababaVaVaVabababbmab -abbnabbmabboaVbpabbmabbnab -aaaaabbnabacacacabbnabaaaa +aaaaayafafaCacaDafaGabaaaa +aaaaabaKafaCacaDafaBabaaaa +aaaaayafafaLaLaLafaMabaaaa +aaababaNafafafafafafababaa +abababaOababaPababaQababab +acaRaSaSabaTaUaVabafaQaWac +aXaSaSaSabaYaZbaabafababab +acbbaSbcabbdbebfabalaQaWac +abababbgabbhbibjabbkababab +abblabababaUaUaUabababblab +abbmabblabbnaUboabblabbmab +aaaaabbmabacacacabbmabaaaa "} From ed899da1d6f03fa8eab8d8faadd0b859894ccedd Mon Sep 17 00:00:00 2001 From: Nichlas Pihl Date: Thu, 9 Nov 2017 14:54:09 +0100 Subject: [PATCH 15/21] Tweaks the asteroid shuttle airlocks --- _maps/shuttles/emergency_asteroid.dmm | 64 +++++++++++++-------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/_maps/shuttles/emergency_asteroid.dmm b/_maps/shuttles/emergency_asteroid.dmm index c88d34e3ef..db4a6713a9 100644 --- a/_maps/shuttles/emergency_asteroid.dmm +++ b/_maps/shuttles/emergency_asteroid.dmm @@ -22,29 +22,29 @@ "av" = (/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 0; pixel_y = -30},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) "aw" = (/obj/structure/table,/obj/item/weapon/hemostat,/obj/item/weapon/retractor,/obj/item/weapon/scalpel,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) "ax" = (/obj/structure/bed/roller,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"ay" = (/obj/machinery/door/airlock/shuttle,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"ay" = (/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) "az" = (/obj/structure/chair{dir = 1},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) "aA" = (/obj/structure/closet,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) "aB" = (/obj/structure/table,/obj/item/weapon/storage/firstaid/fire,/obj/item/weapon/storage/firstaid/regular,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) "aC" = (/obj/structure/chair{dir = 8},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) "aD" = (/obj/structure/chair{dir = 4},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) "aE" = (/obj/structure/table,/obj/item/weapon/crowbar,/obj/item/weapon/extinguisher,/obj/machinery/recharger,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"aF" = (/obj/docking_port/mobile/emergency{dheight = 2; dir = 4; dwidth = 10; height = 13; name = "Asteroid emergency shuttle"; timid = 1; width = 28},/obj/machinery/door/airlock/shuttle,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) -"aG" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"aH" = (/obj/structure/chair{dir = 4},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"aI" = (/obj/structure/chair{dir = 8},/obj/structure/extinguisher_cabinet{pixel_x = 30},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"aJ" = (/obj/structure/chair{dir = 8},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"aK" = (/obj/structure/table,/obj/item/weapon/crowbar,/obj/item/weapon/extinguisher,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"aL" = (/obj/structure/chair,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"aM" = (/obj/structure/closet/emcloset,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"aN" = (/obj/structure/extinguisher_cabinet{pixel_x = -30},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) -"aO" = (/obj/machinery/door/airlock/glass_mining{name = "Emergency Shuttle Storage"},/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) -"aP" = (/obj/machinery/door/airlock/glass_command{name = "Emergency Shuttle Cockpit"; req_access_txt = "19"},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"aQ" = (/obj/machinery/door/airlock{name = "Emergency Shuttle Restroom"},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) -"aR" = (/obj/machinery/recharge_station,/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) -"aS" = (/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) -"aT" = (/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = -30},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"aU" = (/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aF" = (/obj/machinery/door/airlock/shuttle,/obj/docking_port/mobile/emergency{dheight = 0; dir = 4; dwidth = 10; height = 13; name = "Asteroid emergency shuttle"; timid = 1; width = 28},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"aG" = (/obj/machinery/door/airlock/shuttle,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"aH" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aI" = (/obj/structure/chair{dir = 4},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aJ" = (/obj/structure/chair{dir = 8},/obj/structure/extinguisher_cabinet{pixel_x = 30},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aK" = (/obj/structure/chair{dir = 8},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aL" = (/obj/structure/table,/obj/item/weapon/crowbar,/obj/item/weapon/extinguisher,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aM" = (/obj/structure/chair,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aN" = (/obj/structure/closet/emcloset,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aO" = (/obj/structure/extinguisher_cabinet{pixel_x = -30},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"aP" = (/obj/machinery/door/airlock/glass_mining{name = "Emergency Shuttle Storage"},/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) +"aQ" = (/obj/machinery/door/airlock/glass_command{name = "Emergency Shuttle Cockpit"; req_access_txt = "19"},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aR" = (/obj/machinery/door/airlock{name = "Emergency Shuttle Restroom"},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"aS" = (/obj/machinery/recharge_station,/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) +"aT" = (/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) +"aU" = (/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = -30},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) "aV" = (/obj/structure/extinguisher_cabinet{pixel_x = 30},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) "aW" = (/obj/machinery/disposal/bin/toilet{dir = 8},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) "aX" = (/obj/machinery/door/airlock/shuttle,/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) @@ -75,24 +75,24 @@ apaeaeaeaeaeacafafafafaqac abarasaraeatabauafafavawab abababacahacabacaiacababab aaababaxafafafafafaxababaa -aaaaayafafazazazafaAabaaaa -aaaaabaBafaCacaDafaEabaaaa -aaaaaFafafaCacaDafaGabaaaa -aaaaabaHafaCacaDafaIabaaaa +aaaaabayafazazazafaAabaaaa +abacabaBafaCacaDafaEabaaaa +aFafaGafafaCacaDafaHabaaaa +abacabaIafaCacaDafaJabaaaa aaaaacaDafaCacaDafaCacaaaa aaaaacaDafafafafafaCacaaaa aaaaacaDafaCacaDafaCacaaaa -aaaaabaHafaCacaDafaJabaaaa -aaaaayafafaCacaDafaGabaaaa -aaaaabaKafaCacaDafaBabaaaa -aaaaayafafaLaLaLafaMabaaaa -aaababaNafafafafafafababaa -abababaOababaPababaQababab -acaRaSaSabaTaUaVabafaQaWac -aXaSaSaSabaYaZbaabafababab -acbbaSbcabbdbebfabalaQaWac +abacabaIafaCacaDafaKabaaaa +aGafaGafafaCacaDafaHabaaaa +abacabaLafaCacaDafaBabaaaa +aaaaabayafaMaMaMafaNabaaaa +aaababaOafafafafafafababaa +abababaPababaQababaRababab +acaSaTaTabaUayaVabafaRaWac +aXaTaTaTabaYaZbaabafababab +acbbaTbcabbdbebfabalaRaWac abababbgabbhbibjabbkababab -abblabababaUaUaUabababblab -abbmabblabbnaUboabblabbmab +abblabababayayayabababblab +abbmabblabbnayboabblabbmab aaaaabbmabacacacabbmabaaaa "} From e201c9db7bfed4131498959981fd5aff05fffe9e Mon Sep 17 00:00:00 2001 From: Nichlas Pihl Date: Fri, 10 Nov 2017 05:24:01 +0100 Subject: [PATCH 16/21] Ports the tau ceti escape shuttle --- _maps/shuttles/emergency_tauceti.dmm | 93 +++++++++++++++++++++++++++ code/datums/shuttles.dm | 5 ++ icons/obj/chairs.dmi | Bin 26273 -> 28498 bytes 3 files changed, 98 insertions(+) create mode 100644 _maps/shuttles/emergency_tauceti.dmm diff --git a/_maps/shuttles/emergency_tauceti.dmm b/_maps/shuttles/emergency_tauceti.dmm new file mode 100644 index 0000000000..07c0f4f544 --- /dev/null +++ b/_maps/shuttles/emergency_tauceti.dmm @@ -0,0 +1,93 @@ +"aa" = (/turf/open/space,/area/space) +"ab" = (/turf/closed/wall/shuttle/smooth,/area/shuttle/escape) +"ac" = (/obj/structure/grille,/obj/structure/window/shuttle,/turf/open/floor/plating/airless,/area/shuttle/escape) +"ad" = (/turf/closed/wall/shuttle/smooth/nodiagonal,/area/shuttle/escape) +"ae" = (/obj/machinery/computer/communications,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"af" = (/obj/machinery/computer/crew,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"ag" = (/obj/machinery/computer/emergency_shuttle,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"ah" = (/obj/machinery/computer/station_alert,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"ai" = (/obj/structure/chair{tag = "icon-chair_shuttle (WEST)"; icon_state = "chair_shuttle"; dir = 8},/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) +"aj" = (/obj/structure/chair{tag = "icon-chair_shuttle (NORTH)"; icon_state = "chair_shuttle"; dir = 1},/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) +"ak" = (/obj/structure/table,/obj/item/weapon/storage/firstaid/regular,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"al" = (/obj/structure/table,/obj/item/weapon/storage/firstaid/toxin,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"am" = (/obj/structure/table,/obj/item/weapon/storage/firstaid/fire,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"an" = (/obj/structure/chair{tag = "icon-chair_shuttle (EAST)"; icon_state = "chair_shuttle"; dir = 4},/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) +"ao" = (/obj/machinery/computer/secure_data,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"ap" = (/obj/machinery/computer/robotics,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aq" = (/obj/structure/chair{tag = "icon-chair_shuttle (WEST)"; icon_state = "chair_shuttle"; dir = 8},/obj/machinery/light,/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) +"ar" = (/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) +"as" = (/obj/structure/chair{tag = "icon-chair_shuttle (EAST)"; icon_state = "chair_shuttle"; dir = 4},/obj/machinery/light,/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) +"at" = (/obj/machinery/computer/card,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"au" = (/obj/machinery/door/airlock/glass_command{name = "Escape Shuttle Cockpit"; req_access_txt = "19"},/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) +"av" = (/obj/structure/table,/obj/item/weapon/storage/firstaid/o2,/obj/item/weapon/storage/firstaid/toxin,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"aw" = (/obj/machinery/light{dir = 1},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"ax" = (/obj/structure/chair{tag = "icon-chair_shuttle (WEST)"; icon_state = "chair_shuttle"; dir = 8},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"ay" = (/obj/structure/chair{tag = "icon-chair_shuttle"; icon_state = "chair_shuttle"},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"az" = (/obj/structure/flora/kirbyplants{tag = "icon-plant-10"; icon_state = "plant-10"},/obj/structure/window/reinforced{dir = 8},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aA" = (/obj/structure/flora/kirbyplants{tag = "icon-plant-10"; icon_state = "plant-10"},/obj/machinery/light{dir = 1},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aB" = (/obj/structure/table,/obj/item/weapon/storage/firstaid/brute,/obj/item/weapon/storage/firstaid/fire,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"aC" = (/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"aD" = (/obj/structure/chair{tag = "icon-chair_shuttle (WEST)"; icon_state = "chair_shuttle"; dir = 8},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aE" = (/obj/machinery/sleeper{icon_state = "sleeper-open"; dir = 4},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"aF" = (/obj/machinery/light,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"aG" = (/obj/machinery/door/airlock/glass_virology{name = "Escape Shuttle Infirmary"},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"aH" = (/obj/machinery/door/airlock/glass,/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) +"aI" = (/obj/machinery/door/airlock/shuttle,/obj/docking_port/mobile/emergency{dwidth = 10; timid = 1; width = 26},/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) +"aJ" = (/obj/structure/table,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aK" = (/obj/structure/closet/emcloset,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aL" = (/obj/structure/chair{tag = "icon-chair_shuttle (NORTH)"; icon_state = "chair_shuttle"; dir = 1},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aM" = (/obj/machinery/door/airlock/shuttle,/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) +"aN" = (/obj/structure/chair{tag = "icon-chair_shuttle (EAST)"; icon_state = "chair_shuttle"; dir = 4},/obj/machinery/light{dir = 8},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aO" = (/obj/structure/chair{tag = "icon-chair_shuttle (WEST)"; icon_state = "chair_shuttle"; dir = 8},/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aP" = (/obj/machinery/door/airlock/maintenance_hatch,/turf/open/floor/plating,/area/shuttle/escape) +"aQ" = (/obj/machinery/door/airlock/glass_security{name = "Escape Shuttle Brig"; req_access_txt = "2"},/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"aR" = (/obj/structure/reagent_dispensers/watertank,/turf/open/floor/plating,/area/shuttle/escape) +"aS" = (/turf/open/floor/plating,/area/shuttle/escape) +"aT" = (/obj/structure/table,/obj/item/weapon/storage/toolbox,/obj/machinery/light/small{dir = 4},/turf/open/floor/plating,/area/shuttle/escape) +"aU" = (/obj/structure/table,/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"aV" = (/obj/structure/chair{tag = "icon-chair_shuttle"; icon_state = "chair_shuttle"},/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"aW" = (/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"aX" = (/obj/structure/chair{tag = "icon-chair_shuttle (WEST)"; icon_state = "chair_shuttle"; dir = 8},/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"aY" = (/obj/machinery/light/small{dir = 8},/turf/open/floor/plating,/area/shuttle/escape) +"aZ" = (/obj/structure/table,/obj/item/weapon/extinguisher,/turf/open/floor/plating,/area/shuttle/escape) +"ba" = (/obj/structure/chair{tag = "icon-chair_shuttle (EAST)"; icon_state = "chair_shuttle"; dir = 4},/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"bb" = (/obj/machinery/door/airlock/glass_engineering{name = "Engineering Hatch"},/turf/open/floor/plating,/area/shuttle/escape) +"bc" = (/obj/structure/window/reinforced,/obj/structure/chair{tag = "icon-chair_shuttle (EAST)"; icon_state = "chair_shuttle"; dir = 4},/obj/machinery/light{dir = 8},/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"bd" = (/obj/structure/window/reinforced,/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"be" = (/obj/machinery/door/window/brigdoor,/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"bf" = (/obj/structure/window/reinforced,/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"bg" = (/obj/structure/closet/toolcloset,/turf/open/floor/plating,/area/shuttle/escape) +"bh" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/open/floor/plating,/area/shuttle/escape) +"bi" = (/obj/machinery/portable_atmospherics/canister/air,/obj/machinery/light/small{dir = 1},/turf/open/floor/plating,/area/shuttle/escape) +"bj" = (/obj/machinery/portable_atmospherics/canister/air,/turf/open/floor/plating,/area/shuttle/escape) +"bk" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/shuttle/engine/heater,/turf/open/floor/plating/airless,/area/shuttle/escape) +"bl" = (/obj/structure/shuttle/engine/propulsion,/turf/open/floor/plating/airless,/area/shuttle/escape) + +(1,1,1) = {" +aaabacacabaaabacacabaa +abadaeafadadadagaeabab +adahaiajakalamajanaoab +adapaqarararararasatab +adadadadadauadadadadad +adavawaxadarayazayaAab +acaBaCaxadarayayaraDac +acaCaCaCadarayayaraDac +adaEaFaCadararararaDab +adacacaGadaHadadaHadad +aIararararararararaJab +adaKaraLaLaraLaLaraKab +ababaraLaLaraLaLarabab +aaacaraLaLaraLaLaracaa +ababaraLaLaraLaLarabab +adaKaraLaLaraLaLaraKab +aMararararararararaJab +adaNaraLaLadaLaLaraOab +adadaPadadadadadaQadab +adaRaSaSaTadaUaVaWaXab +adaYaSaSaZadbaaWaWaXab +adadbbadadadbcbdbebfab +adaSaSaSbgadaUaWaWaXab +adbhbibjadadadbaaWaXab +adbkbkbkabaaabbkbkbkab +abblblblabaaabblblblab +"} diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm index ca29ff76ee..d4184e2a2a 100644 --- a/code/datums/shuttles.dm +++ b/code/datums/shuttles.dm @@ -138,6 +138,11 @@ without protective goggles. Emitters spawn powered on, expect \ admin notices, they are harmless." +/datum/map_template/shuttle/emergency/tauceti + suffix = "tauceti" + name = "Tau Ceti Escape Shuttle" + credit_cost = 12500 + /datum/map_template/shuttle/emergency/imfedupwiththisworld suffix = "imfedupwiththisworld" name = "Oh, Hi Daniel" diff --git a/icons/obj/chairs.dmi b/icons/obj/chairs.dmi index 7a0ccdcbe56034e2962f3199d691f0fae0634298..97657f4845e9d505ab75092cefbebe9e4c471b24 100644 GIT binary patch delta 5464 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 Hu0mjfyDnuN From eecc93d4663d958a836f0bb899a129abb6bf19f5 Mon Sep 17 00:00:00 2001 From: Nichlas Pihl Date: Fri, 10 Nov 2017 05:27:44 +0100 Subject: [PATCH 17/21] Adds screens to the tau ceti shuttle, which I forgot --- _maps/shuttles/emergency_tauceti.dmm | 133 ++++++++++++++------------- 1 file changed, 67 insertions(+), 66 deletions(-) diff --git a/_maps/shuttles/emergency_tauceti.dmm b/_maps/shuttles/emergency_tauceti.dmm index 07c0f4f544..a56773c5f1 100644 --- a/_maps/shuttles/emergency_tauceti.dmm +++ b/_maps/shuttles/emergency_tauceti.dmm @@ -18,76 +18,77 @@ "ar" = (/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) "as" = (/obj/structure/chair{tag = "icon-chair_shuttle (EAST)"; icon_state = "chair_shuttle"; dir = 4},/obj/machinery/light,/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) "at" = (/obj/machinery/computer/card,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"au" = (/obj/machinery/door/airlock/glass_command{name = "Escape Shuttle Cockpit"; req_access_txt = "19"},/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) -"av" = (/obj/structure/table,/obj/item/weapon/storage/firstaid/o2,/obj/item/weapon/storage/firstaid/toxin,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) -"aw" = (/obj/machinery/light{dir = 1},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) -"ax" = (/obj/structure/chair{tag = "icon-chair_shuttle (WEST)"; icon_state = "chair_shuttle"; dir = 8},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) -"ay" = (/obj/structure/chair{tag = "icon-chair_shuttle"; icon_state = "chair_shuttle"},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"az" = (/obj/structure/flora/kirbyplants{tag = "icon-plant-10"; icon_state = "plant-10"},/obj/structure/window/reinforced{dir = 8},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"aA" = (/obj/structure/flora/kirbyplants{tag = "icon-plant-10"; icon_state = "plant-10"},/obj/machinery/light{dir = 1},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"aB" = (/obj/structure/table,/obj/item/weapon/storage/firstaid/brute,/obj/item/weapon/storage/firstaid/fire,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) -"aC" = (/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) -"aD" = (/obj/structure/chair{tag = "icon-chair_shuttle (WEST)"; icon_state = "chair_shuttle"; dir = 8},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"aE" = (/obj/machinery/sleeper{icon_state = "sleeper-open"; dir = 4},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) -"aF" = (/obj/machinery/light,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) -"aG" = (/obj/machinery/door/airlock/glass_virology{name = "Escape Shuttle Infirmary"},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) -"aH" = (/obj/machinery/door/airlock/glass,/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) -"aI" = (/obj/machinery/door/airlock/shuttle,/obj/docking_port/mobile/emergency{dwidth = 10; timid = 1; width = 26},/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) -"aJ" = (/obj/structure/table,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"aK" = (/obj/structure/closet/emcloset,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"aL" = (/obj/structure/chair{tag = "icon-chair_shuttle (NORTH)"; icon_state = "chair_shuttle"; dir = 1},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"aM" = (/obj/machinery/door/airlock/shuttle,/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) -"aN" = (/obj/structure/chair{tag = "icon-chair_shuttle (EAST)"; icon_state = "chair_shuttle"; dir = 4},/obj/machinery/light{dir = 8},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"aO" = (/obj/structure/chair{tag = "icon-chair_shuttle (WEST)"; icon_state = "chair_shuttle"; dir = 8},/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"aP" = (/obj/machinery/door/airlock/maintenance_hatch,/turf/open/floor/plating,/area/shuttle/escape) -"aQ" = (/obj/machinery/door/airlock/glass_security{name = "Escape Shuttle Brig"; req_access_txt = "2"},/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) -"aR" = (/obj/structure/reagent_dispensers/watertank,/turf/open/floor/plating,/area/shuttle/escape) -"aS" = (/turf/open/floor/plating,/area/shuttle/escape) -"aT" = (/obj/structure/table,/obj/item/weapon/storage/toolbox,/obj/machinery/light/small{dir = 4},/turf/open/floor/plating,/area/shuttle/escape) -"aU" = (/obj/structure/table,/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) -"aV" = (/obj/structure/chair{tag = "icon-chair_shuttle"; icon_state = "chair_shuttle"},/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) -"aW" = (/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) -"aX" = (/obj/structure/chair{tag = "icon-chair_shuttle (WEST)"; icon_state = "chair_shuttle"; dir = 8},/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) -"aY" = (/obj/machinery/light/small{dir = 8},/turf/open/floor/plating,/area/shuttle/escape) -"aZ" = (/obj/structure/table,/obj/item/weapon/extinguisher,/turf/open/floor/plating,/area/shuttle/escape) -"ba" = (/obj/structure/chair{tag = "icon-chair_shuttle (EAST)"; icon_state = "chair_shuttle"; dir = 4},/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) -"bb" = (/obj/machinery/door/airlock/glass_engineering{name = "Engineering Hatch"},/turf/open/floor/plating,/area/shuttle/escape) -"bc" = (/obj/structure/window/reinforced,/obj/structure/chair{tag = "icon-chair_shuttle (EAST)"; icon_state = "chair_shuttle"; dir = 4},/obj/machinery/light{dir = 8},/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) -"bd" = (/obj/structure/window/reinforced,/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) -"be" = (/obj/machinery/door/window/brigdoor,/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) -"bf" = (/obj/structure/window/reinforced,/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) -"bg" = (/obj/structure/closet/toolcloset,/turf/open/floor/plating,/area/shuttle/escape) -"bh" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/open/floor/plating,/area/shuttle/escape) -"bi" = (/obj/machinery/portable_atmospherics/canister/air,/obj/machinery/light/small{dir = 1},/turf/open/floor/plating,/area/shuttle/escape) -"bj" = (/obj/machinery/portable_atmospherics/canister/air,/turf/open/floor/plating,/area/shuttle/escape) -"bk" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/shuttle/engine/heater,/turf/open/floor/plating/airless,/area/shuttle/escape) -"bl" = (/obj/structure/shuttle/engine/propulsion,/turf/open/floor/plating/airless,/area/shuttle/escape) +"au" = (/obj/machinery/status_display,/turf/closed/wall/shuttle/smooth/nodiagonal,/area/shuttle/escape) +"av" = (/obj/machinery/door/airlock/glass_command{name = "Escape Shuttle Cockpit"; req_access_txt = "19"},/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) +"aw" = (/obj/structure/table,/obj/item/weapon/storage/firstaid/o2,/obj/item/weapon/storage/firstaid/toxin,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"ax" = (/obj/machinery/light{dir = 1},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"ay" = (/obj/structure/chair{tag = "icon-chair_shuttle (WEST)"; icon_state = "chair_shuttle"; dir = 8},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"az" = (/obj/structure/chair{tag = "icon-chair_shuttle"; icon_state = "chair_shuttle"},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aA" = (/obj/structure/flora/kirbyplants{tag = "icon-plant-10"; icon_state = "plant-10"},/obj/structure/window/reinforced{dir = 8},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aB" = (/obj/structure/flora/kirbyplants{tag = "icon-plant-10"; icon_state = "plant-10"},/obj/machinery/light{dir = 1},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aC" = (/obj/structure/table,/obj/item/weapon/storage/firstaid/brute,/obj/item/weapon/storage/firstaid/fire,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"aD" = (/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"aE" = (/obj/structure/chair{tag = "icon-chair_shuttle (WEST)"; icon_state = "chair_shuttle"; dir = 8},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aF" = (/obj/machinery/sleeper{icon_state = "sleeper-open"; dir = 4},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"aG" = (/obj/machinery/light,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"aH" = (/obj/machinery/door/airlock/glass_virology{name = "Escape Shuttle Infirmary"},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"aI" = (/obj/machinery/door/airlock/glass,/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) +"aJ" = (/obj/machinery/door/airlock/shuttle,/obj/docking_port/mobile/emergency{dwidth = 10; timid = 1; width = 26},/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) +"aK" = (/obj/structure/table,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aL" = (/obj/structure/closet/emcloset,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aM" = (/obj/structure/chair{tag = "icon-chair_shuttle (NORTH)"; icon_state = "chair_shuttle"; dir = 1},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aN" = (/obj/machinery/door/airlock/shuttle,/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) +"aO" = (/obj/structure/chair{tag = "icon-chair_shuttle (EAST)"; icon_state = "chair_shuttle"; dir = 4},/obj/machinery/light{dir = 8},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aP" = (/obj/structure/chair{tag = "icon-chair_shuttle (WEST)"; icon_state = "chair_shuttle"; dir = 8},/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aQ" = (/obj/machinery/door/airlock/maintenance_hatch,/turf/open/floor/plating,/area/shuttle/escape) +"aR" = (/obj/machinery/door/airlock/glass_security{name = "Escape Shuttle Brig"; req_access_txt = "2"},/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"aS" = (/obj/structure/reagent_dispensers/watertank,/turf/open/floor/plating,/area/shuttle/escape) +"aT" = (/turf/open/floor/plating,/area/shuttle/escape) +"aU" = (/obj/structure/table,/obj/item/weapon/storage/toolbox,/obj/machinery/light/small{dir = 4},/turf/open/floor/plating,/area/shuttle/escape) +"aV" = (/obj/structure/table,/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"aW" = (/obj/structure/chair{tag = "icon-chair_shuttle"; icon_state = "chair_shuttle"},/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"aX" = (/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"aY" = (/obj/structure/chair{tag = "icon-chair_shuttle (WEST)"; icon_state = "chair_shuttle"; dir = 8},/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"aZ" = (/obj/machinery/light/small{dir = 8},/turf/open/floor/plating,/area/shuttle/escape) +"ba" = (/obj/structure/table,/obj/item/weapon/extinguisher,/turf/open/floor/plating,/area/shuttle/escape) +"bb" = (/obj/structure/chair{tag = "icon-chair_shuttle (EAST)"; icon_state = "chair_shuttle"; dir = 4},/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"bc" = (/obj/machinery/door/airlock/glass_engineering{name = "Engineering Hatch"},/turf/open/floor/plating,/area/shuttle/escape) +"bd" = (/obj/structure/window/reinforced,/obj/structure/chair{tag = "icon-chair_shuttle (EAST)"; icon_state = "chair_shuttle"; dir = 4},/obj/machinery/light{dir = 8},/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"be" = (/obj/structure/window/reinforced,/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"bf" = (/obj/machinery/door/window/brigdoor,/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"bg" = (/obj/structure/window/reinforced,/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"bh" = (/obj/structure/closet/toolcloset,/turf/open/floor/plating,/area/shuttle/escape) +"bi" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/open/floor/plating,/area/shuttle/escape) +"bj" = (/obj/machinery/portable_atmospherics/canister/air,/obj/machinery/light/small{dir = 1},/turf/open/floor/plating,/area/shuttle/escape) +"bk" = (/obj/machinery/portable_atmospherics/canister/air,/turf/open/floor/plating,/area/shuttle/escape) +"bl" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/shuttle/engine/heater,/turf/open/floor/plating/airless,/area/shuttle/escape) +"bm" = (/obj/structure/shuttle/engine/propulsion,/turf/open/floor/plating/airless,/area/shuttle/escape) (1,1,1) = {" aaabacacabaaabacacabaa abadaeafadadadagaeabab adahaiajakalamajanaoab adapaqarararararasatab -adadadadadauadadadadad -adavawaxadarayazayaAab -acaBaCaxadarayayaraDac -acaCaCaCadarayayaraDac -adaEaFaCadararararaDab -adacacaGadaHadadaHadad -aIararararararararaJab -adaKaraLaLaraLaLaraKab -ababaraLaLaraLaLarabab -aaacaraLaLaraLaLaracaa -ababaraLaLaraLaLarabab -adaKaraLaLaraLaLaraKab -aMararararararararaJab -adaNaraLaLadaLaLaraOab -adadaPadadadadadaQadab -adaRaSaSaTadaUaVaWaXab -adaYaSaSaZadbaaWaWaXab -adadbbadadadbcbdbebfab -adaSaSaSbgadaUaWaWaXab -adbhbibjadadadbaaWaXab -adbkbkbkabaaabbkbkbkab -abblblblabaaabblblblab +adadauadadavadadauadad +adawaxayadarazaAazaBab +acaCaDayadarazazaraEac +acaDaDaDadarazazaraEac +adaFaGaDadararararaEab +adacacaHadaIadadaIadad +aJararararararararaKab +adaLaraMaMaraMaMaraLab +ababaraMaMaraMaMarabab +aaacaraMaMaraMaMaracaa +ababaraMaMaraMaMarabab +adaLaraMaMaraMaMaraLab +aNararararararararaKab +adaOaraMaMadaMaMaraPab +adadaQauadadadauaRadab +adaSaTaTaUadaVaWaXaYab +adaZaTaTbaadbbaXaXaYab +adadbcadadadbdbebfbgab +adaTaTaTbhadaVaXaXaYab +adbibjbkadadadbbaXaYab +adblblblabaaabblblblab +abbmbmbmabaaabbmbmbmab "} From 738fe38b43e44414520e7f04892b0501d6b2920f Mon Sep 17 00:00:00 2001 From: Nichlas Pihl Date: Fri, 17 Nov 2017 03:28:23 +0100 Subject: [PATCH 18/21] Adds the nuke ops shuttle as a buy-able emag shuttle --- _maps/shuttles/emergency_nukeops.dmm | 101 +++++++++++++++++++++++++++ code/datums/shuttles.dm | 7 ++ 2 files changed, 108 insertions(+) create mode 100644 _maps/shuttles/emergency_nukeops.dmm diff --git a/_maps/shuttles/emergency_nukeops.dmm b/_maps/shuttles/emergency_nukeops.dmm new file mode 100644 index 0000000000..463c1e8bf0 --- /dev/null +++ b/_maps/shuttles/emergency_nukeops.dmm @@ -0,0 +1,101 @@ +"aa" = (/turf/open/space,/area/space) +"ab" = (/turf/open/space,/turf/closed/wall/shuttle{dir = 8; icon_state = "diagonalWall3"},/area/shuttle/escape) +"ac" = (/turf/closed/indestructible/opshuttle,/area/shuttle/escape) +"ad" = (/obj/structure/grille,/obj/machinery/door/poddoor/shutters{id = "syndieshutters2"; name = "blast shutters"},/obj/structure/window/reinforced/fulltile,/turf/open/floor/plating,/area/shuttle/escape) +"ae" = (/obj/structure/grille,/obj/machinery/door/poddoor/shutters{id = "syndieshutters2"; name = "blast shutters"},/obj/structure/window/reinforced/fulltile,/turf/open/floor/plating,/area/shuttle/escape) +"af" = (/turf/open/space,/turf/closed/wall/shuttle{dir = 1; icon_state = "diagonalWall3"},/area/shuttle/escape) +"ag" = (/obj/structure/table,/obj/machinery/microwave,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"ah" = (/obj/structure/table,/obj/item/device/flashlight/lamp{pixel_x = 4; pixel_y = 1},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"ai" = (/obj/machinery/computer/communications,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"aj" = (/obj/machinery/computer/emergency_shuttle,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"ak" = (/obj/structure/table,/obj/machinery/button/door{id = "syndieshutters2"; name = "remote shutter control"; req_access_txt = "150"},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"al" = (/obj/structure/frame/computer,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"am" = (/obj/structure/table,/obj/item/weapon/storage/box/donkpockets{pixel_x = 3; pixel_y = 3},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"an" = (/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"ao" = (/obj/structure/chair/comfy/beige{dir = 1; icon_state = "comfychair"},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"ap" = (/obj/structure/table,/obj/item/stack/sheet/glass{amount = 10},/obj/item/device/multitool,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"aq" = (/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; freerange = 1; frequency = 1213; name = "Syndicate Intercom"; pixel_y = -32; subspace_transmission = 1; syndie = 1},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"ar" = (/obj/structure/closet/syndicate/personal,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"as" = (/turf/open/space,/turf/closed/wall/shuttle{dir = 2; icon_state = "diagonalWall3"},/area/shuttle/escape) +"at" = (/obj/machinery/door/window{name = "Cockpit"; req_access_txt = "0"},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"au" = (/turf/closed/wall/shuttle{icon_state = "wall3"},/area/shuttle/escape) +"av" = (/turf/open/space,/turf/closed/wall/shuttle{dir = 4; icon_state = "diagonalWall3"},/area/shuttle/escape) +"aw" = (/obj/structure/table,/obj/item/stack/cable_coil,/obj/item/weapon/crowbar/red,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"ax" = (/obj/structure/table,/obj/item/weapon/storage/box/zipties{pixel_x = 1; pixel_y = 2},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"ay" = (/obj/structure/chair{dir = 8},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"az" = (/obj/structure/closet/syndicate/nuclear,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"aA" = (/obj/machinery/suit_storage_unit/syndicate,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"aB" = (/obj/structure/table,/obj/item/device/aicard,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"aC" = (/obj/structure/chair/stool{pixel_y = 8},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"aD" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/turf/open/floor/plating,/area/shuttle/escape) +"aE" = (/obj/machinery/door/window{name = "Ready Room"; req_access_txt = "0"},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"aF" = (/obj/structure/table,/obj/item/weapon/c4{pixel_x = -2; pixel_y = -1},/obj/item/weapon/c4{pixel_x = -2; pixel_y = -1},/obj/item/weapon/c4{pixel_x = -2; pixel_y = -1},/obj/item/weapon/c4{pixel_x = -2; pixel_y = -1},/obj/item/weapon/c4{pixel_x = -2; pixel_y = -1},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"aG" = (/obj/machinery/door/airlock/external,/obj/docking_port/mobile/emergency{dheight = 1; dwidth = 11; height = 17; timid = 1; width = 23},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"aH" = (/obj/machinery/door/airlock/external,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"aI" = (/obj/machinery/door/window{base_state = "right"; dir = 8; icon_state = "right"; name = "EVA Storage"; req_access_txt = "0"; tag = "icon-right (WEST)"},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"aJ" = (/obj/machinery/door/window{dir = 8; name = "EVA storage"; req_access_txt = "0"},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"aK" = (/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; freerange = 1; frequency = 1213; name = "Syndicate Intercom"; pixel_x = -32; subspace_transmission = 1; syndie = 1},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"aL" = (/obj/machinery/sleeper/syndie{dir = 4},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) +"aM" = (/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) +"aN" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) +"aO" = (/obj/structure/tank_dispenser/oxygen,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) +"aP" = (/obj/structure/table,/obj/item/stack/medical/ointment,/obj/item/stack/medical/bruise_pack,/obj/structure/extinguisher_cabinet{pixel_x = -5; pixel_y = 30},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) +"aQ" = (/obj/structure/table,/obj/item/weapon/stock_parts/cell/high{pixel_x = -3; pixel_y = 3},/obj/item/weapon/stock_parts/cell/high,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"aR" = (/obj/structure/table,/obj/item/weapon/screwdriver{pixel_y = 9},/obj/item/device/assembly/voice{pixel_y = 3},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"aS" = (/obj/structure/table,/obj/item/weapon/wrench,/obj/item/device/assembly/infra,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"aT" = (/obj/structure/table,/obj/item/device/assembly/signaler,/obj/item/device/assembly/signaler,/obj/item/device/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/obj/item/device/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"aU" = (/obj/structure/table,/obj/item/weapon/weldingtool/largetank{pixel_y = 3},/obj/item/device/multitool,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"aV" = (/obj/structure/bed/roller,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) +"aW" = (/obj/structure/sign/bluecross_2,/turf/closed/indestructible/opshuttle,/area/shuttle/escape) +"aX" = (/obj/structure/table,/obj/item/weapon/storage/toolbox/syndicate,/obj/item/weapon/crowbar/red,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"aY" = (/obj/machinery/door/window{dir = 4; name = "Infirmary"; req_access_txt = "0"},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) +"aZ" = (/obj/machinery/door/window/westright{name = "Tool Storage"; req_access_txt = "0"},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"ba" = (/obj/machinery/door/window{base_state = "right"; dir = 4; icon_state = "right"; name = "Infirmary"; req_access_txt = "0"},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) +"bb" = (/obj/machinery/door/window{dir = 8; name = "Tool Storage"; req_access_txt = "0"},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"bc" = (/obj/machinery/recharge_station,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"bd" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/table,/obj/item/robot_parts/r_arm,/obj/item/robot_parts/l_arm,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) +"be" = (/obj/machinery/door/window{dir = 1; name = "Surgery"; req_access_txt = "0"},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) +"bf" = (/obj/structure/window/reinforced{dir = 1},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) +"bg" = (/obj/structure/table,/obj/structure/window/reinforced{dir = 8},/obj/item/weapon/storage/firstaid/regular{pixel_x = 3; pixel_y = 3},/obj/item/weapon/storage/firstaid/brute,/obj/item/weapon/storage/firstaid/toxin{pixel_x = -3; pixel_y = -3},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) +"bh" = (/obj/structure/table,/obj/item/weapon/storage/firstaid/regular{pixel_x = 3; pixel_y = 3},/obj/item/weapon/storage/firstaid/fire,/obj/item/weapon/storage/firstaid/regular{pixel_x = -3; pixel_y = -3},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) +"bi" = (/obj/structure/table,/obj/item/device/sbeacondrop/bomb{pixel_y = 5},/obj/item/device/sbeacondrop/bomb,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"bj" = (/obj/structure/table,/obj/item/weapon/grenade/syndieminibomb{pixel_x = 4; pixel_y = 2},/obj/item/weapon/grenade/syndieminibomb{pixel_x = -1},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"bk" = (/obj/structure/table,/obj/item/weapon/surgicaldrill,/obj/item/weapon/circular_saw,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) +"bl" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/structure/mirror{pixel_x = 30},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) +"bm" = (/obj/machinery/door/window{dir = 1; name = "Secure Storage"; req_access_txt = "0"},/obj/machinery/nuclearbomb,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"bn" = (/obj/structure/table,/obj/item/weapon/cautery,/obj/item/weapon/scalpel,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) +"bo" = (/obj/structure/table/optable,/obj/item/weapon/surgical_drapes,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) +"bp" = (/obj/structure/table,/obj/item/weapon/retractor,/obj/item/weapon/hemostat,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) +"bq" = (/obj/structure/shuttle/engine/heater,/obj/structure/window/reinforced{dir = 1},/turf/open/floor/plating,/area/shuttle/escape) +"br" = (/obj/structure/reagent_dispensers/fueltank,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"bs" = (/obj/structure/table,/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/glass{amount = 50},/obj/item/stack/rods{amount = 50},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"bt" = (/obj/structure/rack,/obj/item/clothing/suit/space/syndicate/black/red,/obj/item/clothing/head/helmet/space/syndicate/black/red,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"bu" = (/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion_l"},/turf/open/floor/plating,/area/shuttle/escape) +"bv" = (/obj/structure/shuttle/engine/propulsion,/turf/open/floor/plating,/area/shuttle/escape) +"bw" = (/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion_r"},/turf/open/floor/plating,/area/shuttle/escape) + +(1,1,1) = {" +aaaaaaaaabacadadadadaeacafaaaaaaaa +aaaaaaaaacagahaiajakalalacaaaaaaaa +aaaaaaaaacamanaoaoanananacaaaaaaaa +aaaaaaaaacapanananaqanaracaaaaaaaa +aaaaaaaaasacacacatauacacavaaaaaaaa +aaaaaaaaaaasacawanaxacavaaaaaaaaaa +aaaaaaaaaaaaacananayacaaaaaaaaaaaa +aaaaaaaaaaaaacananayacacacacacafaa +aaaaaaaaaaaaacananayacazananaAacaa +aaabacacacacacananayacaBaCanaAacaa +aaacananananacaDaEaDacaFananaAacaa +aaaGananananaHanananaIanananaAacaa +aaacananananaDanananaJanananaAacaa +abacacacacacacaKananacacacacacacaf +acaLaMaNaOaPacanananacaQaRaSaTaUac +acaVaMaMaMaMaWanananacanananaCaXac +acaLaMaMaMaMaYanananaZanananananac +acaMaMaMaMaMbaanananbbananananbcac +acbdbebfbgbhacanananacbibjananbcac +acbkaMblacacacaDbmaDacacacanananac +acbnbobpacaaacbqbqbqacaaacbrbsbtac +acbqbqbqacaaasbubvbwavaaacbqbqbqac +asbubvbwavaaaaaaaaaaaaaaasbubvbwav +"} diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm index d4184e2a2a..30d88a87fb 100644 --- a/code/datums/shuttles.dm +++ b/code/datums/shuttles.dm @@ -203,6 +203,13 @@ emag_buy = TRUE credit_cost = 2500 +/datum/map_template/shuttle/emergency/nukeops + suffix = "nukeops" + name = "Syndicate Boarding Shuttle" + description = "A shuttle usually used by syndicate boarding parties, comes prepackaged with guns, explosives and hardsuits." + emag_buy = TRUE + credit_cost = 20000 + /datum/map_template/shuttle/ferry/base suffix = "base" name = "transport ferry" From 339c663bc6c41c0ca1330df531f504b2ef260337 Mon Sep 17 00:00:00 2001 From: Nichlas Pihl Date: Fri, 17 Nov 2017 13:57:20 +0100 Subject: [PATCH 19/21] Makes the nuke-ops shuttle non-invincible. oops --- _maps/shuttles/emergency_nukeops.dmm | 191 +++++++++++++-------------- 1 file changed, 95 insertions(+), 96 deletions(-) diff --git a/_maps/shuttles/emergency_nukeops.dmm b/_maps/shuttles/emergency_nukeops.dmm index 463c1e8bf0..13fb51f182 100644 --- a/_maps/shuttles/emergency_nukeops.dmm +++ b/_maps/shuttles/emergency_nukeops.dmm @@ -1,101 +1,100 @@ "aa" = (/turf/open/space,/area/space) -"ab" = (/turf/open/space,/turf/closed/wall/shuttle{dir = 8; icon_state = "diagonalWall3"},/area/shuttle/escape) -"ac" = (/turf/closed/indestructible/opshuttle,/area/shuttle/escape) +"ab" = (/turf/open/space,/turf/closed/wall/shuttle{tag = "icon-wall3 (NORTHWEST)"; icon_state = "wall3"; dir = 9},/area/shuttle/escape) +"ac" = (/turf/closed/wall/shuttle{icon = 'icons/turf/walls.dmi'; icon_state = "wall3"},/area/shuttle/escape) "ad" = (/obj/structure/grille,/obj/machinery/door/poddoor/shutters{id = "syndieshutters2"; name = "blast shutters"},/obj/structure/window/reinforced/fulltile,/turf/open/floor/plating,/area/shuttle/escape) -"ae" = (/obj/structure/grille,/obj/machinery/door/poddoor/shutters{id = "syndieshutters2"; name = "blast shutters"},/obj/structure/window/reinforced/fulltile,/turf/open/floor/plating,/area/shuttle/escape) -"af" = (/turf/open/space,/turf/closed/wall/shuttle{dir = 1; icon_state = "diagonalWall3"},/area/shuttle/escape) -"ag" = (/obj/structure/table,/obj/machinery/microwave,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) -"ah" = (/obj/structure/table,/obj/item/device/flashlight/lamp{pixel_x = 4; pixel_y = 1},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) -"ai" = (/obj/machinery/computer/communications,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) -"aj" = (/obj/machinery/computer/emergency_shuttle,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) -"ak" = (/obj/structure/table,/obj/machinery/button/door{id = "syndieshutters2"; name = "remote shutter control"; req_access_txt = "150"},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) -"al" = (/obj/structure/frame/computer,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) -"am" = (/obj/structure/table,/obj/item/weapon/storage/box/donkpockets{pixel_x = 3; pixel_y = 3},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) -"an" = (/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) -"ao" = (/obj/structure/chair/comfy/beige{dir = 1; icon_state = "comfychair"},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) -"ap" = (/obj/structure/table,/obj/item/stack/sheet/glass{amount = 10},/obj/item/device/multitool,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) -"aq" = (/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; freerange = 1; frequency = 1213; name = "Syndicate Intercom"; pixel_y = -32; subspace_transmission = 1; syndie = 1},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) -"ar" = (/obj/structure/closet/syndicate/personal,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) -"as" = (/turf/open/space,/turf/closed/wall/shuttle{dir = 2; icon_state = "diagonalWall3"},/area/shuttle/escape) -"at" = (/obj/machinery/door/window{name = "Cockpit"; req_access_txt = "0"},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) -"au" = (/turf/closed/wall/shuttle{icon_state = "wall3"},/area/shuttle/escape) -"av" = (/turf/open/space,/turf/closed/wall/shuttle{dir = 4; icon_state = "diagonalWall3"},/area/shuttle/escape) -"aw" = (/obj/structure/table,/obj/item/stack/cable_coil,/obj/item/weapon/crowbar/red,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) -"ax" = (/obj/structure/table,/obj/item/weapon/storage/box/zipties{pixel_x = 1; pixel_y = 2},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) -"ay" = (/obj/structure/chair{dir = 8},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) -"az" = (/obj/structure/closet/syndicate/nuclear,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) -"aA" = (/obj/machinery/suit_storage_unit/syndicate,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) -"aB" = (/obj/structure/table,/obj/item/device/aicard,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) -"aC" = (/obj/structure/chair/stool{pixel_y = 8},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) -"aD" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/turf/open/floor/plating,/area/shuttle/escape) -"aE" = (/obj/machinery/door/window{name = "Ready Room"; req_access_txt = "0"},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) -"aF" = (/obj/structure/table,/obj/item/weapon/c4{pixel_x = -2; pixel_y = -1},/obj/item/weapon/c4{pixel_x = -2; pixel_y = -1},/obj/item/weapon/c4{pixel_x = -2; pixel_y = -1},/obj/item/weapon/c4{pixel_x = -2; pixel_y = -1},/obj/item/weapon/c4{pixel_x = -2; pixel_y = -1},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) -"aG" = (/obj/machinery/door/airlock/external,/obj/docking_port/mobile/emergency{dheight = 1; dwidth = 11; height = 17; timid = 1; width = 23},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) -"aH" = (/obj/machinery/door/airlock/external,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) -"aI" = (/obj/machinery/door/window{base_state = "right"; dir = 8; icon_state = "right"; name = "EVA Storage"; req_access_txt = "0"; tag = "icon-right (WEST)"},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) -"aJ" = (/obj/machinery/door/window{dir = 8; name = "EVA storage"; req_access_txt = "0"},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) -"aK" = (/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; freerange = 1; frequency = 1213; name = "Syndicate Intercom"; pixel_x = -32; subspace_transmission = 1; syndie = 1},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) -"aL" = (/obj/machinery/sleeper/syndie{dir = 4},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) -"aM" = (/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) -"aN" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) -"aO" = (/obj/structure/tank_dispenser/oxygen,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) -"aP" = (/obj/structure/table,/obj/item/stack/medical/ointment,/obj/item/stack/medical/bruise_pack,/obj/structure/extinguisher_cabinet{pixel_x = -5; pixel_y = 30},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) -"aQ" = (/obj/structure/table,/obj/item/weapon/stock_parts/cell/high{pixel_x = -3; pixel_y = 3},/obj/item/weapon/stock_parts/cell/high,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) -"aR" = (/obj/structure/table,/obj/item/weapon/screwdriver{pixel_y = 9},/obj/item/device/assembly/voice{pixel_y = 3},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) -"aS" = (/obj/structure/table,/obj/item/weapon/wrench,/obj/item/device/assembly/infra,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) -"aT" = (/obj/structure/table,/obj/item/device/assembly/signaler,/obj/item/device/assembly/signaler,/obj/item/device/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/obj/item/device/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) -"aU" = (/obj/structure/table,/obj/item/weapon/weldingtool/largetank{pixel_y = 3},/obj/item/device/multitool,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) -"aV" = (/obj/structure/bed/roller,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) -"aW" = (/obj/structure/sign/bluecross_2,/turf/closed/indestructible/opshuttle,/area/shuttle/escape) -"aX" = (/obj/structure/table,/obj/item/weapon/storage/toolbox/syndicate,/obj/item/weapon/crowbar/red,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) -"aY" = (/obj/machinery/door/window{dir = 4; name = "Infirmary"; req_access_txt = "0"},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) -"aZ" = (/obj/machinery/door/window/westright{name = "Tool Storage"; req_access_txt = "0"},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) -"ba" = (/obj/machinery/door/window{base_state = "right"; dir = 4; icon_state = "right"; name = "Infirmary"; req_access_txt = "0"},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) -"bb" = (/obj/machinery/door/window{dir = 8; name = "Tool Storage"; req_access_txt = "0"},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) -"bc" = (/obj/machinery/recharge_station,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) -"bd" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/table,/obj/item/robot_parts/r_arm,/obj/item/robot_parts/l_arm,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) -"be" = (/obj/machinery/door/window{dir = 1; name = "Surgery"; req_access_txt = "0"},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) -"bf" = (/obj/structure/window/reinforced{dir = 1},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) -"bg" = (/obj/structure/table,/obj/structure/window/reinforced{dir = 8},/obj/item/weapon/storage/firstaid/regular{pixel_x = 3; pixel_y = 3},/obj/item/weapon/storage/firstaid/brute,/obj/item/weapon/storage/firstaid/toxin{pixel_x = -3; pixel_y = -3},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) -"bh" = (/obj/structure/table,/obj/item/weapon/storage/firstaid/regular{pixel_x = 3; pixel_y = 3},/obj/item/weapon/storage/firstaid/fire,/obj/item/weapon/storage/firstaid/regular{pixel_x = -3; pixel_y = -3},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) -"bi" = (/obj/structure/table,/obj/item/device/sbeacondrop/bomb{pixel_y = 5},/obj/item/device/sbeacondrop/bomb,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) -"bj" = (/obj/structure/table,/obj/item/weapon/grenade/syndieminibomb{pixel_x = 4; pixel_y = 2},/obj/item/weapon/grenade/syndieminibomb{pixel_x = -1},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) -"bk" = (/obj/structure/table,/obj/item/weapon/surgicaldrill,/obj/item/weapon/circular_saw,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) -"bl" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/structure/mirror{pixel_x = 30},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) -"bm" = (/obj/machinery/door/window{dir = 1; name = "Secure Storage"; req_access_txt = "0"},/obj/machinery/nuclearbomb,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) -"bn" = (/obj/structure/table,/obj/item/weapon/cautery,/obj/item/weapon/scalpel,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) -"bo" = (/obj/structure/table/optable,/obj/item/weapon/surgical_drapes,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) -"bp" = (/obj/structure/table,/obj/item/weapon/retractor,/obj/item/weapon/hemostat,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) -"bq" = (/obj/structure/shuttle/engine/heater,/obj/structure/window/reinforced{dir = 1},/turf/open/floor/plating,/area/shuttle/escape) -"br" = (/obj/structure/reagent_dispensers/fueltank,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) -"bs" = (/obj/structure/table,/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/glass{amount = 50},/obj/item/stack/rods{amount = 50},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) -"bt" = (/obj/structure/rack,/obj/item/clothing/suit/space/syndicate/black/red,/obj/item/clothing/head/helmet/space/syndicate/black/red,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) -"bu" = (/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion_l"},/turf/open/floor/plating,/area/shuttle/escape) -"bv" = (/obj/structure/shuttle/engine/propulsion,/turf/open/floor/plating,/area/shuttle/escape) -"bw" = (/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion_r"},/turf/open/floor/plating,/area/shuttle/escape) +"ae" = (/turf/open/space,/turf/closed/wall/shuttle{tag = "icon-wall3 (NORTHEAST)"; icon_state = "wall3"; dir = 5},/area/shuttle/escape) +"af" = (/obj/structure/table,/obj/machinery/microwave,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"ag" = (/obj/structure/table,/obj/item/device/flashlight/lamp{pixel_x = 4; pixel_y = 1},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"ah" = (/obj/machinery/computer/communications,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"ai" = (/obj/machinery/computer/emergency_shuttle,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"aj" = (/obj/structure/table,/obj/machinery/button/door{id = "syndieshutters2"; name = "remote shutter control"; req_access_txt = "150"},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"ak" = (/obj/structure/frame/computer,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"al" = (/obj/structure/table,/obj/item/weapon/storage/box/donkpockets{pixel_x = 3; pixel_y = 3},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"am" = (/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"an" = (/obj/structure/chair/comfy/beige{dir = 1; icon_state = "comfychair"},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"ao" = (/obj/structure/table,/obj/item/stack/sheet/glass{amount = 10},/obj/item/device/multitool,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"ap" = (/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; freerange = 1; frequency = 1213; name = "Syndicate Intercom"; pixel_y = -32; subspace_transmission = 1; syndie = 1},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"aq" = (/obj/structure/closet/syndicate/personal,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"ar" = (/turf/open/space,/turf/closed/wall/shuttle{tag = "icon-wall3 (SOUTHWEST)"; icon_state = "wall3"; dir = 10},/area/shuttle/escape) +"as" = (/obj/machinery/door/window{name = "Cockpit"; req_access_txt = "0"},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"at" = (/turf/open/space,/turf/closed/wall/shuttle{tag = "icon-wall3 (SOUTHEAST)"; icon_state = "wall3"; dir = 6},/area/shuttle/escape) +"au" = (/obj/structure/table,/obj/item/stack/cable_coil,/obj/item/weapon/crowbar/red,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"av" = (/obj/structure/table,/obj/item/weapon/storage/box/zipties{pixel_x = 1; pixel_y = 2},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"aw" = (/obj/structure/chair{dir = 8},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"ax" = (/obj/structure/closet/syndicate/nuclear,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"ay" = (/obj/machinery/suit_storage_unit/syndicate,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"az" = (/turf/open/space,/turf/closed/wall/shuttle{dir = 8; icon_state = "diagonalWall3"},/area/shuttle/escape) +"aA" = (/obj/structure/table,/obj/item/device/aicard,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"aB" = (/obj/structure/chair/stool{pixel_y = 8},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"aC" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/turf/open/floor/plating,/area/shuttle/escape) +"aD" = (/obj/machinery/door/window{name = "Ready Room"; req_access_txt = "0"},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"aE" = (/obj/structure/table,/obj/item/weapon/c4{pixel_x = -2; pixel_y = -1},/obj/item/weapon/c4{pixel_x = -2; pixel_y = -1},/obj/item/weapon/c4{pixel_x = -2; pixel_y = -1},/obj/item/weapon/c4{pixel_x = -2; pixel_y = -1},/obj/item/weapon/c4{pixel_x = -2; pixel_y = -1},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"aF" = (/obj/machinery/door/airlock/external,/obj/docking_port/mobile/emergency{dheight = 1; dwidth = 11; height = 17; timid = 1; width = 23},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"aG" = (/obj/machinery/door/airlock/external,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"aH" = (/obj/machinery/door/window{base_state = "right"; dir = 8; icon_state = "right"; name = "EVA Storage"; req_access_txt = "0"; tag = "icon-right (WEST)"},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"aI" = (/obj/machinery/door/window{dir = 8; name = "EVA storage"; req_access_txt = "0"},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"aJ" = (/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; freerange = 1; frequency = 1213; name = "Syndicate Intercom"; pixel_x = -32; subspace_transmission = 1; syndie = 1},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"aK" = (/obj/machinery/sleeper/syndie{dir = 4},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) +"aL" = (/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) +"aM" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) +"aN" = (/obj/structure/tank_dispenser/oxygen,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) +"aO" = (/obj/structure/table,/obj/item/stack/medical/ointment,/obj/item/stack/medical/bruise_pack,/obj/structure/extinguisher_cabinet{pixel_x = -5; pixel_y = 30},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) +"aP" = (/obj/structure/table,/obj/item/weapon/stock_parts/cell/high{pixel_x = -3; pixel_y = 3},/obj/item/weapon/stock_parts/cell/high,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"aQ" = (/obj/structure/table,/obj/item/weapon/screwdriver{pixel_y = 9},/obj/item/device/assembly/voice{pixel_y = 3},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"aR" = (/obj/structure/table,/obj/item/weapon/wrench,/obj/item/device/assembly/infra,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"aS" = (/obj/structure/table,/obj/item/device/assembly/signaler,/obj/item/device/assembly/signaler,/obj/item/device/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/obj/item/device/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"aT" = (/obj/structure/table,/obj/item/weapon/weldingtool/largetank{pixel_y = 3},/obj/item/device/multitool,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"aU" = (/obj/structure/bed/roller,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) +"aV" = (/obj/structure/sign/bluecross_2,/turf/closed/wall/shuttle{icon = 'icons/turf/walls.dmi'; icon_state = "wall3"},/area/shuttle/escape) +"aW" = (/obj/structure/table,/obj/item/weapon/storage/toolbox/syndicate,/obj/item/weapon/crowbar/red,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"aX" = (/obj/machinery/door/window{dir = 4; name = "Infirmary"; req_access_txt = "0"},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) +"aY" = (/obj/machinery/door/window/westright{name = "Tool Storage"; req_access_txt = "0"},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"aZ" = (/obj/machinery/door/window{base_state = "right"; dir = 4; icon_state = "right"; name = "Infirmary"; req_access_txt = "0"},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) +"ba" = (/obj/machinery/door/window{dir = 8; name = "Tool Storage"; req_access_txt = "0"},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"bb" = (/obj/machinery/recharge_station,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"bc" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/table,/obj/item/robot_parts/r_arm,/obj/item/robot_parts/l_arm,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) +"bd" = (/obj/machinery/door/window{dir = 1; name = "Surgery"; req_access_txt = "0"},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) +"be" = (/obj/structure/window/reinforced{dir = 1},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) +"bf" = (/obj/structure/table,/obj/structure/window/reinforced{dir = 8},/obj/item/weapon/storage/firstaid/regular{pixel_x = 3; pixel_y = 3},/obj/item/weapon/storage/firstaid/brute,/obj/item/weapon/storage/firstaid/toxin{pixel_x = -3; pixel_y = -3},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) +"bg" = (/obj/structure/table,/obj/item/weapon/storage/firstaid/regular{pixel_x = 3; pixel_y = 3},/obj/item/weapon/storage/firstaid/fire,/obj/item/weapon/storage/firstaid/regular{pixel_x = -3; pixel_y = -3},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) +"bh" = (/obj/structure/table,/obj/item/device/sbeacondrop/bomb{pixel_y = 5},/obj/item/device/sbeacondrop/bomb,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"bi" = (/obj/structure/table,/obj/item/weapon/grenade/syndieminibomb{pixel_x = 4; pixel_y = 2},/obj/item/weapon/grenade/syndieminibomb{pixel_x = -1},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"bj" = (/obj/structure/table,/obj/item/weapon/surgicaldrill,/obj/item/weapon/circular_saw,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) +"bk" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/structure/mirror{pixel_x = 30},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) +"bl" = (/obj/machinery/door/window{dir = 1; name = "Secure Storage"; req_access_txt = "0"},/obj/machinery/nuclearbomb,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"bm" = (/obj/structure/table,/obj/item/weapon/cautery,/obj/item/weapon/scalpel,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) +"bn" = (/obj/structure/table/optable,/obj/item/weapon/surgical_drapes,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) +"bo" = (/obj/structure/table,/obj/item/weapon/retractor,/obj/item/weapon/hemostat,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) +"bp" = (/obj/structure/shuttle/engine/heater,/obj/structure/window/reinforced{dir = 1},/turf/open/floor/plating,/area/shuttle/escape) +"bq" = (/obj/structure/reagent_dispensers/fueltank,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"br" = (/obj/structure/table,/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/glass{amount = 50},/obj/item/stack/rods{amount = 50},/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"bs" = (/obj/structure/rack,/obj/item/clothing/suit/space/syndicate/black/red,/obj/item/clothing/head/helmet/space/syndicate/black/red,/turf/open/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/escape) +"bt" = (/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion_l"},/turf/open/floor/plating,/area/shuttle/escape) +"bu" = (/obj/structure/shuttle/engine/propulsion,/turf/open/floor/plating,/area/shuttle/escape) +"bv" = (/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion_r"},/turf/open/floor/plating,/area/shuttle/escape) (1,1,1) = {" -aaaaaaaaabacadadadadaeacafaaaaaaaa -aaaaaaaaacagahaiajakalalacaaaaaaaa -aaaaaaaaacamanaoaoanananacaaaaaaaa -aaaaaaaaacapanananaqanaracaaaaaaaa -aaaaaaaaasacacacatauacacavaaaaaaaa -aaaaaaaaaaasacawanaxacavaaaaaaaaaa -aaaaaaaaaaaaacananayacaaaaaaaaaaaa -aaaaaaaaaaaaacananayacacacacacafaa -aaaaaaaaaaaaacananayacazananaAacaa -aaabacacacacacananayacaBaCanaAacaa -aaacananananacaDaEaDacaFananaAacaa -aaaGananananaHanananaIanananaAacaa -aaacananananaDanananaJanananaAacaa -abacacacacacacaKananacacacacacacaf -acaLaMaNaOaPacanananacaQaRaSaTaUac -acaVaMaMaMaMaWanananacanananaCaXac -acaLaMaMaMaMaYanananaZanananananac -acaMaMaMaMaMbaanananbbananananbcac -acbdbebfbgbhacanananacbibjananbcac -acbkaMblacacacaDbmaDacacacanananac -acbnbobpacaaacbqbqbqacaaacbrbsbtac -acbqbqbqacaaasbubvbwavaaacbqbqbqac -asbubvbwavaaaaaaaaaaaaaaasbubvbwav +aaaaaaaaabacadadadadadacaeaaaaaaaa +aaaaaaaaacafagahaiajakakacaaaaaaaa +aaaaaaaaacalamananamamamacaaaaaaaa +aaaaaaaaacaoamamamapamaqacaaaaaaaa +aaaaaaaaaracacacasacacacataaaaaaaa +aaaaaaaaaaaracauamavacataaaaaaaaaa +aaaaaaaaaaaaacamamawacaaaaaaaaaaaa +aaaaaaaaaaaaacamamawacacacacacaeaa +aaaaaaaaaaaaacamamawacaxamamayacaa +aaazacacacacacamamawacaAaBamayacaa +aaacamamamamacaCaDaCacaEamamayacaa +aaaFamamamamaGamamamaHamamamayacaa +aaacamamamamaCamamamaIamamamayacaa +abacacacacacacaJamamacacacacacacae +acaKaLaMaNaOacamamamacaPaQaRaSaTac +acaUaLaLaLaLaVamamamacamamamaBaWac +acaKaLaLaLaLaXamamamaYamamamamamac +acaLaLaLaLaLaZamamambaamamamambbac +acbcbdbebfbgacamamamacbhbiamambbac +acbjaLbkacacacaCblaCacacacamamamac +acbmbnboacaaacbpbpbpacaaacbqbrbsac +acbpbpbpacaaarbtbubvataaacbpbpbpac +arbtbubvataaaaaaaaaaaaaaarbtbubvat "} From f474c6b99928cf92f6e65e78eb7ea64fdb9956ab Mon Sep 17 00:00:00 2001 From: Nichlas Pihl Date: Thu, 30 Nov 2017 08:31:58 +0100 Subject: [PATCH 20/21] Makes the asteroid shuttle walls smooth --- _maps/shuttles/emergency_asteroid.dmm | 173 +++++++++++++------------- 1 file changed, 87 insertions(+), 86 deletions(-) diff --git a/_maps/shuttles/emergency_asteroid.dmm b/_maps/shuttles/emergency_asteroid.dmm index db4a6713a9..fa46f32f1e 100644 --- a/_maps/shuttles/emergency_asteroid.dmm +++ b/_maps/shuttles/emergency_asteroid.dmm @@ -1,98 +1,99 @@ "aa" = (/turf/open/space,/area/space) -"ab" = (/turf/closed/wall/shuttle,/area/shuttle/escape) +"ab" = (/turf/closed/wall/shuttle/smooth,/area/shuttle/escape) "ac" = (/obj/structure/grille,/obj/structure/window/shuttle,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) "ad" = (/obj/structure/bed,/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) "ae" = (/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) "af" = (/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) "ag" = (/obj/structure/bed,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) "ah" = (/obj/machinery/door/airlock/glass_security{name = "Emergency Shuttle Brig"; req_access_txt = "2"},/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) -"ai" = (/obj/machinery/door/airlock/glass_medical{id_tag = null; name = "Escape Shuttle Infirmary"; req_access_txt = "5"},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) -"aj" = (/obj/structure/chair,/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) -"ak" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) -"al" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) -"am" = (/obj/machinery/sleeper,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) -"an" = (/obj/structure/closet/secure_closet/medical2,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) -"ao" = (/obj/structure/table,/obj/item/weapon/surgical_drapes,/obj/item/weapon/circular_saw,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) -"ap" = (/obj/machinery/door/airlock/shuttle,/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) -"aq" = (/obj/structure/table/optable,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) -"ar" = (/obj/structure/chair{dir = 1},/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) -"as" = (/obj/structure/chair{dir = 1},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 0; pixel_y = -30},/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) -"at" = (/obj/machinery/computer/security,/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) -"au" = (/obj/machinery/computer/crew,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) -"av" = (/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 0; pixel_y = -30},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) -"aw" = (/obj/structure/table,/obj/item/weapon/hemostat,/obj/item/weapon/retractor,/obj/item/weapon/scalpel,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) -"ax" = (/obj/structure/bed/roller,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"ay" = (/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"az" = (/obj/structure/chair{dir = 1},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"aA" = (/obj/structure/closet,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"aB" = (/obj/structure/table,/obj/item/weapon/storage/firstaid/fire,/obj/item/weapon/storage/firstaid/regular,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"aC" = (/obj/structure/chair{dir = 8},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"aD" = (/obj/structure/chair{dir = 4},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"aE" = (/obj/structure/table,/obj/item/weapon/crowbar,/obj/item/weapon/extinguisher,/obj/machinery/recharger,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"aF" = (/obj/machinery/door/airlock/shuttle,/obj/docking_port/mobile/emergency{dheight = 0; dir = 4; dwidth = 10; height = 13; name = "Asteroid emergency shuttle"; timid = 1; width = 28},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) -"aG" = (/obj/machinery/door/airlock/shuttle,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) -"aH" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"aI" = (/obj/structure/chair{dir = 4},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"aJ" = (/obj/structure/chair{dir = 8},/obj/structure/extinguisher_cabinet{pixel_x = 30},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"aK" = (/obj/structure/chair{dir = 8},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"aL" = (/obj/structure/table,/obj/item/weapon/crowbar,/obj/item/weapon/extinguisher,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"aM" = (/obj/structure/chair,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"aN" = (/obj/structure/closet/emcloset,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"aO" = (/obj/structure/extinguisher_cabinet{pixel_x = -30},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) -"aP" = (/obj/machinery/door/airlock/glass_mining{name = "Emergency Shuttle Storage"},/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) -"aQ" = (/obj/machinery/door/airlock/glass_command{name = "Emergency Shuttle Cockpit"; req_access_txt = "19"},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"aR" = (/obj/machinery/door/airlock{name = "Emergency Shuttle Restroom"},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) -"aS" = (/obj/machinery/recharge_station,/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) -"aT" = (/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) -"aU" = (/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = -30},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"aV" = (/obj/structure/extinguisher_cabinet{pixel_x = 30},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"aW" = (/obj/machinery/disposal/bin/toilet{dir = 8},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) -"aX" = (/obj/machinery/door/airlock/shuttle,/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) -"aY" = (/obj/structure/chair/office/light{dir = 4; name = "Head of Security"},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"aZ" = (/obj/structure/table,/obj/item/weapon/pen,/obj/item/weapon/folder/blue,/obj/machinery/recharger,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"ba" = (/obj/structure/chair/office/light{dir = 8; name = "Chief Medical Officer"},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"bb" = (/obj/structure/ore_box,/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) -"bc" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) -"bd" = (/obj/structure/chair/office/light{dir = 4; name = "Captain"},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"be" = (/obj/machinery/computer/shuttle,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"bf" = (/obj/structure/chair/office/light{dir = 8; name = "Head of Personnel"},/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"bg" = (/obj/machinery/suit_storage_unit,/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) -"bh" = (/obj/structure/chair/office/light{dir = 4; name = "Chief Engineer"},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"bi" = (/obj/structure/table,/obj/item/weapon/paper_bin,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"bj" = (/obj/structure/chair/office/light{dir = 8; name = "Research Director"},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"bk" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/structure/mirror{pixel_x = 30},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) -"bl" = (/obj/structure/shuttle/engine/heater,/turf/open/floor/plating/airless,/area/shuttle/escape) -"bm" = (/obj/structure/shuttle/engine/propulsion,/turf/open/floor/plating/airless,/area/shuttle/escape) -"bn" = (/obj/machinery/computer/station_alert,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"bo" = (/obj/machinery/computer/communications,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"ai" = (/turf/closed/wall/shuttle/smooth/nodiagonal,/area/shuttle/escape) +"aj" = (/obj/machinery/door/airlock/glass_medical{id_tag = null; name = "Escape Shuttle Infirmary"; req_access_txt = "5"},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"ak" = (/obj/structure/chair,/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"al" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"am" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"an" = (/obj/machinery/sleeper,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"ao" = (/obj/structure/closet/secure_closet/medical2,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"ap" = (/obj/structure/table,/obj/item/weapon/surgical_drapes,/obj/item/weapon/circular_saw,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"aq" = (/obj/machinery/door/airlock/shuttle,/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"ar" = (/obj/structure/table/optable,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"as" = (/obj/structure/chair{dir = 1},/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"at" = (/obj/structure/chair{dir = 1},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 0; pixel_y = -30},/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"au" = (/obj/machinery/computer/security,/turf/open/floor/plasteel/shuttle/red,/area/shuttle/escape) +"av" = (/obj/machinery/computer/crew,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"aw" = (/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 0; pixel_y = -30},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"ax" = (/obj/structure/table,/obj/item/weapon/hemostat,/obj/item/weapon/retractor,/obj/item/weapon/scalpel,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"ay" = (/obj/structure/bed/roller,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"az" = (/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aA" = (/obj/structure/chair{dir = 1},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aB" = (/obj/structure/closet,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aC" = (/obj/structure/table,/obj/item/weapon/storage/firstaid/fire,/obj/item/weapon/storage/firstaid/regular,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aD" = (/obj/structure/chair{dir = 8},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aE" = (/obj/structure/chair{dir = 4},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aF" = (/obj/structure/table,/obj/item/weapon/crowbar,/obj/item/weapon/extinguisher,/obj/machinery/recharger,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aG" = (/obj/machinery/door/airlock/shuttle,/obj/docking_port/mobile/emergency{dheight = 0; dir = 4; dwidth = 10; height = 13; name = "Asteroid emergency shuttle"; timid = 1; width = 28},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"aH" = (/obj/machinery/door/airlock/shuttle,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"aI" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aJ" = (/obj/structure/chair{dir = 4},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aK" = (/obj/structure/chair{dir = 8},/obj/structure/extinguisher_cabinet{pixel_x = 30},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aL" = (/obj/structure/chair{dir = 8},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aM" = (/obj/structure/table,/obj/item/weapon/crowbar,/obj/item/weapon/extinguisher,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aN" = (/obj/structure/chair,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aO" = (/obj/structure/closet/emcloset,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aP" = (/obj/structure/extinguisher_cabinet{pixel_x = -30},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"aQ" = (/obj/machinery/door/airlock/glass_mining{name = "Emergency Shuttle Storage"},/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) +"aR" = (/obj/machinery/door/airlock/glass_command{name = "Emergency Shuttle Cockpit"; req_access_txt = "19"},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aS" = (/obj/machinery/door/airlock{name = "Emergency Shuttle Restroom"},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"aT" = (/obj/machinery/recharge_station,/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) +"aU" = (/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) +"aV" = (/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = -30},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aW" = (/obj/structure/extinguisher_cabinet{pixel_x = 30},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"aX" = (/obj/machinery/disposal/bin/toilet{dir = 8},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"aY" = (/obj/machinery/door/airlock/shuttle,/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) +"aZ" = (/obj/structure/chair/office/light{dir = 4; name = "Head of Security"},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"ba" = (/obj/structure/table,/obj/item/weapon/pen,/obj/item/weapon/folder/blue,/obj/machinery/recharger,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"bb" = (/obj/structure/chair/office/light{dir = 8; name = "Chief Medical Officer"},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"bc" = (/obj/structure/ore_box,/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) +"bd" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) +"be" = (/obj/structure/chair/office/light{dir = 4; name = "Captain"},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"bf" = (/obj/machinery/computer/shuttle,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"bg" = (/obj/structure/chair/office/light{dir = 8; name = "Head of Personnel"},/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"bh" = (/obj/machinery/suit_storage_unit,/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) +"bi" = (/obj/structure/chair/office/light{dir = 4; name = "Chief Engineer"},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"bj" = (/obj/structure/table,/obj/item/weapon/paper_bin,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"bk" = (/obj/structure/chair/office/light{dir = 8; name = "Research Director"},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"bl" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/structure/mirror{pixel_x = 30},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/escape) +"bm" = (/obj/structure/shuttle/engine/heater,/turf/open/floor/plating/airless,/area/shuttle/escape) +"bn" = (/obj/structure/shuttle/engine/propulsion,/turf/open/floor/plating/airless,/area/shuttle/escape) +"bo" = (/obj/machinery/computer/station_alert,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"bp" = (/obj/machinery/computer/communications,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) (1,1,1) = {" aaaaaaababacabacababaaaaaa aaaaababadaeacafagababaaaa -ababababacahabaiacabababab -abajajajaeakabalafamanaoab -apaeaeaeaeaeacafafafafaqac -abarasaraeatabauafafavawab -abababacahacabacaiacababab -aaababaxafafafafafaxababaa -aaaaabayafazazazafaAabaaaa -abacabaBafaCacaDafaEabaaaa -aFafaGafafaCacaDafaHabaaaa -abacabaIafaCacaDafaJabaaaa -aaaaacaDafaCacaDafaCacaaaa -aaaaacaDafafafafafaCacaaaa -aaaaacaDafaCacaDafaCacaaaa -abacabaIafaCacaDafaKabaaaa -aGafaGafafaCacaDafaHabaaaa -abacabaLafaCacaDafaBabaaaa -aaaaabayafaMaMaMafaNabaaaa -aaababaOafafafafafafababaa -abababaPababaQababaRababab -acaSaTaTabaUayaVabafaRaWac -aXaTaTaTabaYaZbaabafababab -acbbaTbcabbdbebfabalaRaWac -abababbgabbhbibjabbkababab -abblabababayayayabababblab -abbmabblabbnayboabblabbmab -aaaaabbmabacacacabbmabaaaa +ababababacahaiajacabababab +abakakakaealabamafanaoapab +aqaeaeaeaeaeacafafafafarac +abasatasaeauabavafafawaxab +abababacahacabacajacababab +aaababayafafafafafayababaa +aaaaabazafaAaAaAafaBabaaaa +abacaiaCafaDacaEafaFabaaaa +aGafaHafafaDacaEafaIabaaaa +abacaiaJafaDacaEafaKabaaaa +aaaaacaEafaDacaEafaDacaaaa +aaaaacaEafafafafafaDacaaaa +aaaaacaEafaDacaEafaDacaaaa +abacaiaJafaDacaEafaLabaaaa +aHafaHafafaDacaEafaIabaaaa +abacaiaMafaDacaEafaCabaaaa +aaaaabazafaNaNaNafaOabaaaa +aaababaPafafafafafafababaa +ababaiaQaiaiaRabaiaSaiabab +acaTaUaUabaVazaWabafaSaXac +aYaUaUaUabaZbabbabafaiabab +acbcaUbdabbebfbgabamaSaXac +abababbhabbibjbkabblaiabab +abbmabababazazazabababbmab +abbnabbmabboazbpabbmabbnab +aaaaabbnabacacacabbnabaaaa "} From 1825f6fc89d729cf8de558d996385780d097243c Mon Sep 17 00:00:00 2001 From: Nichlas Pihl Date: Thu, 30 Nov 2017 08:34:16 +0100 Subject: [PATCH 21/21] Tiny console change on asteroidtoo --- _maps/shuttles/emergency_asteroid.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/shuttles/emergency_asteroid.dmm b/_maps/shuttles/emergency_asteroid.dmm index fa46f32f1e..7a804ccd82 100644 --- a/_maps/shuttles/emergency_asteroid.dmm +++ b/_maps/shuttles/emergency_asteroid.dmm @@ -55,7 +55,7 @@ "bc" = (/obj/structure/ore_box,/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) "bd" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) "be" = (/obj/structure/chair/office/light{dir = 4; name = "Captain"},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) -"bf" = (/obj/machinery/computer/shuttle,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) +"bf" = (/obj/machinery/computer/emergency_shuttle,/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) "bg" = (/obj/structure/chair/office/light{dir = 8; name = "Head of Personnel"},/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape) "bh" = (/obj/machinery/suit_storage_unit,/turf/open/floor/plasteel/shuttle/yellow,/area/shuttle/escape) "bi" = (/obj/structure/chair/office/light{dir = 4; name = "Chief Engineer"},/turf/open/floor/plasteel/shuttle,/area/shuttle/escape)