From 424133c48a73146c1f8926a14cbbcca638d7aa01 Mon Sep 17 00:00:00 2001 From: Detective Google <48196179+Detective-Google@users.noreply.github.com> Date: Sat, 9 May 2020 22:20:26 -0500 Subject: [PATCH] adds the actual snow taxi to snaxi --- _maps/map_files/Snaxi/Snaxi.dmm | 852 ++++++++++-------- _maps/shuttles/snow_taxi.dmm | 111 +++ code/datums/shuttles.dm | 5 + code/game/area/areas/shuttles.dm | 5 +- .../circuitboards/computer_circuitboards.dm | 4 + code/modules/shuttle/snaxi.dm | 7 + tgstation.dme | 1 + 7 files changed, 584 insertions(+), 401 deletions(-) create mode 100644 _maps/shuttles/snow_taxi.dmm create mode 100644 code/modules/shuttle/snaxi.dm diff --git a/_maps/map_files/Snaxi/Snaxi.dmm b/_maps/map_files/Snaxi/Snaxi.dmm index 1150343d2d..8e85ced3a6 100644 --- a/_maps/map_files/Snaxi/Snaxi.dmm +++ b/_maps/map_files/Snaxi/Snaxi.dmm @@ -433,6 +433,12 @@ }, /turf/open/floor/plating, /area/maintenance/central) +"aji" = ( +/obj/machinery/computer/shuttle/snow_taxi{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/port) "ajl" = ( /obj/machinery/light{ dir = 8 @@ -8839,6 +8845,16 @@ }, /turf/open/floor/plasteel/dark, /area/security/brig) +"dns" = ( +/obj/docking_port/stationary{ + dwidth = 3; + height = 4; + id = "snaxi_ne"; + name = "Northeast Taxi Port"; + width = 6 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors) "doD" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -10022,6 +10038,11 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/plasteel, /area/storage/primary) +"eec" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/obj/machinery/computer/shuttle/snow_taxi, +/turf/open/floor/plasteel, +/area/quartermaster/miningdock) "eed" = ( /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -10170,6 +10191,11 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/crew_quarters/fitness) +"ehh" = ( +/obj/effect/spawner/lootdrop/bedsheet, +/obj/structure/bed, +/turf/open/floor/wood, +/area/icemoon/surface/outdoors) "ehL" = ( /obj/structure/cable{ icon_state = "1-2" @@ -10700,6 +10726,15 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/port) +"eDt" = ( +/obj/machinery/door/airlock/maintenance, +/obj/structure/barricade/wooden/crude/snow, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/fans/tiny/invisible, +/turf/open/floor/plating, +/area/maintenance/bar) "eDu" = ( /obj/structure/cable{ icon_state = "4-8" @@ -11083,6 +11118,16 @@ /obj/machinery/atmospherics/miner/carbon_dioxide, /turf/open/floor/engine/co2, /area/engine/atmos) +"eNu" = ( +/obj/docking_port/stationary{ + dwidth = 3; + height = 4; + id = "snaxi_nw"; + name = "Northwest Taxi Port"; + width = 6 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors) "eNG" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -11584,6 +11629,12 @@ /obj/item/storage/lockbox/loyalty, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) +"fdJ" = ( +/obj/structure/chair/comfy/brown{ + dir = 1 + }, +/turf/open/floor/wood, +/area/icemoon/surface/outdoors) "fen" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -12998,6 +13049,15 @@ }, /turf/open/floor/plasteel/grimy, /area/crew_quarters/bar) +"fYl" = ( +/obj/structure/sign/poster/contraband/random{ + pixel_y = 32 + }, +/obj/structure/windoor_assembly{ + dir = 4 + }, +/turf/open/floor/wood, +/area/maintenance/bar) "fYx" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -14087,11 +14147,6 @@ /obj/machinery/mineral/equipment_vendor, /turf/open/floor/plasteel, /area/quartermaster/miningdock) -"gKT" = ( -/obj/structure/chair/stool, -/obj/structure/barricade/wooden, -/turf/open/floor/wood, -/area/maintenance/bar) "gLk" = ( /turf/open/floor/plasteel/freezer, /area/crew_quarters/dorms) @@ -14617,6 +14672,10 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) +"hap" = ( +/obj/machinery/space_heater, +/turf/open/floor/wood, +/area/icemoon/surface/outdoors) "haU" = ( /obj/machinery/button/door{ id = "kitchen"; @@ -14776,11 +14835,6 @@ /obj/item/reagent_containers/food/snacks/soup/coldchili, /turf/open/floor/plasteel, /area/quartermaster/miningoffice) -"hhh" = ( -/obj/structure/fans/tiny, -/obj/structure/mineral_door/woodrustic, -/turf/open/floor/wood, -/area/icemoon/surface/outdoors) "hho" = ( /obj/machinery/light{ dir = 8 @@ -15561,6 +15615,12 @@ }, /turf/open/floor/plasteel/freezer, /area/crew_quarters/dorms) +"hGU" = ( +/obj/structure/closet/secure_closet/personal/cabinet{ + pixel_x = -8 + }, +/turf/open/floor/wood, +/area/icemoon/surface/outdoors) "hHu" = ( /obj/machinery/light{ dir = 8 @@ -15790,6 +15850,13 @@ /obj/structure/closet/emcloset, /turf/open/floor/plasteel, /area/quartermaster/storage) +"hNi" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple, +/obj/structure/chair/sofa{ + dir = 8 + }, +/turf/open/floor/wood, +/area/maintenance/bar) "hNt" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 @@ -16715,12 +16782,6 @@ /obj/structure/table/wood, /turf/open/floor/plasteel/dark, /area/security/prison) -"ile" = ( -/obj/structure/closet/secure_closet/personal/cabinet{ - pixel_x = -8 - }, -/turf/open/floor/wood, -/area/icemoon/surface/outdoors) "ilF" = ( /obj/structure/cable{ icon_state = "1-2" @@ -17850,9 +17911,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/white, /area/hallway/primary/port) -"iVp" = ( -/turf/closed/mineral/random/snow/more_caves, -/area/icemoon/surface/outdoors) "iVB" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -18761,6 +18819,10 @@ /obj/effect/landmark/start/paramedic, /turf/open/floor/plasteel/white, /area/medical/paramedic) +"jER" = ( +/obj/machinery/vending/kink, +/turf/open/floor/plating, +/area/maintenance/bar) "jFl" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -19455,6 +19517,13 @@ }, /turf/open/floor/plating, /area/quartermaster/storage) +"kcX" = ( +/obj/structure/chair/comfy/brown{ + dir = 4 + }, +/obj/structure/barricade/wooden/snowed, +/turf/open/floor/wood, +/area/maintenance/bar) "kdm" = ( /obj/effect/turf_decal/tile/brown{ dir = 4 @@ -19889,6 +19958,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, /area/maintenance/disposal) +"kqP" = ( +/obj/machinery/computer/shuttle/snow_taxi{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/exit/departure_lounge) "kqV" = ( /obj/structure/cable{ icon_state = "1-8" @@ -19907,13 +19982,21 @@ }, /turf/open/floor/plating/asteroid/snow/icemoon, /area/hallway/secondary/exit/departure_lounge) -"krr" = ( -/turf/open/floor/wood, -/area/icemoon/surface/outdoors) "krH" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/quartermaster/qm) +"krT" = ( +/obj/docking_port/stationary{ + dwidth = 3; + height = 4; + id = "snaxi_s"; + name = "South Taxi Port"; + roundstart_template = /datum/map_template/shuttle/snow_taxi; + width = 6 + }, +/turf/open/floor/plating, +/area/icemoon/surface/outdoors) "krV" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 @@ -19992,6 +20075,9 @@ /obj/machinery/meter, /turf/open/floor/engine, /area/engine/engineering) +"ktw" = ( +/turf/closed/wall/mineral/wood, +/area/icemoon/surface/outdoors) "ktT" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 @@ -20375,15 +20461,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/plasteel, /area/engine/atmospherics_engine) -"kLe" = ( -/obj/structure/sign/poster/contraband/random{ - pixel_y = 32 - }, -/obj/structure/windoor_assembly{ - dir = 4 - }, -/turf/open/floor/wood, -/area/maintenance/bar) "kLh" = ( /obj/structure/cable{ icon_state = "2-4" @@ -20610,6 +20687,13 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, /area/construction/storage) +"kRI" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lantern{ + pixel_y = 5 + }, +/turf/open/floor/wood, +/area/icemoon/surface/outdoors) "kRK" = ( /obj/structure/window/reinforced{ dir = 4 @@ -20744,6 +20828,9 @@ }, /turf/open/floor/plating/asteroid/snow/icemoon, /area/ai_monitored/security/armory) +"kZL" = ( +/turf/open/floor/wood, +/area/icemoon/surface/outdoors) "lac" = ( /obj/structure/cable{ icon_state = "1-2" @@ -22305,6 +22392,11 @@ }, /turf/open/floor/plasteel, /area/engine/atmos) +"maR" = ( +/obj/structure/fans/tiny, +/obj/structure/mineral_door/woodrustic, +/turf/open/floor/wood, +/area/icemoon/surface/outdoors) "mbm" = ( /turf/closed/wall, /area/maintenance/port/fore) @@ -23767,6 +23859,9 @@ }, /turf/open/floor/plasteel, /area/engine/break_room) +"nbC" = ( +/turf/closed/mineral/random/snow/more_caves, +/area/icemoon/surface/outdoors) "nbU" = ( /obj/structure/cable{ icon_state = "1-2" @@ -24453,13 +24548,6 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai) -"nyg" = ( -/obj/structure/barricade/wooden/snowed, -/obj/structure/light_construct/small{ - dir = 1 - }, -/turf/open/floor/plating, -/area/maintenance/bar) "nyp" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/techstorage/AI, @@ -25026,6 +25114,11 @@ }, /turf/open/floor/plasteel, /area/security/prison) +"nPs" = ( +/obj/structure/chair/stool, +/obj/structure/barricade/wooden, +/turf/open/floor/wood, +/area/maintenance/bar) "nPF" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -25185,6 +25278,12 @@ }, /turf/open/floor/plasteel/white, /area/medical/chemistry) +"nVI" = ( +/obj/structure/sign/poster/contraband/random{ + pixel_y = -32 + }, +/turf/open/floor/wood, +/area/maintenance/bar) "nVP" = ( /obj/machinery/light/small{ dir = 8 @@ -27361,13 +27460,6 @@ /obj/structure/tank_dispenser/oxygen, /turf/open/floor/plasteel, /area/quartermaster/miningdock) -"ppV" = ( -/obj/structure/table/wood, -/obj/item/flashlight/lantern{ - pixel_y = 5 - }, -/turf/open/floor/wood, -/area/icemoon/surface/outdoors) "pqe" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -28335,17 +28427,6 @@ }, /turf/open/floor/wood, /area/crew_quarters/heads/captain) -"pOw" = ( -/obj/structure/chair/comfy/brown{ - dir = 4 - }, -/obj/structure/barricade/wooden/snowed, -/turf/open/floor/wood, -/area/maintenance/bar) -"pOV" = ( -/obj/machinery/space_heater, -/turf/open/floor/wood, -/area/icemoon/surface/outdoors) "pPx" = ( /obj/structure/cable{ icon_state = "4-8" @@ -29174,13 +29255,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/wood, /area/library) -"qtZ" = ( -/obj/structure/sign/poster/contraband/random{ - pixel_y = 32 - }, -/obj/machinery/vending/cigarette, -/turf/open/floor/plating, -/area/maintenance/bar) "quh" = ( /obj/structure/cable{ icon_state = "1-2" @@ -29844,9 +29918,6 @@ }, /turf/open/floor/engine, /area/engine/engineering) -"qQk" = ( -/turf/closed/wall/mineral/wood, -/area/icemoon/surface/outdoors) "qQp" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ @@ -30400,6 +30471,13 @@ }, /turf/open/floor/wood, /area/crew_quarters/theatre) +"rjQ" = ( +/obj/structure/barricade/wooden/snowed, +/obj/structure/light_construct/small{ + dir = 1 + }, +/turf/open/floor/plating, +/area/maintenance/bar) "rkd" = ( /obj/structure/cable{ icon_state = "4-8" @@ -30770,6 +30848,11 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/white, /area/medical/medbay/central) +"rsD" = ( +/obj/structure/table/wood, +/obj/structure/bedsheetbin/towel, +/turf/open/floor/wood, +/area/maintenance/bar) "rsW" = ( /obj/machinery/door/airlock{ name = "Unisex Restroom" @@ -31860,12 +31943,6 @@ }, /turf/open/floor/plasteel/white, /area/crew_quarters/dorms) -"shH" = ( -/obj/structure/sign/poster/contraband/random{ - pixel_y = -32 - }, -/turf/open/floor/wood, -/area/maintenance/bar) "shM" = ( /obj/machinery/airalarm{ pixel_y = 23 @@ -33403,6 +33480,10 @@ /obj/effect/turf_decal/tile/brown, /turf/open/floor/plasteel, /area/quartermaster/storage) +"tiR" = ( +/obj/machinery/computer/shuttle/snow_taxi, +/turf/open/floor/plasteel, +/area/hallway/primary/aft) "tjA" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -33786,6 +33867,13 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/zone2) +"ttK" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 4 + }, +/obj/structure/chair/sofa, +/turf/open/floor/wood, +/area/maintenance/bar) "ttQ" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -34057,12 +34145,13 @@ }, /turf/open/floor/carpet, /area/security/detectives_office) -"tCA" = ( -/obj/structure/chair/comfy/brown{ - dir = 8 +"tCj" = ( +/obj/structure/barricade/wooden/snowed, +/obj/structure/sign/poster/contraband/random{ + pixel_y = -32 }, /turf/open/floor/wood, -/area/icemoon/surface/outdoors) +/area/maintenance/bar) "tCN" = ( /obj/structure/cable{ icon_state = "1-4" @@ -34400,13 +34489,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) -"tNA" = ( -/obj/structure/barricade/wooden/snowed, -/obj/structure/sign/poster/contraband/random{ - pixel_y = -32 - }, -/turf/open/floor/wood, -/area/maintenance/bar) "tNX" = ( /obj/machinery/light/small{ dir = 4 @@ -34777,10 +34859,6 @@ /obj/item/soap/nanotrasen, /turf/open/floor/plasteel/freezer, /area/security/prison) -"tZI" = ( -/obj/machinery/vending/kink, -/turf/open/floor/plating, -/area/maintenance/bar) "tZO" = ( /obj/structure/cable{ icon_state = "4-8" @@ -34884,11 +34962,6 @@ }, /turf/open/floor/plating, /area/engine/storage) -"ubT" = ( -/obj/structure/table/wood, -/obj/structure/bedsheetbin/towel, -/turf/open/floor/wood, -/area/maintenance/bar) "ucm" = ( /obj/structure/closet/crate/bin, /turf/open/floor/plasteel, @@ -35468,15 +35541,6 @@ /obj/machinery/portable_atmospherics/canister/air, /turf/open/floor/plating, /area/engine/storage) -"uyE" = ( -/obj/machinery/door/airlock/maintenance, -/obj/structure/barricade/wooden/crude/snow, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/fans/tiny/invisible, -/turf/open/floor/plating, -/area/maintenance/bar) "uyK" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/dark, @@ -35667,11 +35731,6 @@ }, /turf/open/floor/plating, /area/hallway/secondary/exit/departure_lounge) -"uFD" = ( -/obj/effect/spawner/lootdrop/bedsheet, -/obj/structure/bed, -/turf/open/floor/wood, -/area/icemoon/surface/outdoors) "uGQ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -36348,6 +36407,13 @@ }, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) +"vaR" = ( +/obj/structure/sign/poster/contraband/random{ + pixel_y = 32 + }, +/obj/machinery/vending/cigarette, +/turf/open/floor/plating, +/area/maintenance/bar) "vbx" = ( /obj/structure/cable{ icon_state = "0-2" @@ -36685,13 +36751,6 @@ }, /turf/open/floor/plasteel, /area/security/checkpoint/supply) -"vmi" = ( -/obj/machinery/atmospherics/pipe/heat_exchanging/simple, -/obj/structure/chair/sofa{ - dir = 8 - }, -/turf/open/floor/wood, -/area/maintenance/bar) "vmr" = ( /obj/machinery/porta_turret/ai{ dir = 4 @@ -37820,6 +37879,12 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/plasteel/dark, /area/security/brig) +"vSJ" = ( +/obj/structure/chair/comfy/brown{ + dir = 8 + }, +/turf/open/floor/wood, +/area/icemoon/surface/outdoors) "vST" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -39906,12 +39971,6 @@ }, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) -"xnx" = ( -/obj/structure/chair/comfy/brown{ - dir = 1 - }, -/turf/open/floor/wood, -/area/icemoon/surface/outdoors) "xnP" = ( /obj/effect/turf_decal/tile/brown{ dir = 1 @@ -40641,13 +40700,6 @@ }, /turf/open/floor/engine, /area/engine/engineering) -"xQF" = ( -/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ - dir = 4 - }, -/obj/structure/chair/sofa, -/turf/open/floor/wood, -/area/maintenance/bar) "xQH" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 @@ -52336,11 +52388,11 @@ ydp ydp ydp ydp -qQk -qQk -qQk -qQk -qQk +ktw +ktw +ktw +ktw +ktw ydp ydp avT @@ -52593,11 +52645,11 @@ ydp ydp ydp ydp -qQk -ppV -xnx -ile -qQk +ktw +kRI +fdJ +hGU +ktw ydp ydp avT @@ -52850,11 +52902,11 @@ ydp ydp ydp ydp -qQk -tCA -krr -krr -hhh +ktw +vSJ +kZL +kZL +maR ydp ydp avT @@ -53107,11 +53159,11 @@ ydp ydp ydp ydp -qQk -uFD -krr -pOV -qQk +ktw +ehh +kZL +hap +ktw ydp ydp ydp @@ -53364,11 +53416,11 @@ ydp ydp ydp ydp -qQk -qQk -qQk -qQk -qQk +ktw +ktw +ktw +ktw +ktw ydp ydp ydp @@ -58219,14 +58271,14 @@ yhx yhx yhx yhx -iVp -iVp -iVp -iVp -iVp -iVp -iVp -iVp +nbC +nbC +nbC +nbC +nbC +nbC +nbC +nbC ydp ydp ydp @@ -58476,14 +58528,14 @@ yhx yhx yhx yhx -iVp -iVp -iVp -iVp -iVp -iVp -iVp -iVp +nbC +nbC +nbC +nbC +nbC +nbC +nbC +nbC ydp ydp ydp @@ -58733,14 +58785,14 @@ yhx yhx yhx yhx -iVp -iVp -qQk -qQk -qQk -qQk -qQk -iVp +nbC +nbC +ktw +ktw +ktw +ktw +ktw +nbC ydp ydp ydp @@ -58990,14 +59042,14 @@ yhx yhx yhx yhx -iVp -iVp -qQk -ppV -xnx -ile -qQk -iVp +nbC +nbC +ktw +kRI +fdJ +hGU +ktw +nbC ydp ydp ydp @@ -59066,11 +59118,11 @@ xUL avT avT ydp -qQk -qQk -qQk -qQk -qQk +ktw +ktw +ktw +ktw +ktw ydp avT avT @@ -59247,14 +59299,14 @@ yhx yhx yhx yhx -iVp -iVp -qQk -tCA -krr -krr -hhh -iVp +nbC +nbC +ktw +vSJ +kZL +kZL +maR +nbC ydp ydp ydp @@ -59323,11 +59375,11 @@ xUL avT ydp ydp -qQk -ppV -xnx -ile -qQk +ktw +kRI +fdJ +hGU +ktw ydp avT avT @@ -59504,14 +59556,14 @@ yhx yhx yhx yhx -iVp -iVp -qQk -uFD -krr -pOV -qQk -iVp +nbC +nbC +ktw +ehh +kZL +hap +ktw +nbC ydp ydp ydp @@ -59580,11 +59632,11 @@ xUL avT ydp ydp -qQk -tCA -krr -krr -hhh +ktw +vSJ +kZL +kZL +maR ydp avT avT @@ -59761,14 +59813,14 @@ yhx yhx yhx yhx -iVp -iVp -qQk -qQk -qQk -qQk -qQk -iVp +nbC +nbC +ktw +ktw +ktw +ktw +ktw +nbC ydp ydp ydp @@ -59837,11 +59889,11 @@ vzS avT ydp ydp -qQk -uFD -krr -pOV -qQk +ktw +ehh +kZL +hap +ktw ydp avT avT @@ -60018,14 +60070,14 @@ yhx yhx yhx yhx -iVp -iVp -iVp -iVp -iVp -iVp -iVp -iVp +nbC +nbC +nbC +nbC +nbC +nbC +nbC +nbC ydp ydp ydp @@ -60094,11 +60146,11 @@ xBk avT avT ydp -qQk -qQk -qQk -qQk -qQk +ktw +ktw +ktw +ktw +ktw ydp avT avT @@ -60275,14 +60327,14 @@ yhx yhx yhx yhx -iVp -iVp -iVp -iVp -iVp -iVp -iVp -iVp +nbC +nbC +nbC +nbC +nbC +nbC +nbC +nbC ydp ydp ydp @@ -65206,11 +65258,11 @@ rhX xUL xUL xUL -xUL +eNu arl wje lhB -wje +aji tmO ydp avT @@ -67469,15 +67521,15 @@ yhx yhx yhx yhx -iVp -iVp -iVp -iVp -iVp -iVp -iVp -iVp -iVp +nbC +nbC +nbC +nbC +nbC +nbC +nbC +nbC +nbC yhx yhx yhx @@ -67726,15 +67778,15 @@ yhx yhx yhx yhx -iVp -iVp -iVp -iVp -iVp -iVp -iVp -iVp -iVp +nbC +nbC +nbC +nbC +nbC +nbC +nbC +nbC +nbC yhx yhx yhx @@ -67983,15 +68035,15 @@ yhx yhx yhx yhx -iVp -iVp -qQk -qQk -qQk -qQk -qQk -iVp -iVp +nbC +nbC +ktw +ktw +ktw +ktw +ktw +nbC +nbC yhx yhx yhx @@ -68240,15 +68292,15 @@ yhx yhx yhx yhx -iVp -iVp -qQk -ppV -xnx -ile -qQk -iVp -iVp +nbC +nbC +ktw +kRI +fdJ +hGU +ktw +nbC +nbC yhx yhx yhx @@ -68497,15 +68549,15 @@ yhx yhx yhx yhx -iVp -iVp -qQk -tCA -krr -krr -hhh -iVp -iVp +nbC +nbC +ktw +vSJ +kZL +kZL +maR +nbC +nbC yhx yhx yhx @@ -68754,15 +68806,15 @@ yhx yhx yhx yhx -iVp -iVp -qQk -uFD -krr -pOV -qQk -iVp -iVp +nbC +nbC +ktw +ehh +kZL +hap +ktw +nbC +nbC yhx yhx yhx @@ -69011,15 +69063,15 @@ yhx yhx yhx yhx -iVp -iVp -qQk -qQk -qQk -qQk -qQk -iVp -iVp +nbC +nbC +ktw +ktw +ktw +ktw +ktw +nbC +nbC yhx yhx yhx @@ -69268,15 +69320,15 @@ yhx yhx yhx yhx -iVp -iVp -iVp -iVp -iVp -iVp -iVp -iVp -iVp +nbC +nbC +nbC +nbC +nbC +nbC +nbC +nbC +nbC yhx yhx yhx @@ -69525,15 +69577,15 @@ yhx yhx yhx yhx -iVp -iVp -iVp -iVp -iVp -iVp -iVp -iVp -iVp +nbC +nbC +nbC +nbC +nbC +nbC +nbC +nbC +nbC yhx yhx yhx @@ -71109,7 +71161,7 @@ ydp ydp ydp wyg -tZI +jER xGo uCr wyg @@ -71374,7 +71426,7 @@ xls naj eFB naj -gKT +nPs nHe wyg ydp @@ -71632,7 +71684,7 @@ naj gAG naj wGD -shH +nVI wyg ydp ydp @@ -71880,7 +71932,7 @@ ydp ydp ydp wyg -qtZ +vaR gHe hcz cyu @@ -72137,7 +72189,7 @@ ydp ydp ydp wyg -nyg +rjQ rEi rEi wyg @@ -72146,7 +72198,7 @@ wAM xsZ pkJ naj -tNA +tCj wyg ydp rfj @@ -72398,13 +72450,13 @@ cYK cYK bDo wyg -kLe +fYl sDW oUX mJd mJd awo -uyE +eDt wMr phs avT @@ -72660,7 +72712,7 @@ naj naj naj naj -tNA +tCj wyg ydp ydp @@ -73687,8 +73739,8 @@ eXd jZg naj qmD -pOw -shH +kcX +nVI wyg ydp ydp @@ -73935,8 +73987,8 @@ ydp ydp ydp wyg -xQF -ubT +ttK +rsD cWO vEo naj @@ -74193,7 +74245,7 @@ ydp ydp wyg rYQ -vmi +hNi qEs wyg wyg @@ -77844,7 +77896,7 @@ vAs vAs vAs bLT -hez +eec jkL fcJ cqd @@ -78356,7 +78408,7 @@ pce vAs vAs vAs -vAs +krT pze bEi bEi @@ -78608,7 +78660,7 @@ avT avT unA rqE -rqE +kqP unA vAs vAs @@ -78906,11 +78958,11 @@ avT avT ydp ydp -qQk -qQk -qQk -qQk -qQk +ktw +ktw +ktw +ktw +ktw ydp ydp ydp @@ -79163,11 +79215,11 @@ avT avT ydp ydp -qQk -ppV -xnx -ile -qQk +ktw +kRI +fdJ +hGU +ktw ydp ydp ydp @@ -79420,11 +79472,11 @@ avT avT ydp ydp -qQk -tCA -krr -krr -hhh +ktw +vSJ +kZL +kZL +maR ydp ydp ydp @@ -79677,11 +79729,11 @@ avT ydp ydp ydp -qQk -uFD -krr -pOV -qQk +ktw +ehh +kZL +hap +ktw ydp ydp ydp @@ -79934,11 +79986,11 @@ avT avT ydp ydp -qQk -qQk -qQk -qQk -qQk +ktw +ktw +ktw +ktw +ktw ydp ydp ydp @@ -82378,7 +82430,7 @@ xUL xUL xUL qaO -qgm +tiR xzM pFu mGp @@ -82633,7 +82685,7 @@ xUL xUL xUL xUL -xUL +dns iRF qgm gNI @@ -83204,11 +83256,11 @@ ydp ydp ydp ydp -qQk -qQk -qQk -qQk -qQk +ktw +ktw +ktw +ktw +ktw ydp ydp avT @@ -83461,11 +83513,11 @@ ydp ydp ydp ydp -qQk -ppV -xnx -ile -qQk +ktw +kRI +fdJ +hGU +ktw ydp ydp ydp @@ -83718,11 +83770,11 @@ ydp ydp ydp ydp -qQk -tCA -krr -krr -hhh +ktw +vSJ +kZL +kZL +maR ydp ydp ydp @@ -83975,11 +84027,11 @@ ydp ydp ydp ydp -qQk -uFD -krr -pOV -qQk +ktw +ehh +kZL +hap +ktw ydp ydp ydp @@ -84232,11 +84284,11 @@ ydp ydp ydp ydp -qQk -qQk -qQk -qQk -qQk +ktw +ktw +ktw +ktw +ktw ydp ydp ydp diff --git a/_maps/shuttles/snow_taxi.dmm b/_maps/shuttles/snow_taxi.dmm new file mode 100644 index 0000000000..b636d75440 --- /dev/null +++ b/_maps/shuttles/snow_taxi.dmm @@ -0,0 +1,111 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/closed/wall/mineral/titanium, +/area/shuttle/snowtaxi) +"b" = ( +/obj/structure/shuttle/engine/propulsion/burst{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/open/floor/plating, +/area/shuttle/snowtaxi) +"c" = ( +/obj/machinery/door/airlock/titanium{ + name = "Mining Shuttle Airlock" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/turf/open/floor/plating, +/area/shuttle/snowtaxi) +"e" = ( +/obj/effect/spawner/structure/window/shuttle, +/turf/open/floor/plating, +/area/shuttle/snowtaxi) +"f" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/turf/open/floor/mineral/titanium, +/area/shuttle/snowtaxi) +"g" = ( +/obj/machinery/door/airlock/titanium{ + name = "Mining Shuttle Airlock" + }, +/obj/docking_port/mobile{ + dwidth = 3; + height = 4; + id = "snow_taxi"; + name = "snow taxi"; + port_direction = 8; + width = 6 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/turf/open/floor/plating, +/area/shuttle/snowtaxi) +"i" = ( +/obj/machinery/light, +/obj/machinery/computer/shuttle/snow_taxi{ + dir = 4 + }, +/turf/open/floor/mineral/titanium, +/area/shuttle/snowtaxi) +"j" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/turf/open/floor/mineral/titanium, +/area/shuttle/snowtaxi) +"k" = ( +/turf/open/floor/mineral/titanium, +/area/shuttle/snowtaxi) +"l" = ( +/obj/effect/spawner/structure/window/shuttle, +/turf/open/floor/plating/airless, +/area/shuttle/snowtaxi) +"u" = ( +/obj/structure/chair/comfy/shuttle, +/turf/open/floor/mineral/titanium, +/area/shuttle/snowtaxi) + +(1,1,1) = {" +a +e +e +a +"} +(2,1,1) = {" +a +f +i +a +"} +(3,1,1) = {" +e +u +j +l +"} +(4,1,1) = {" +c +k +k +g +"} +(5,1,1) = {" +a +u +j +a +"} +(6,1,1) = {" +a +b +b +a +"} diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm index e6e58873a4..1f041f82d2 100644 --- a/code/datums/shuttles.dm +++ b/code/datums/shuttles.dm @@ -170,6 +170,11 @@ port_id = "snowdin" can_be_bought = FALSE +/datum/map_template/shuttle/snow_taxi + port_id = "snow" + can_be_bought = FALSE + suffix = "taxi" + // Shuttles start here: /datum/map_template/shuttle/emergency/backup diff --git a/code/game/area/areas/shuttles.dm b/code/game/area/areas/shuttles.dm index ab4fa10d44..cec0067e4b 100644 --- a/code/game/area/areas/shuttles.dm +++ b/code/game/area/areas/shuttles.dm @@ -200,4 +200,7 @@ name = "Tiny Freighter" /area/shuttle/caravan/freighter3 - name = "Tiny Freighter" \ No newline at end of file + name = "Tiny Freighter" + +/area/shuttle/snowtaxi + name = "Snow Taxi" diff --git a/code/game/objects/items/circuitboards/computer_circuitboards.dm b/code/game/objects/items/circuitboards/computer_circuitboards.dm index 32c879e2d2..1b378dcfb1 100644 --- a/code/game/objects/items/circuitboards/computer_circuitboards.dm +++ b/code/game/objects/items/circuitboards/computer_circuitboards.dm @@ -293,6 +293,10 @@ name = "Mining Shuttle (Computer Board)" build_path = /obj/machinery/computer/shuttle/mining +/obj/item/circuitboard/computer/snow_taxi + name = "Snow Taxi (Computer Board)" + build_path = /obj/machinery/computer/shuttle/snow_taxi + /obj/item/circuitboard/computer/white_ship name = "White Ship (Computer Board)" build_path = /obj/machinery/computer/shuttle/white_ship diff --git a/code/modules/shuttle/snaxi.dm b/code/modules/shuttle/snaxi.dm new file mode 100644 index 0000000000..477d61753c --- /dev/null +++ b/code/modules/shuttle/snaxi.dm @@ -0,0 +1,7 @@ +/obj/machinery/computer/shuttle/snow_taxi + name = "snow taxi console" + desc = "Used to direct the snow taxi." + circuit = /obj/item/circuitboard/computer/snow_taxi + shuttleId = "snow_taxi" + possible_destinations = "snaxi_nw;snaxi_ne;snaxi_s" + no_destination_swap = TRUE diff --git a/tgstation.dme b/tgstation.dme index bb27ca021c..f9ca92e36c 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3076,6 +3076,7 @@ #include "code\modules\shuttle\ripple.dm" #include "code\modules\shuttle\shuttle.dm" #include "code\modules\shuttle\shuttle_rotate.dm" +#include "code\modules\shuttle\snaxi.dm" #include "code\modules\shuttle\special.dm" #include "code\modules\shuttle\supply.dm" #include "code\modules\shuttle\syndicate.dm"