diff --git a/aurorastation.dme b/aurorastation.dme index 542cbdfc768..bea9c3269e7 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -3142,12 +3142,14 @@ #include "code\modules\shuttles\shuttle_autoreturn.dm" #include "code\modules\shuttles\shuttle_console.dm" #include "code\modules\shuttles\shuttle_console_multi.dm" +#include "code\modules\shuttles\shuttle_console_multi_lift.dm" #include "code\modules\shuttles\shuttle_emergency.dm" #include "code\modules\shuttles\shuttle_ferry.dm" #include "code\modules\shuttles\shuttle_lift.dm" #include "code\modules\shuttles\shuttle_specops.dm" #include "code\modules\shuttles\shuttle_supply.dm" #include "code\modules\shuttles\shuttles_multi.dm" +#include "code\modules\shuttles\shuttles_multi_lift.dm" #include "code\modules\spell_system\artifacts\armor\bone_armor.dm" #include "code\modules\spell_system\artifacts\items\bone_spear.dm" #include "code\modules\spell_system\artifacts\items\lich_phylactery.dm" diff --git a/code/modules/shuttles/shuttle_console_multi.dm b/code/modules/shuttles/shuttle_console_multi.dm index ab28c059fcc..93a9c3c4abe 100644 --- a/code/modules/shuttles/shuttle_console_multi.dm +++ b/code/modules/shuttles/shuttle_console_multi.dm @@ -46,4 +46,4 @@ our_shuttle.return_warning_cooldown = world.time + 60 SECONDS alert(user, "If you return to base, you won't be able to return to [current_map.station_short]. Launch again if you're sure about this.","Shuttle Control","Acknowledged.") return FALSE - return ..() \ No newline at end of file + return ..() diff --git a/code/modules/shuttles/shuttle_console_multi_lift.dm b/code/modules/shuttles/shuttle_console_multi_lift.dm new file mode 100644 index 00000000000..2b193141059 --- /dev/null +++ b/code/modules/shuttles/shuttle_console_multi_lift.dm @@ -0,0 +1,44 @@ +/obj/machinery/computer/shuttle_control/multi/lift + name = "lift controller" + icon = 'icons/obj/computer.dmi' + icon_state = "lift" + icon_screen = null + density = FALSE + req_access = null + ui_template = "shuttle_control_console_multi_lift.tmpl" + +/obj/machinery/computer/shuttle_control/multi/lift/wall + icon_state = "lift_wall" + +/obj/machinery/computer/shuttle_control/multi/lift/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) + var/datum/shuttle/autodock/multi/lift/shuttle = SSshuttle.shuttles[shuttle_tag] + if(!istype(shuttle)) + to_chat(user, SPAN_WARNING("Unable to establish link with the shuttle.")) + return + + var/list/data = get_ui_data(shuttle) + + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open) + if(!ui) + ui = new(user, src, ui_key, ui_template, "[shuttle_tag] Control", 470, 300) + ui.set_initial_data(data) + ui.open() + ui.set_auto_update(TRUE) + +/obj/machinery/computer/shuttle_control/multi/lift/get_ui_data(var/datum/shuttle/autodock/multi/lift/shuttle) + . = ..() + if(istype(shuttle)) + var/list/destination_keys = list() + for(var/key in shuttle.destinations_cache) + destination_keys.Add(key) + . += list( + "destinations" = destination_keys, + ) + +/obj/machinery/computer/shuttle_control/multi/handle_topic_href(var/datum/shuttle/autodock/multi/lift/shuttle, var/list/href_list) + if(href_list["pick"] && href_list["destination"]) + shuttle.set_destination(href_list["destination"], usr) + return TOPIC_REFRESH + if(href_list["cancel"]) + shuttle.final_location = null // no return so parent can handle it + ..() diff --git a/code/modules/shuttles/shuttles_multi_lift.dm b/code/modules/shuttles/shuttles_multi_lift.dm new file mode 100644 index 00000000000..9276865ad98 --- /dev/null +++ b/code/modules/shuttles/shuttles_multi_lift.dm @@ -0,0 +1,47 @@ +// multi lift, meaning it goes between stops +// if it goes from first stop to the last one +// it goes one by one sequentially through the ones in the middle +// order of stops is same as defined in destination_tags +/datum/shuttle/autodock/multi/lift + warmup_time = 3 + move_time = 2 + knockdown = FALSE + squishes = FALSE + ceiling_type = null + sound_takeoff = 'sound/effects/lift_heavy_start.ogg' + sound_landing = 'sound/effects/lift_heavy_stop.ogg' + var/obj/effect/shuttle_landmark/final_location = null + +// final_location must be set and valid +// if current and final location are the same, returns current location +/datum/shuttle/autodock/multi/lift/proc/get_next_destination_tag() + var/current_tag = current_location.landmark_tag + var/final_tag = final_location.landmark_tag + ASSERT(current_tag in destination_tags) + ASSERT(final_tag in destination_tags) + var/current_i = destination_tags.Find(current_tag) + var/final_i = destination_tags.Find(final_tag) + ASSERT(current_i != final_i) + if(current_i < final_i) + return destination_tags[current_i + 1] + else if(current_i > final_i) + return destination_tags[current_i - 1] + else + return destination_tags[current_i] + +/datum/shuttle/autodock/multi/lift/set_destination(var/destination_key, mob/user) + final_location = destinations_cache[destination_key] + var/next_tag = get_next_destination_tag() + next_location = SSshuttle.get_landmark(next_tag) + ..(next_location.name, user) + launch(user) + +/datum/shuttle/autodock/multi/lift/arrived() + if(final_location == current_location) + final_location = null + else + var/next_tag = get_next_destination_tag() + next_location = SSshuttle.get_landmark(next_tag) + set_destination(next_location.name, null) + launch(in_use) + ..() diff --git a/html/changelogs/DreamySkrell-robotics-lift-1111.yml b/html/changelogs/DreamySkrell-robotics-lift-1111.yml new file mode 100644 index 00000000000..49817bbd131 --- /dev/null +++ b/html/changelogs/DreamySkrell-robotics-lift-1111.yml @@ -0,0 +1,42 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: DreamySkrell + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - maptweak: "Robotics lift extended to the third deck." + diff --git a/maps/sccv_horizon/code/sccv_horizon.dm b/maps/sccv_horizon/code/sccv_horizon.dm index 47e135e9540..5a72bef4f76 100644 --- a/maps/sccv_horizon/code/sccv_horizon.dm +++ b/maps/sccv_horizon/code/sccv_horizon.dm @@ -101,7 +101,7 @@ map_shuttles = list( /datum/shuttle/autodock/ferry/lift/scc_ship/cargo, /datum/shuttle/autodock/ferry/lift/scc_ship/morgue, - /datum/shuttle/autodock/ferry/lift/scc_ship/robotics, + /datum/shuttle/autodock/multi/lift/robotics, /datum/shuttle/autodock/ferry/escape_pod/pod/escape_pod1, /datum/shuttle/autodock/ferry/escape_pod/pod/escape_pod2, /datum/shuttle/autodock/ferry/escape_pod/pod/escape_pod3, diff --git a/maps/sccv_horizon/code/sccv_horizon_lifts.dm b/maps/sccv_horizon/code/sccv_horizon_lifts.dm index 13e16df4f31..36f27f39bb3 100644 --- a/maps/sccv_horizon/code/sccv_horizon_lifts.dm +++ b/maps/sccv_horizon/code/sccv_horizon_lifts.dm @@ -126,27 +126,46 @@ ambience = AMBIENCE_GHOSTLY //Robotics Lift -/datum/shuttle/autodock/ferry/lift/scc_ship/robotics - name = "Robotics Lift" - location = 1 +/datum/shuttle/autodock/multi/lift/robotics + name = "Robotics Lift 2" + current_location = "nav_robotics_lift_second_deck" shuttle_area = /area/turbolift/scc_ship/robotics_lift - waypoint_station = "nav_robotics_lift_bottom" - waypoint_offsite = "nav_robotics_lift_top" + destination_tags = list( + "nav_robotics_lift_first_deck", + "nav_robotics_lift_second_deck", + "nav_robotics_lift_third_deck" + ) -/obj/effect/shuttle_landmark/lift/robotics_top - name = "Robotics Top" - landmark_tag = "nav_robotics_lift_top" - base_area = /area/hallway/medical - base_turf = /turf/simulated/open - -/obj/effect/shuttle_landmark/lift/robotics_bottom - name = "Robotics Bottom" - landmark_tag = "nav_robotics_lift_bottom" +/obj/effect/shuttle_landmark/lift/robotics_first_deck + name = "Robotics Lift - First Deck" + landmark_tag = "nav_robotics_lift_first_deck" flags = SLANDMARK_FLAG_AUTOSET base_area = /area/rnd/eva base_turf = /turf/simulated/floor/plating +/obj/effect/shuttle_landmark/lift/robotics_second_deck + name = "Robotics Lift - Second Deck" + landmark_tag = "nav_robotics_lift_second_deck" + // landmark_flags = SLANDMARK_FLAG_AUTOSET + base_area = /area/hallway/medical + base_turf = /turf/simulated/open + +/obj/effect/shuttle_landmark/lift/robotics_third_deck + name = "Robotics Lift - Third Deck" + landmark_tag = "nav_robotics_lift_third_deck" + landmark_flags = SLANDMARK_FLAG_AUTOSET + base_area = /area/hallway/medical + base_turf = /turf/simulated/open + +/obj/machinery/computer/shuttle_control/multi/lift/robotics + shuttle_tag = "Robotics Lift 2" + +/obj/machinery/computer/shuttle_control/multi/lift/wall/robotics + shuttle_tag = "Robotics Lift 2" + /area/turbolift/scc_ship/robotics_lift name = "Robotics Lift" sound_env = TUNNEL_ENCLOSED - ambience = AMBIENCE_GHOSTLY \ No newline at end of file + ambience = AMBIENCE_GHOSTLY + + diff --git a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm index 3a0e1f5c0f0..5d2f69c659a 100644 --- a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm +++ b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm @@ -17403,17 +17403,23 @@ /turf/simulated/floor/tiled/dark, /area/horizon/custodial/disposals) "mmA" = ( -/obj/machinery/computer/shuttle_control/lift/wall{ - dir = 1; - pixel_y = -32; - shuttle_tag = "Robotics Lift" - }, /obj/effect/floor_decal/corner/blue/full{ dir = 4 }, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, +/obj/machinery/button/remote/blast_door{ + id = "shutters_deck2_portstairwellsec"; + name = "Elevator Security Shutters"; + pixel_y = -37; + req_one_access = list(1,19); + dir = 1 + }, +/obj/machinery/computer/shuttle_control/multi/lift/wall/robotics{ + dir = 1; + pixel_y = -28 + }, /turf/simulated/floor/tiled, /area/rnd/eva) "mmG" = ( @@ -19152,6 +19158,10 @@ id = "shutters_deck2_portstairwellsec"; name = "Security Shutter" }, +/obj/structure/sign/crush{ + pixel_y = 8; + pixel_x = 32 + }, /turf/simulated/floor/tiled/full, /area/rnd/eva) "nup" = ( @@ -27196,7 +27206,8 @@ dir = 8 }, /obj/structure/sign/crush{ - pixel_y = 32 + pixel_y = 32; + pixel_x = 16 }, /obj/machinery/door/airlock/glass_command{ name = "Expedition EVA Storage"; @@ -27951,9 +27962,6 @@ /obj/machinery/light/spot{ dir = 1 }, -/obj/structure/sign/crush{ - pixel_y = 32 - }, /obj/structure/flora/pottedplant/random, /obj/structure/railing/mapped{ dir = 8 @@ -28641,10 +28649,6 @@ /turf/simulated/floor/plating, /area/maintenance/hangar/starboard) "ugY" = ( -/obj/machinery/computer/shuttle_control/lift/wall{ - pixel_y = 26; - shuttle_tag = "Robotics Lift" - }, /obj/machinery/button/remote/blast_door{ id = "shutters_deck2_portstairwellsec"; name = "Elevator Security Shutters"; @@ -28660,6 +28664,10 @@ }, /obj/structure/railing/mapped, /obj/effect/floor_decal/spline/fancy/wood/full, +/obj/machinery/computer/shuttle_control/multi/lift/wall/robotics{ + dir = 2; + pixel_y = 28 + }, /turf/simulated/floor/wood, /area/hangar/auxiliary) "uhE" = ( @@ -29095,7 +29103,7 @@ /turf/simulated/floor/plating, /area/maintenance/hangar/starboard) "uwf" = ( -/obj/effect/shuttle_landmark/lift/robotics_bottom, +/obj/effect/shuttle_landmark/lift/robotics_first_deck, /turf/simulated/floor/plating, /area/rnd/eva) "uwm" = ( diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm index f1fed16bcfd..deb755a6ae8 100644 --- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm +++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm @@ -2574,6 +2574,7 @@ /obj/effect/floor_decal/corner/green{ dir = 10 }, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled, /area/hallway/primary/central_one) "bhR" = ( @@ -5471,6 +5472,10 @@ /obj/effect/floor_decal/industrial/warning{ dir = 6 }, +/obj/machinery/computer/shuttle_control/multi/lift/robotics{ + pixel_y = 21; + pixel_x = 10 + }, /turf/simulated/floor/tiled/dark/full, /area/turbolift/scc_ship/robotics_lift) "cIr" = ( @@ -25802,11 +25807,6 @@ /area/horizon/hydroponics) "mzL" = ( /obj/machinery/light, -/obj/machinery/computer/shuttle_control/lift/wall{ - dir = 1; - pixel_y = -26; - shuttle_tag = "Robotics Lift" - }, /obj/effect/floor_decal/corner/green{ dir = 10 }, @@ -25815,11 +25815,18 @@ id = "shutters_deck2_portstairwellsec"; name = "Elevator Security Shutters"; pixel_y = -37; - req_one_access = list(1,19) + req_one_access = list(1,19); + pixel_x = 7 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/floor_decal/industrial/warning/corner, +/obj/machinery/computer/shuttle_control/multi/lift/wall/robotics{ + dir = 1; + pixel_y = -28; + pixel_x = 7 + }, /turf/simulated/floor/tiled, /area/hallway/primary/central_one) "mzS" = ( @@ -27148,7 +27155,8 @@ /obj/structure/sign/drop{ desc = "A warning sign which reads 'DANGER: FALLING HAZARD' and 'THIS EQUIPMENT STARTS AND STOPS AUTOMATICALLY'."; name = "\improper DANGER: FALLING HAZARD sign"; - pixel_x = 32 + pixel_x = 32; + pixel_y = -32 }, /turf/simulated/floor/tiled/full, /area/hallway/primary/central_one) @@ -41669,12 +41677,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 5 }, -/obj/effect/shuttle_landmark/lift/robotics_top, -/obj/machinery/computer/shuttle_control/lift{ - pixel_x = 12; - pixel_y = 22; - shuttle_tag = "Robotics Lift" - }, +/obj/effect/shuttle_landmark/lift/robotics_second_deck, /turf/simulated/floor/tiled/dark/full, /area/turbolift/scc_ship/robotics_lift) "uoY" = ( @@ -49640,6 +49643,10 @@ /obj/machinery/door/firedoor/multi_tile{ dir = 8 }, +/obj/structure/sign/crush{ + pixel_y = -32; + pixel_x = -32 + }, /turf/simulated/floor/tiled/full, /area/hallway/primary/central_one) "xZI" = ( @@ -50260,6 +50267,7 @@ /obj/effect/floor_decal/corner/green/full{ dir = 4 }, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled, /area/hallway/primary/central_one) "ylu" = ( diff --git a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm index 90326d1efde..7a991fe3506 100644 --- a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm +++ b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm @@ -2181,13 +2181,8 @@ /turf/simulated/floor, /area/hallway/medical/upper) "bNF" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/floor_decal/corner/green{ - dir = 6 - }, -/turf/simulated/floor/tiled, +/obj/effect/shuttle_landmark/lift/robotics_third_deck, +/turf/simulated/open, /area/horizon/hallway/deck_three/primary/port) "bNJ" = ( /obj/structure/bed/stool/chair/padded/brown{ @@ -5039,12 +5034,6 @@ /obj/machinery/light/small, /turf/simulated/floor/tiled/dark/full, /area/storage/shields) -"epJ" = ( -/obj/effect/floor_decal/corner/paleblue{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/horizon/hallway/deck_three/primary/port) "eqk" = ( /turf/simulated/wall/r_wall, /area/maintenance/security_starboard) @@ -5393,10 +5382,15 @@ /turf/simulated/floor, /area/horizon/maintenance/deck_three/aft/starboard) "eCV" = ( +/obj/machinery/door/firedoor/multi_tile, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/airlock/multi_tile/glass{ name = "Deck 3 Port Stairwell" }, -/obj/machinery/door/firedoor/multi_tile, /turf/simulated/floor/tiled/full, /area/horizon/hallway/deck_three/primary/port) "eDf" = ( @@ -5594,14 +5588,14 @@ /turf/simulated/floor/reinforced/airless, /area/horizon/exterior) "eIH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/effect/floor_decal/corner/green{ dir = 5 }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/central) "eIO" = ( @@ -7413,13 +7407,18 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_three/aft/starboard) "fWT" = ( -/obj/effect/floor_decal/corner/green{ - dir = 9 - }, /obj/structure/railing/mapped{ dir = 8 }, -/turf/simulated/floor/tiled, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/railing/mapped{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/hallway/deck_three/primary/port) "fXn" = ( /obj/machinery/vending/cigarette, @@ -7768,10 +7767,8 @@ icon_state = "plant-33"; pixel_y = 16 }, -/obj/effect/floor_decal/corner/green/full{ - dir = 1 - }, -/turf/simulated/floor/tiled, +/obj/structure/railing/mapped, +/turf/simulated/floor/tiled/dark, /area/horizon/hallway/deck_three/primary/port) "gmJ" = ( /obj/effect/floor_decal/corner/paleblue/full, @@ -9177,20 +9174,6 @@ }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/central) -"hnj" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/turf/simulated/floor/tiled, -/area/horizon/hallway/deck_three/primary/central) "hnx" = ( /obj/structure/ladder{ pixel_y = 16 @@ -11124,6 +11107,12 @@ }, /turf/simulated/floor/plating, /area/engineering/break_room) +"iUb" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/lino/grey, +/area/horizon/security/investigators_office) "iUc" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -13278,8 +13267,16 @@ /turf/simulated/floor/tiled/dark, /area/horizon/security/meeting_room) "kyE" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, /obj/effect/floor_decal/corner/green{ - dir = 1 + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/port) @@ -17131,12 +17128,14 @@ /turf/simulated/floor/tiled/dark, /area/bridge/selfdestruct) "nvW" = ( -/obj/structure/bed/stool/chair/padded/brown{ - dir = 8 - }, /obj/effect/floor_decal/corner/green/full{ dir = 4 }, +/obj/machinery/light, +/obj/machinery/computer/shuttle_control/multi/lift/robotics{ + pixel_y = 21; + pixel_x = 11 + }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/port) "nwE" = ( @@ -17413,14 +17412,6 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/dark, /area/medical/ward/isolation) -"nGI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/full, -/area/horizon/hallway/deck_three/primary/port) "nHe" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/door/airlock/external{ @@ -17447,13 +17438,9 @@ /turf/simulated/floor, /area/horizon/maintenance/deck_three/aft/starboard) "nIt" = ( -/obj/structure/flora/pottedplant/random, /obj/machinery/newscaster{ pixel_y = -32 }, -/obj/machinery/light{ - dir = 8 - }, /turf/simulated/floor/lino/grey, /area/horizon/security/investigators_office) "nIW" = ( @@ -18536,10 +18523,14 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/effect/floor_decal/corner/green/full{ - dir = 8 +/obj/structure/cable/green{ + icon_state = "2-4" }, -/turf/simulated/floor/tiled, +/obj/machinery/light/floor{ + dir = 1; + pixel_y = 7 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/hallway/deck_three/primary/port) "ozD" = ( /obj/effect/floor_decal/spline/plain{ @@ -20270,16 +20261,17 @@ /turf/simulated/wall, /area/horizon/holodeck_control) "qhR" = ( -/obj/effect/floor_decal/corner/green{ - dir = 9 - }, /obj/structure/railing/mapped{ dir = 8 }, -/obj/machinery/light/floor{ - dir = 8 +/obj/structure/cable/green{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled, +/obj/structure/railing/mapped{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/dark, /area/horizon/hallway/deck_three/primary/port) "qii" = ( /obj/machinery/alarm{ @@ -21195,6 +21187,7 @@ "qUG" = ( /obj/machinery/firealarm/north, /obj/machinery/atmospherics/unary/vent_pump/on, +/obj/structure/flora/pottedplant/random, /turf/simulated/floor/lino/grey, /area/horizon/security/investigators_office) "qUP" = ( @@ -22440,10 +22433,14 @@ /turf/simulated/floor/tiled/white, /area/medical/washroom) "rTt" = ( +/obj/effect/floor_decal/corner/green{ + dir = 10 + }, /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/port) "rUd" = ( @@ -22495,16 +22492,11 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) "rXd" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/structure/cable/green{ icon_state = "1-8" }, -/obj/effect/floor_decal/corner/green{ - dir = 5 - }, -/turf/simulated/floor/tiled, +/obj/structure/railing/mapped, +/turf/simulated/floor/tiled/dark, /area/horizon/hallway/deck_three/primary/port) "rXj" = ( /obj/machinery/power/apc{ @@ -23121,13 +23113,6 @@ }, /turf/simulated/floor/plating, /area/horizon/hallway/deck_three/primary/starboard/docks) -"sps" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled, -/area/horizon/hallway/deck_three/primary/port) "spJ" = ( /obj/machinery/light/small{ dir = 1 @@ -23855,16 +23840,19 @@ /turf/simulated/floor/carpet/rubber, /area/tcommsat/entrance) "sVV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "1-8" }, -/obj/effect/floor_decal/corner/green{ - dir = 10 +/obj/structure/cable/green{ + icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled, -/area/horizon/hallway/deck_three/primary/port) +/area/horizon/hallway/deck_three/primary/central) "sWr" = ( /obj/effect/floor_decal/corner_wide/blue{ dir = 5 @@ -23954,9 +23942,6 @@ /turf/simulated/floor/carpet/rubber, /area/bridge) "taN" = ( -/obj/machinery/light{ - dir = 8 - }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/disposalpipe/trunk, /obj/machinery/disposal/small/south, @@ -25145,11 +25130,19 @@ /turf/simulated/floor/tiled/dark, /area/horizon/security/evidence_storage) "tVB" = ( -/obj/structure/bed/stool/chair/padded/brown{ - dir = 8 +/obj/effect/floor_decal/corner/green/full{ + dir = 1 }, -/obj/effect/floor_decal/corner/green{ - dir = 6 +/obj/machinery/door/window/northright, +/obj/structure/sign/drop{ + desc = "A warning sign which reads 'DANGER: FALLING HAZARD' and 'THIS EQUIPMENT STARTS AND STOPS AUTOMATICALLY'."; + name = "\improper DANGER: FALLING HAZARD sign"; + pixel_x = 32; + pixel_y = 16 + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/port) @@ -25375,11 +25368,14 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/central) "udi" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/effect/floor_decal/corner/green{ + dir = 5 + }, +/obj/machinery/door/window/northleft, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 }, -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/port) "udU" = ( @@ -54700,10 +54696,10 @@ ozd qhR fWT kyE -oWu +rTt eCV -rIg -oMk +eIH +sVV seF ybk eNC @@ -54899,13 +54895,13 @@ pMi paE tBj rXd -rTt -sps +wPW +wPW udi -sVV -nGI -eIH -hnj +oWu +pRV +rIg +oMk kTg viN fSW @@ -55102,7 +55098,7 @@ eDu fXr gmF bNF -epJ +wPW tVB nvW qzF @@ -55304,7 +55300,7 @@ ofl ahB ahB bUo -qvo +bUo bUo bUo ahB @@ -55506,7 +55502,7 @@ hmC dNi taN blU -iAY +iUb iAY nIt ahB @@ -55711,7 +55707,7 @@ eJV clM gae mHV -egX +qvo jEj dQu oWu diff --git a/nano/templates/shuttle_control_console_multi_lift.tmpl b/nano/templates/shuttle_control_console_multi_lift.tmpl new file mode 100644 index 00000000000..8ff479563a8 --- /dev/null +++ b/nano/templates/shuttle_control_console_multi_lift.tmpl @@ -0,0 +1,24 @@ +