diff --git a/code/__DEFINES/shuttles.dm b/code/__DEFINES/shuttles.dm index a6d383e771..fcc4303ed4 100644 --- a/code/__DEFINES/shuttles.dm +++ b/code/__DEFINES/shuttles.dm @@ -147,3 +147,4 @@ #define MOBILE_SHUTTLE_SHIPMAP_ELEVATOR_ONE "garrow_vehicle_elevator_one" #define MOBILE_SHUTTLE_SHIPMAP_ELEVATOR_TWO "garrow_vehicle_elevator_two" #define MOBILE_SHUTTLE_SHIPMAP_ELEVATOR_CARGO "garrow_cargo_elevator" +#define MOBILE_SHUTTLE_SHIPMAP_ELEVATOR_HANGAR "garrow_hangar_elevator" diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm index 9424be83a3..578a7a3e63 100644 --- a/code/datums/shuttles.dm +++ b/code/datums/shuttles.dm @@ -141,6 +141,10 @@ /datum/map_template/shuttle/trijent_elevator/golden_arrow/cargo name = "Cargo Elevator" - elevator_network = "garrow_cargo" shuttle_id = MOBILE_SHUTTLE_SHIPMAP_ELEVATOR_CARGO elevator_network = "ArrowCargo" + +/datum/map_template/shuttle/trijent_elevator/golden_arrow/hangar + name = "Hangar Elevator" + shuttle_id = MOBILE_SHUTTLE_SHIPMAP_ELEVATOR_HANGAR + elevator_network = "ArrowHangar" diff --git a/code/game/area/golden_arrow.dm b/code/game/area/golden_arrow.dm index 9b879219b0..467203e0af 100644 --- a/code/game/area/golden_arrow.dm +++ b/code/game/area/golden_arrow.dm @@ -128,3 +128,11 @@ /area/golden_arrow/vehicle_shuttle/two/upper name = "\improper Vehicle Elevator Two Upper" +/area/golden_arrow/hangar_shuttle + name = "\improper Hangar Elevator" + +/area/golden_arrow/hangar_shuttle/upper + name = "\improper Hangar Elevator Upper" + +/area/golden_arrow/hangar_shuttle/lower + name = "\improper Hangar Elevator Lower" diff --git a/code/game/turfs/floor_types.dm b/code/game/turfs/floor_types.dm index d3cbe86c7d..9bbc32f7f4 100644 --- a/code/game/turfs/floor_types.dm +++ b/code/game/turfs/floor_types.dm @@ -329,6 +329,9 @@ /turf/open/floor/almayer/empty/golden_arrow/vehicle_two area_type = /area/golden_arrow/vehicle_shuttle/two +/turf/open/floor/almayer/empty/golden_arrow/hangar + area_type = /area/golden_arrow/hangar_shuttle + //Others /turf/open/floor/almayer/uscm icon_state = "logo_c" diff --git a/code/modules/shuttle/computers/trijent_elevator_control.dm b/code/modules/shuttle/computers/trijent_elevator_control.dm index 41c3456a1f..49086ef8a6 100644 --- a/code/modules/shuttle/computers/trijent_elevator_control.dm +++ b/code/modules/shuttle/computers/trijent_elevator_control.dm @@ -121,3 +121,9 @@ if("button-push") playsound(loc, get_sfx("terminal_button"), KEYBOARD_SOUND_VOLUME * 2, 1) return FALSE + +/obj/structure/machinery/computer/shuttle/elevator_controller/console + icon_state = "elevator_console" + dir = NORTH + flags_atom = ON_BORDER + density = TRUE diff --git a/code/modules/shuttle/shuttles/shipmap_elevator.dm b/code/modules/shuttle/shuttles/shipmap_elevator.dm index c49fa4a5dd..2887b58313 100644 --- a/code/modules/shuttle/shuttles/shipmap_elevator.dm +++ b/code/modules/shuttle/shuttles/shipmap_elevator.dm @@ -56,6 +56,13 @@ id = MOBILE_SHUTTLE_SHIPMAP_ELEVATOR_CARGO area_type = /area/golden_arrow/cargo_shuttle/elevator +/obj/docking_port/mobile/trijent_elevator/shipmap_elevator/hangar + name = "Hangar Elevator" + id = MOBILE_SHUTTLE_SHIPMAP_ELEVATOR_HANGAR + height = 3 + width = 2 + area_type = /area/golden_arrow/hangar_shuttle + /obj/docking_port/stationary/shipmap_elevator/visible_message() return @@ -74,3 +81,14 @@ name = "Cargo Elevator" height = 6 width = 8 + +/obj/docking_port/stationary/trijent_elevator/shipmap_elevator/hangar + name = "Hangar Elevator" + height = 3 + width = 2 + var/load_post_roundstart = FALSE + +/obj/docking_port/stationary/trijent_elevator/shipmap_elevator/hangar/Initialize(mapload, ...) + . = ..() + if(load_post_roundstart) + load_roundstart() diff --git a/icons/obj/structures/machinery/computer.dmi b/icons/obj/structures/machinery/computer.dmi index 9e3a24f9cc..ef8e9d85d0 100644 Binary files a/icons/obj/structures/machinery/computer.dmi and b/icons/obj/structures/machinery/computer.dmi differ diff --git a/icons/turf/almayer.dmi b/icons/turf/almayer.dmi index 2f30bb751f..5891f11ce4 100644 Binary files a/icons/turf/almayer.dmi and b/icons/turf/almayer.dmi differ diff --git a/maps/Nightmare/maps/LV624/nightmare.json b/maps/Nightmare/maps/LV624/nightmare.json index 8f81a61c16..9f4c73e38b 100644 --- a/maps/Nightmare/maps/LV624/nightmare.json +++ b/maps/Nightmare/maps/LV624/nightmare.json @@ -38,5 +38,6 @@ { "type": "include", "name": "Standalone variations", "file": "mapgen_variations.json" - } + }, + { "type": "map_sprinkle", "path": "sprinkles/" } ] diff --git a/maps/Nightmare/maps/golden_arrow/nightmare.json b/maps/Nightmare/maps/golden_arrow/nightmare.json index 0be5c5a203..e0e84550f5 100644 --- a/maps/Nightmare/maps/golden_arrow/nightmare.json +++ b/maps/Nightmare/maps/golden_arrow/nightmare.json @@ -2,5 +2,6 @@ { "type": "include", "name": "Standalone variations", "file": "mapgen_variations.json" - } + }, + { "type": "map_sprinkle", "path": "sprinkles/" } ] diff --git a/maps/map_files/golden_arrow/golden_arrow.dmm b/maps/map_files/golden_arrow/golden_arrow.dmm index ea8d1a9e4a..92295a5eb7 100644 --- a/maps/map_files/golden_arrow/golden_arrow.dmm +++ b/maps/map_files/golden_arrow/golden_arrow.dmm @@ -1736,7 +1736,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/golden_arrow/engineering) +/area/golden_arrow/hangar_shuttle/lower) "afy" = ( /obj/structure/machinery/light/double/blue{ dir = 1; @@ -1976,7 +1976,7 @@ icon_state = "SW-out" }, /obj/structure/machinery/gear{ - id = "supply_elevator_gear" + id = "garrow_hangar_elevator" }, /obj/structure/cable/heavyduty{ icon_state = "1-2" @@ -3877,7 +3877,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/golden_arrow/engineering) +/area/golden_arrow/hangar_shuttle/lower) "alS" = ( /obj/structure/machinery/light/double/blue{ dir = 4; @@ -6141,11 +6141,14 @@ pixel_x = 1 }, /obj/structure/machinery/gear{ - id = "supply_elevator_gear" + id = "garrow_hangar_elevator" }, /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 }, +/obj/effect/landmark/nightmare{ + insert_tag = "hangar" + }, /turf/open/floor/almayer/edge/smooth/corner{ dir = 1 }, @@ -8327,8 +8330,14 @@ /turf/open/floor/almayer/edge, /area/golden_arrow/supply) "ayS" = ( +/obj/docking_port/stationary/trijent_elevator/shipmap_elevator/hangar{ + id = "garrow_hangar_elevator_down"; + elevator_network = "ArrowHangar"; + name = "Engineering"; + airlock_area = /area/golden_arrow/hangar_shuttle/lower + }, /turf/open/floor/plating, -/area/golden_arrow/engineering) +/area/golden_arrow/hangar_shuttle/lower) "ayU" = ( /obj/effect/decal/cleanable/dirt{ layer = 2.52 @@ -12124,7 +12133,7 @@ pixel_y = 1 }, /obj/structure/machinery/gear{ - id = "supply_elevator_gear" + id = "garrow_hangar_elevator" }, /obj/structure/cable/heavyduty{ icon_state = "1-2" @@ -15201,7 +15210,6 @@ dir = 4; pixel_x = 21 }, -/obj/structure/surface/table/almayer, /turf/open/floor/almayer{ icon_state = "cargo" }, @@ -15318,7 +15326,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/golden_arrow/engineering) +/area/golden_arrow/hangar_shuttle/lower) "aTu" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -16477,7 +16485,7 @@ pixel_x = 1 }, /obj/structure/machinery/gear{ - id = "supply_elevator_gear" + id = "garrow_hangar_elevator" }, /obj/effect/decal/cleanable/dirt{ layer = 2.52 @@ -16872,7 +16880,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/golden_arrow/engineering) +/area/golden_arrow/hangar_shuttle/lower) "aYu" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, @@ -17930,7 +17938,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/golden_arrow/engineering) +/area/golden_arrow/hangar_shuttle/lower) "eZR" = ( /obj/item/storage/box/guncase/flamer/fuel{ pixel_y = 8 @@ -18179,7 +18187,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/golden_arrow/engineering) +/area/golden_arrow/hangar_shuttle/lower) "hwm" = ( /obj/structure/stairs/perspective, /obj/structure/platform{ @@ -18535,6 +18543,9 @@ "kQO" = ( /turf/closed/wall/almayer/outer, /area/golden_arrow/supplydrop) +"lgm" = ( +/turf/open/floor/plating, +/area/golden_arrow/hangar_shuttle/lower) "lov" = ( /obj/effect/decal/cleanable/dirt{ layer = 2.52 @@ -18775,7 +18786,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/golden_arrow/engineering) +/area/golden_arrow/hangar_shuttle/lower) "mHX" = ( /obj/structure/cable/heavyduty{ icon_state = "1-2" @@ -19155,7 +19166,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/golden_arrow/engineering) +/area/golden_arrow/hangar_shuttle/lower) "pRt" = ( /obj/effect/decal/warning_stripes{ icon_state = "cargo_arrow"; @@ -19256,7 +19267,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/golden_arrow/engineering) +/area/golden_arrow/hangar_shuttle/lower) "qds" = ( /obj/effect/decal/warning_stripes{ icon_state = "cargo" @@ -19614,7 +19625,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/golden_arrow/engineering) +/area/golden_arrow/hangar_shuttle/lower) "txJ" = ( /obj/structure/machinery/door/poddoor/almayer{ name = "\improper Lower Storage Bay Six Blast Door"; @@ -20021,7 +20032,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/golden_arrow/engineering) +/area/golden_arrow/hangar_shuttle/lower) "xOB" = ( /obj/effect/decal/cleanable/dirt{ layer = 2.52 @@ -20047,7 +20058,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/golden_arrow/engineering) +/area/golden_arrow/hangar_shuttle/lower) "xXR" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -25586,8 +25597,8 @@ wAd oTo fWu hhQ -ayS -ayS +lgm +lgm ayS afx fWu @@ -25738,9 +25749,9 @@ bPy kQO fWu pPt -ayS -ayS -ayS +lgm +lgm +lgm qcH fWu ngb diff --git a/maps/map_files/golden_arrow/sprinkles/75.hangar_elevator.dmm b/maps/map_files/golden_arrow/sprinkles/75.hangar_elevator.dmm new file mode 100644 index 0000000000..69bdc573ad --- /dev/null +++ b/maps/map_files/golden_arrow/sprinkles/75.hangar_elevator.dmm @@ -0,0 +1,178 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/effect/decal/cleanable/dirt{ + layer = 2.52 + }, +/obj/structure/machinery/door/poddoor/railing{ + density = 0; + dir = 2 + }, +/turf/open/floor/almayer/edge/smooth, +/area/golden_arrow/hangar_shuttle/upper) +"g" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/obj/structure/cable/heavyduty{ + icon_state = "1-2" + }, +/obj/structure/machinery/gear{ + id = "garrow_hangar_elevator" + }, +/turf/open/floor/almayer/edge/smooth/corner, +/area/golden_arrow/hangar_shuttle/upper) +"i" = ( +/obj/structure/machinery/door/poddoor/railing{ + density = 0 + }, +/turf/open/floor/almayer/edge/smooth{ + dir = 1 + }, +/area/golden_arrow/hangar_shuttle/upper) +"p" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/obj/effect/decal/cleanable/dirt{ + layer = 2.52 + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/gear{ + id = "garrow_hangar_elevator" + }, +/turf/open/floor/almayer/edge/smooth/corner{ + dir = 4 + }, +/area/golden_arrow/hangar_shuttle/upper) +"u" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/structure/cable/heavyduty{ + icon_state = "1-2" + }, +/obj/structure/machinery/door/poddoor/railing{ + density = 0; + dir = 8 + }, +/turf/open/floor/almayer/edge/smooth{ + dir = 8 + }, +/area/golden_arrow/hangar_shuttle/upper) +"z" = ( +/obj/docking_port/stationary/trijent_elevator/shipmap_elevator/hangar{ + roundstart_template = /datum/map_template/shuttle/trijent_elevator/golden_arrow/hangar; + name = "Hangar"; + id = "garrow_hangar_elevator"; + elevator_network = "ArrowHangar"; + airlock_area = /area/golden_arrow/hangar_shuttle/upper; + load_post_roundstart = 1 + }, +/turf/open/floor/almayer/empty/golden_arrow/hangar, +/area/golden_arrow/hangar_shuttle/upper) +"A" = ( +/turf/open/floor/almayer/empty/golden_arrow/hangar, +/area/golden_arrow/hangar_shuttle/upper) +"J" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/door/poddoor/railing{ + density = 0; + dir = 4 + }, +/turf/open/floor/almayer/edge/smooth{ + dir = 4 + }, +/area/golden_arrow/hangar_shuttle/upper) +"L" = ( +/obj/structure/pipes/vents/scrubber{ + dir = 8 + }, +/obj/structure/machinery/door/poddoor/railing{ + density = 0 + }, +/turf/open/floor/almayer/edge/smooth{ + dir = 1 + }, +/area/golden_arrow/hangar_shuttle/upper) +"N" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/door/poddoor/railing{ + density = 0; + dir = 4 + }, +/turf/open/floor/almayer/edge/smooth{ + dir = 4 + }, +/area/golden_arrow/hangar_shuttle/upper) +"Q" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/obj/structure/cable/heavyduty{ + icon_state = "1-2" + }, +/obj/structure/machinery/gear{ + id = "garrow_hangar_elevator" + }, +/turf/open/floor/almayer/edge/smooth/corner{ + dir = 8 + }, +/area/golden_arrow/hangar_shuttle/upper) +"V" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1; + pixel_x = 1 + }, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, +/obj/structure/machinery/gear{ + id = "garrow_hangar_elevator" + }, +/turf/open/floor/almayer/edge/smooth/corner{ + dir = 1 + }, +/area/golden_arrow/hangar_shuttle/upper) + +(1,1,1) = {" +p +J +N +J +V +"} +(2,1,1) = {" +a +A +A +z +L +"} +(3,1,1) = {" +a +A +A +A +i +"} +(4,1,1) = {" +g +u +u +u +Q +"} diff --git a/maps/shuttles/garrow_hangar_elevator.dmm b/maps/shuttles/garrow_hangar_elevator.dmm new file mode 100644 index 0000000000..80b3da42d7 --- /dev/null +++ b/maps/shuttles/garrow_hangar_elevator.dmm @@ -0,0 +1,29 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/open/floor/plating/plating_catwalk, +/area/golden_arrow/hangar_shuttle) +"j" = ( +/obj/docking_port/mobile/trijent_elevator/shipmap_elevator/hangar, +/turf/open/floor/plating/plating_catwalk, +/area/golden_arrow/hangar_shuttle) +"Z" = ( +/obj/structure/machinery/computer/shuttle/elevator_controller/console{ + pixel_y = 14; + layer = 4; + pixel_x = -1 + }, +/turf/open/floor/plating/plating_catwalk{ + icon_state = "plating_catwalk_elevator" + }, +/area/golden_arrow/hangar_shuttle) + +(1,1,1) = {" +Z +a +j +"} +(2,1,1) = {" +a +a +a +"}