From 74a25723f0ed749cc09cf4e33e905f361b1a4e67 Mon Sep 17 00:00:00 2001 From: TetraGamesTeam Date: Thu, 26 Dec 2024 01:26:18 +0700 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=82=D0=B0=D0=BA=D1=81=D0=B8=20=D0=B8=20=D0=B4=D0=BE?= =?UTF-8?q?=D0=BA=D0=B8=20=D0=B4=D0=BB=D1=8F=20=D1=81=D0=BE=D0=B2=D0=BC?= =?UTF-8?q?=D0=B5=D1=81=D1=82=D0=B8=D0=BC=D0=BE=D1=81=D1=82=D1=8C=D1=8E=20?= =?UTF-8?q?=D1=81=D0=BE=20=D1=81=D0=BC=D0=B5=D0=BA=D1=81=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _maps/map_files/bluemoon_maps/ice_taxi.dmm | 149 ++++++++++++++++++ .../bluemoon_maps/icemoonstation.dmm | 2 +- _maps/shuttles/snow_taxi.dmm | 94 ++++------- code/datums/shuttles.dm | 6 + 4 files changed, 187 insertions(+), 64 deletions(-) create mode 100644 _maps/map_files/bluemoon_maps/ice_taxi.dmm diff --git a/_maps/map_files/bluemoon_maps/ice_taxi.dmm b/_maps/map_files/bluemoon_maps/ice_taxi.dmm new file mode 100644 index 000000000000..78aa5bb90e9e --- /dev/null +++ b/_maps/map_files/bluemoon_maps/ice_taxi.dmm @@ -0,0 +1,149 @@ +//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/chair/comfy/shuttle{ + dir = 1 + }, +/obj/machinery/light, +/turf/open/floor/mineral/titanium/tiled, +/area/shuttle/snowtaxi) +"e" = ( +/obj/effect/spawner/structure/window/shuttle, +/obj/structure/fans/tiny/invisible, +/turf/open/floor/plating, +/area/shuttle/snowtaxi) +"f" = ( +/obj/structure/chair/comfy/shuttle, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/mineral/titanium/tiled, +/area/shuttle/snowtaxi) +"g" = ( +/obj/machinery/door/airlock/titanium{ + name = "Mining Shuttle Airlock" + }, +/obj/docking_port/mobile{ + callTime = 5; + dwidth = 3; + height = 4; + shuttle_id = "snow_taxi"; + name = "snow taxi"; + port_direction = 8; + width = 6 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/structure/fans/tiny, +/turf/open/floor/plating, +/area/shuttle/snowtaxi) +"i" = ( +/obj/machinery/light, +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/turf/open/floor/mineral/titanium/tiled, +/area/shuttle/snowtaxi) +"j" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/turf/open/floor/mineral/titanium/tiled, +/area/shuttle/snowtaxi) +"k" = ( +/turf/open/floor/mineral/titanium/blue, +/area/shuttle/snowtaxi) +"l" = ( +/obj/structure/fans/tiny/invisible, +/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/tiled, +/area/shuttle/snowtaxi) +"D" = ( +/obj/structure/fans/tiny/invisible, +/obj/effect/spawner/structure/window/shuttle, +/turf/open/floor/plating, +/area/shuttle/snowtaxi) +"E" = ( +/obj/structure/shuttle/engine/propulsion/burst{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/fans/tiny/invisible, +/turf/open/floor/plating, +/area/shuttle/snowtaxi) +"S" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/computer/shuttle/snow_taxi{ + dir = 2 + }, +/turf/open/floor/mineral/titanium/tiled, +/area/shuttle/snowtaxi) +"W" = ( +/obj/machinery/door/airlock/titanium{ + name = "Mining Shuttle Airlock" + }, +/obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/turf/open/floor/plating, +/area/shuttle/snowtaxi) + +(1,1,1) = {" +a +e +D +e +a +"} +(2,1,1) = {" +a +S +k +i +a +"} +(3,1,1) = {" +e +u +k +j +l +"} +(4,1,1) = {" +W +k +k +k +g +"} +(5,1,1) = {" +e +u +k +j +D +"} +(6,1,1) = {" +a +f +k +b +a +"} +(7,1,1) = {" +a +E +E +E +a +"} diff --git a/_maps/map_files/bluemoon_maps/icemoonstation.dmm b/_maps/map_files/bluemoon_maps/icemoonstation.dmm index 7d27575adf5d..1abc89114fb1 100644 --- a/_maps/map_files/bluemoon_maps/icemoonstation.dmm +++ b/_maps/map_files/bluemoon_maps/icemoonstation.dmm @@ -19641,7 +19641,7 @@ dwidth = 3; height = 5; name = "South Taxi Port"; - roundstart_template = /datum/map_template/shuttle/snow_taxi; + roundstart_template = /datum/map_template/shuttle/ice_taxi; width = 7; shuttle_id = "snow shuttle" }, diff --git a/_maps/shuttles/snow_taxi.dmm b/_maps/shuttles/snow_taxi.dmm index 78aa5bb90e9e..aad6780d4bce 100644 --- a/_maps/shuttles/snow_taxi.dmm +++ b/_maps/shuttles/snow_taxi.dmm @@ -3,11 +3,22 @@ /turf/closed/wall/mineral/titanium, /area/shuttle/snowtaxi) "b" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 1 +/obj/structure/shuttle/engine/propulsion/burst{ + dir = 4 }, -/obj/machinery/light, -/turf/open/floor/mineral/titanium/tiled, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/fans/tiny/invisible, +/turf/open/floor/plating, +/area/shuttle/snowtaxi) +"c" = ( +/obj/machinery/door/airlock/titanium{ + name = "Mining Shuttle Airlock" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/structure/fans/tiny, +/turf/open/floor/plating, /area/shuttle/snowtaxi) "e" = ( /obj/effect/spawner/structure/window/shuttle, @@ -15,11 +26,13 @@ /turf/open/floor/plating, /area/shuttle/snowtaxi) "f" = ( -/obj/structure/chair/comfy/shuttle, /obj/machinery/light{ dir = 1 }, -/turf/open/floor/mineral/titanium/tiled, +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/turf/open/floor/mineral/titanium, /area/shuttle/snowtaxi) "g" = ( /obj/machinery/door/airlock/titanium{ @@ -42,108 +55,63 @@ /area/shuttle/snowtaxi) "i" = ( /obj/machinery/light, -/obj/structure/chair/comfy/shuttle{ - dir = 1 +/obj/machinery/computer/shuttle/snow_taxi{ + dir = 4 }, -/turf/open/floor/mineral/titanium/tiled, +/turf/open/floor/mineral/titanium, /area/shuttle/snowtaxi) "j" = ( /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/open/floor/mineral/titanium/tiled, +/turf/open/floor/mineral/titanium, /area/shuttle/snowtaxi) "k" = ( -/turf/open/floor/mineral/titanium/blue, +/turf/open/floor/mineral/titanium, /area/shuttle/snowtaxi) "l" = ( -/obj/structure/fans/tiny/invisible, /obj/effect/spawner/structure/window/shuttle, +/obj/structure/fans/tiny/invisible, /turf/open/floor/plating/airless, /area/shuttle/snowtaxi) "u" = ( /obj/structure/chair/comfy/shuttle, -/turf/open/floor/mineral/titanium/tiled, -/area/shuttle/snowtaxi) -"D" = ( -/obj/structure/fans/tiny/invisible, -/obj/effect/spawner/structure/window/shuttle, -/turf/open/floor/plating, -/area/shuttle/snowtaxi) -"E" = ( -/obj/structure/shuttle/engine/propulsion/burst{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/fans/tiny/invisible, -/turf/open/floor/plating, -/area/shuttle/snowtaxi) -"S" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/computer/shuttle/snow_taxi{ - dir = 2 - }, -/turf/open/floor/mineral/titanium/tiled, -/area/shuttle/snowtaxi) -"W" = ( -/obj/machinery/door/airlock/titanium{ - name = "Mining Shuttle Airlock" - }, -/obj/structure/fans/tiny, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/turf/open/floor/plating, +/turf/open/floor/mineral/titanium, /area/shuttle/snowtaxi) (1,1,1) = {" a e -D e a "} (2,1,1) = {" a -S -k +f i a "} (3,1,1) = {" e u -k j l "} (4,1,1) = {" -W -k +c k k g "} (5,1,1) = {" -e +a u -k j -D +a "} (6,1,1) = {" a -f -k b -a -"} -(7,1,1) = {" -a -E -E -E +b a "} diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm index 31effc3108c5..75ba942e83da 100644 --- a/code/datums/shuttles.dm +++ b/code/datums/shuttles.dm @@ -193,6 +193,12 @@ can_be_bought = FALSE suffix = "taxi" +/datum/map_template/shuttle/ice_taxi + port_id = "snow" + can_be_bought = FALSE + prefix = "_maps/map_files/bluemoon_maps/" + suffix = "taxi" + // Shuttles start here: /datum/map_template/shuttle/emergency/backup