diff --git a/aurorastation.dme b/aurorastation.dme index 4130ab8571d..6cd0cae9c69 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -3703,6 +3703,7 @@ #include "maps\runtime\code\runtime.dm" #include "maps\runtime\code\runtime_lifts.dm" #include "maps\runtime\code\runtime_unittest.dm" +#include "maps\sccv_horizon\code\_sccv_horizon_shuttle_landmarks.dm" #include "maps\sccv_horizon\code\sccv_horizon.dm" #include "maps\sccv_horizon\code\sccv_horizon_areas.dm" #include "maps\sccv_horizon\code\sccv_horizon_holodeck.dm" diff --git a/code/modules/overmap/sectors.dm b/code/modules/overmap/sectors.dm index 36d14fffd72..7778fc5ef97 100644 --- a/code/modules/overmap/sectors.dm +++ b/code/modules/overmap/sectors.dm @@ -14,9 +14,16 @@ var/global/area/overmap/map_overmap // Global object used to locate the overmap var/obfuscated_desc = "This object is not displaying its IFF signature." var/obfuscated = FALSE //Whether we hide our name and class or not. - var/list/initial_generic_waypoints //store landmark_tag of landmarks that should be added to the actual lists below on init. - var/list/initial_restricted_waypoints //For use with non-automatic landmarks (automatic ones add themselves). - var/list/tracked_dock_tags //landmark_tag of landmarks of docks that will be tracked in the docks computer program + /// Landmark tags of landmarks that should be added to the actual lists below on init. + /// Generic, meaning usable by any shuttle. + /// Can contain nested lists, as it is flattened on init. + var/list/initial_generic_waypoints + /// Restricted, meaning that only specific shuttles can use them. + /// Should be an assoc list like `list("Shuttle" = list("nav_landmark_tag"), ...)` + var/list/initial_restricted_waypoints + /// Landmark tags of landmarks of docks that will be tracked in the docks computer program. + /// Can contain nested lists, as it is flattened on init. + var/list/tracked_dock_tags var/list/generic_waypoints = list() //waypoints that any shuttle can use var/list/restricted_waypoints = list() //waypoints for specific shuttles @@ -66,6 +73,9 @@ var/global/area/overmap/map_overmap // Global object used to locate the overmap if(!current_map.overmap_z) build_overmap() + initial_generic_waypoints = flatten_list(initial_generic_waypoints) + tracked_dock_tags = flatten_list(tracked_dock_tags) + var/map_low = OVERMAP_EDGE var/map_high = current_map.overmap_size - OVERMAP_EDGE var/turf/home diff --git a/code/modules/shuttles/shuttles_multi.dm b/code/modules/shuttles/shuttles_multi.dm index 1dc68a56e04..994583a8cbc 100644 --- a/code/modules/shuttles/shuttles_multi.dm +++ b/code/modules/shuttles/shuttles_multi.dm @@ -1,4 +1,6 @@ /datum/shuttle/autodock/multi + /// Tags of all the landmarks that this should can go to. + /// Can contain nested lists, as it is flattened before use. var/list/destination_tags var/list/destinations_cache = list() var/last_cache_rebuild_time = 0 @@ -17,6 +19,7 @@ /datum/shuttle/autodock/multi/proc/build_destinations_cache() last_cache_rebuild_time = world.time destinations_cache.Cut() + destination_tags = flatten_list(destination_tags) for(var/destination_tag in destination_tags) var/obj/effect/shuttle_landmark/landmark = SSshuttle.get_landmark(destination_tag) if(istype(landmark)) diff --git a/html/changelogs/DreamySkrell-landmarks-unfucking.yml b/html/changelogs/DreamySkrell-landmarks-unfucking.yml new file mode 100644 index 00000000000..b49da8ca30a --- /dev/null +++ b/html/changelogs/DreamySkrell-landmarks-unfucking.yml @@ -0,0 +1,45 @@ +################################ +# 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: + - refactor: "All of Horizon's generic shuttle landmarks are in one file." + - refactor: "Antag shuttles use Horizon's generic shuttle landmarks instead of their special ones." + - refactor: "Horizon's generic shuttle landmark types and tags consistency." + - refactor: "Third deck docks made to be all generic." + - bugfix: "Fixes merc shuttle not being able to leave their base." diff --git a/maps/sccv_horizon/code/_sccv_horizon_shuttle_landmarks.dm b/maps/sccv_horizon/code/_sccv_horizon_shuttle_landmarks.dm new file mode 100644 index 00000000000..8cf3f8eb4e2 --- /dev/null +++ b/maps/sccv_horizon/code/_sccv_horizon_shuttle_landmarks.dm @@ -0,0 +1,191 @@ + +// ================================ hangars + +/obj/effect/shuttle_landmark/horizon/hangar1 + name = "First Deck Port Hangar Bay 1a" + landmark_tag = "nav_horizon_hangar_1" + base_turf = /turf/simulated/floor/plating + base_area = /area/hangar/auxiliary + +/obj/effect/shuttle_landmark/horizon/hangar2 + name = "First Deck Port Hangar Bay 2a" + landmark_tag = "nav_horizon_hangar_2" + base_turf = /turf/simulated/floor/plating + base_area = /area/hangar/auxiliary + +// ================================ exterior docks + +#define NAV_HORIZON_DOCK_ALL list(\ + "nav_horizon_dock_deck_3_starboard_1",\ + "nav_horizon_dock_deck_3_starboard_2",\ + "nav_horizon_dock_deck_3_starboard_3",\ + "nav_horizon_dock_deck_3_port_2",\ + "nav_horizon_dock_deck_3_port_4",\ + "nav_horizon_dock_deck_3_port_5",\ +) + +/obj/effect/shuttle_landmark/horizon/dock/deck_3/starboard_1 + name = "Third Deck Starboard Dock 1" + landmark_tag = "nav_horizon_dock_deck_3_starboard_1" + docking_controller = "nuke_shuttle_dock_airlock" + base_turf = /turf/simulated/floor/reinforced/airless + base_area = /area/space + + +/obj/effect/shuttle_landmark/horizon/dock/deck_3/starboard_2 + name = "Third Deck Starboard Dock 2" + landmark_tag = "nav_horizon_dock_deck_3_starboard_2" + docking_controller = "dock_horizon_1_airlock" + base_turf = /turf/simulated/floor/reinforced/airless + base_area = /area/space + +/obj/effect/shuttle_landmark/horizon/dock/deck_3/starboard_3 + name = "Third Deck Starboard Dock 3" + landmark_tag = "nav_horizon_dock_deck_3_starboard_3" + docking_controller = "dock_horizon_3_airlock" + base_turf = /turf/simulated/floor/reinforced/airless + base_area = /area/space + +/obj/effect/shuttle_landmark/horizon/dock/deck_3/port_1 + name = "Third Deck Port Dock 1" + landmark_tag = "nav_horizon_dock_deck_3_port_2" + docking_controller = "green_dock_aft_airlock" + base_turf = /turf/simulated/floor/reinforced/airless + base_area = /area/space + +/obj/effect/shuttle_landmark/horizon/dock/deck_3/port_2 + name = "Third Deck Port Dock 2" + landmark_tag = "nav_horizon_dock_deck_3_port_4" + docking_controller = "dock_horizon_4_airlock" + base_turf = /turf/simulated/floor/reinforced/airless + base_area = /area/space + +/obj/effect/shuttle_landmark/horizon/dock/deck_3/port_3 + name = "Third Deck Port Dock 3" + landmark_tag = "nav_horizon_dock_deck_3_port_5" + docking_controller = "specops_dock_airlock" + base_turf = /turf/simulated/floor/reinforced/airless + base_area = /area/space + +// ================================ exterior + +#define NAV_HORIZON_EXTERIOR_ALL_DECKS list(NAV_HORIZON_EXTERIOR_ALL_DECK_1, NAV_HORIZON_EXTERIOR_ALL_DECK_2, NAV_HORIZON_EXTERIOR_ALL_DECK_3) + +/obj/effect/shuttle_landmark/horizon/exterior + base_turf = /turf/space + base_area = /area/space + +// ================================ exterior deck 1 + +#define NAV_HORIZON_EXTERIOR_ALL_DECK_1 list(\ + "nav_horizon_exterior_deck_1_fore",\ + "nav_horizon_exterior_deck_1_port",\ + "nav_horizon_exterior_deck_1_starboard",\ + "nav_horizon_exterior_deck_1_aft",\ + "nav_horizon_exterior_deck_1_port_propulsion",\ + "nav_horizon_exterior_deck_1_starboard_propulsion",\ +) + +/obj/effect/shuttle_landmark/horizon/exterior/deck_1/fore + name = "Deck One, Fore of Horizon" + landmark_tag = "nav_horizon_exterior_deck_1_fore" + +/obj/effect/shuttle_landmark/horizon/exterior/deck_1/port + name = "Deck One, Port of Horizon" + landmark_tag = "nav_horizon_exterior_deck_1_port" + +/obj/effect/shuttle_landmark/horizon/exterior/deck_1/starboard + name = "Deck One, Starboard of Horizon" + landmark_tag = "nav_horizon_exterior_deck_1_starboard" + +/obj/effect/shuttle_landmark/horizon/exterior/deck_1/aft + name = "Deck One, Aft of Horizon" + landmark_tag = "nav_horizon_exterior_deck_1_aft" + +/obj/effect/shuttle_landmark/horizon/exterior/deck_1/port_propulsion + name = "Deck One, Near Port Propulsion" + landmark_tag = "nav_horizon_exterior_deck_1_port_propulsion" + +/obj/effect/shuttle_landmark/horizon/exterior/deck_1/starboard_propulsion + name = "Deck One, Near Starboard Propulsion" + landmark_tag = "nav_horizon_exterior_deck_1_starboard_propulsion" + +// ================================ exterior deck 2 + +#define NAV_HORIZON_EXTERIOR_ALL_DECK_2 list(\ + "nav_horizon_exterior_deck_2_fore",\ + "nav_horizon_exterior_deck_2_starboard_fore",\ + "nav_horizon_exterior_deck_2_port_fore",\ + "nav_horizon_exterior_deck_2_aft",\ + "nav_horizon_exterior_deck_2_starboard_aft",\ + "nav_horizon_exterior_deck_2_port_aft",\ +) + +/obj/effect/shuttle_landmark/horizon/exterior/deck_2/fore + name = "Deck Two, Fore of Horizon" + landmark_tag = "nav_horizon_exterior_deck_2_fore" + +/obj/effect/shuttle_landmark/horizon/exterior/deck_2/starboard_fore + name = "Deck Two, Starboard Fore of Horizon" + landmark_tag = "nav_horizon_exterior_deck_2_starboard_fore" + +/obj/effect/shuttle_landmark/horizon/exterior/deck_2/port_fore + name = "Deck Two, Port Fore of Horizon" + landmark_tag = "nav_horizon_exterior_deck_2_port_fore" + +/obj/effect/shuttle_landmark/horizon/exterior/deck_2/aft + name = "Deck Two, Aft of Horizon" + landmark_tag = "nav_horizon_exterior_deck_2_aft" + +/obj/effect/shuttle_landmark/horizon/exterior/deck_2/starboard_aft + name = "Deck One, Starboard Aft of horizon" + landmark_tag = "nav_horizon_exterior_deck_2_starboard_aft" + +/obj/effect/shuttle_landmark/horizon/exterior/deck_2/port_aft + name = "Deck One, Port Aft of Horizon" + landmark_tag = "nav_horizon_exterior_deck_2_port_aft" + +// ================================ exterior deck 3 + +#define NAV_HORIZON_EXTERIOR_ALL_DECK_3 list(\ + "nav_horizon_exterior_deck_3_fore",\ + "nav_horizon_exterior_deck_3_starboard_fore",\ + "nav_horizon_exterior_deck_3_port_fore",\ + "nav_horizon_exterior_deck_3_port_aft",\ + "nav_horizon_exterior_deck_3_aft",\ +) + +/obj/effect/shuttle_landmark/horizon/exterior/deck_3/fore + name = "Deck Three, Fore of Horizon" + landmark_tag = "nav_horizon_exterior_deck_3_fore" + +/obj/effect/shuttle_landmark/horizon/exterior/deck_3/starboardfore + name = "Deck Three, Starboard Fore of Horizon" + landmark_tag = "nav_horizon_exterior_deck_3_starboard_fore" + +/obj/effect/shuttle_landmark/horizon/exterior/deck_3/portfore + name = "Deck Three, Fore Port of Horizon" + landmark_tag = "nav_horizon_exterior_deck_3_port_fore" + +/obj/effect/shuttle_landmark/horizon/exterior/deck_3/portaft + name = "Deck Three, Aft Port of Horizon" + landmark_tag = "nav_horizon_exterior_deck_3_port_aft" + +/obj/effect/shuttle_landmark/horizon/exterior/deck_3/aft + name = "Deck Three, Aft of Horizon" + landmark_tag = "nav_horizon_exterior_deck_3_aft" + +// ================================ exterior sneaky antag-only landmarks + +#define NAV_HORIZON_EXTERIOR_ALL_SNEAKY list(\ + "nav_horizon_exterior_sneaky_starboard_nacelle_1",\ + "nav_horizon_exterior_sneaky_starboard_nacelle_2",\ +) + +/obj/effect/shuttle_landmark/horizon/exterior/sneaky/starboard_nacelle_1 + name = "Deck Two, Starboard Nacelle 1" + landmark_tag = "nav_horizon_exterior_sneaky_starboard_nacelle_1" + +/obj/effect/shuttle_landmark/horizon/exterior/sneaky/starboard_nacelle_2 + name = "Deck Two, Starboard Nacelle 2" + landmark_tag = "nav_horizon_exterior_sneaky_starboard_nacelle_2" diff --git a/maps/sccv_horizon/code/sccv_horizon_overmap.dm b/maps/sccv_horizon/code/sccv_horizon_overmap.dm index 9afbb226857..3bdb37dbefb 100644 --- a/maps/sccv_horizon/code/sccv_horizon_overmap.dm +++ b/maps/sccv_horizon/code/sccv_horizon_overmap.dm @@ -26,29 +26,10 @@ ) initial_generic_waypoints = list( - "nav_hangar_horizon_1", - "nav_hangar_horizon_2", - "nav_dock_horizon_1", - "nav_dock_horizon_2", - "nav_dock_horizon_3", - "nav_dock_horizon_4", - "deck_one_fore_of_horizon", - "deck_one_starboard_side", - "deck_one_port_side", - "deck_one_aft_of_horizon", - "deck_one_near_starboard_propulsion", - "deck_one_near_port_propulsion", - "deck_two_fore_of_horizon", - "deck_two_starboard_fore", - "deck_two_port_fore", - "deck_two_aft_of_horizon", - "deck_two_port_aft", - "deck_two_starboard_aft", - "deck_three_fore_of_horizon", - "deck_three_fore_starboard_of_horizon", - "deck_three_port_fore_of_horizon", - "deck_three_aft_of_horizon", - "deck_three_port_aft_of_horizon" + "nav_horizon_hangar_1", + "nav_horizon_hangar_2", + NAV_HORIZON_DOCK_ALL, + NAV_HORIZON_EXTERIOR_ALL_DECKS, ) tracked_dock_tags = list( @@ -56,18 +37,13 @@ "nav_hangar_intrepid", "nav_hangar_canary", "nav_cargo_shuttle_dock", - "nav_hangar_horizon_1", + "nav_horizon_hangar_1", "nav_burglar_hangar", - "nav_hangar_horizon_2", + "nav_horizon_hangar_2", "nav_distress_blue", "nav_merchant_dock", "nav_ccia_dock", - "nav_merc_dock", - "nav_dock_horizon_1", - "nav_dock_horizon_2", - "nav_dock_horizon_3", - "nav_dock_horizon_4", - "nav_ert_dock" + NAV_HORIZON_DOCK_ALL, ) /obj/effect/overmap/visitable/ship/sccv_horizon/get_skybox_representation() @@ -188,128 +164,3 @@ icon_keyboard = null circuit = null -/obj/effect/shuttle_landmark/horizon/nav1 - name = "First Deck Port Hangar Bay 1a" - landmark_tag = "nav_hangar_horizon_1" - base_turf = /turf/simulated/floor/plating - base_area = /area/hangar/auxiliary - -/obj/effect/shuttle_landmark/horizon/nav2 - name = "First Deck Port Hangar Bay 2a" - landmark_tag = "nav_hangar_horizon_2" - base_turf = /turf/simulated/floor/plating - base_area = /area/hangar/auxiliary - -//external landmarks for overmap ships -/obj/effect/shuttle_landmark/horizon/dock1 - name = "Third Deck Starboard Dock 2" - landmark_tag = "nav_dock_horizon_1" - docking_controller = "dock_horizon_1_airlock" - base_turf = /turf/simulated/floor/reinforced/airless - base_area = /area/space - -/obj/effect/shuttle_landmark/horizon/dock2 - name = "Third Deck Port Dock 1" - landmark_tag = "nav_dock_horizon_2" - base_turf = /turf/simulated/floor/reinforced/airless - base_area = /area/space - -/obj/effect/shuttle_landmark/horizon/dock3 - name = "Third Deck Starboard Dock 3" - landmark_tag = "nav_dock_horizon_3" - docking_controller = "dock_horizon_3_airlock" - base_turf = /turf/simulated/floor/reinforced/airless - base_area = /area/space - -/obj/effect/shuttle_landmark/horizon/dock4 - name = "Third Deck Port Dock 2" - landmark_tag = "nav_dock_horizon_4" - docking_controller = "dock_horizon_4_airlock" - base_turf = /turf/simulated/floor/reinforced/airless - base_area = /area/space - -//Deck one landmarks that overmap shuttles can go to -/obj/effect/shuttle_landmark/horizon/deckone - base_turf = /turf/space - base_area = /area/space - -/obj/effect/shuttle_landmark/horizon/deckone/fore - name = "Deck One, Fore of Horizon" - landmark_tag = "deck_one_fore_of_horizon" - -/obj/effect/shuttle_landmark/horizon/deckone/port - name = "Deck One, Port of Horizon" - landmark_tag = "deck_one_port_side" - -/obj/effect/shuttle_landmark/horizon/deckone/starboard - name = "Deck One, Starboard of Horizon" - landmark_tag = "deck_one_starboard_side" - -/obj/effect/shuttle_landmark/horizon/deckone/aft - name = "Deck One, Aft of Horizon" - landmark_tag = "deck_one_aft_of_horizon" - -/obj/effect/shuttle_landmark/horizon/deckone/port_propulsion - name = "Deck One, Near Port Propulsion" - landmark_tag = "deck_one_near_port_propulsion" - -/obj/effect/shuttle_landmark/horizon/deckone/starboard_propulsion - name = "Deck One, Near Starboard Propulsion" - landmark_tag = "deck_one_near_starboard_propulsion" - - -////Deck two landmarks that overmap shuttles can go to -/obj/effect/shuttle_landmark/horizon/decktwo - base_turf = /turf/space - base_area = /area/space - -/obj/effect/shuttle_landmark/horizon/decktwo/fore - name = "Deck Two, Fore of Horizon" - landmark_tag = "deck_two_fore_of_horizon" - -/obj/effect/shuttle_landmark/horizon/decktwo/starboard_fore - name = "Deck Two, Starboard Fore of Horizon" - landmark_tag = "deck_two_starboard_fore" - -/obj/effect/shuttle_landmark/horizon/decktwo/port_fore - name = "Deck Two, Port Fore of Horizon" - landmark_tag = "deck_two_port_fore" - -/obj/effect/shuttle_landmark/horizon/decktwo/aft - name = "Deck Two, Aft of Horizon" - landmark_tag = "deck_two_aft_of_horizon" - -/obj/effect/shuttle_landmark/horizon/decktwo/starboard_aft - name = "Deck One, Starboard Aft of horizon" - landmark_tag = "deck_two_starboard_aft" - -/obj/effect/shuttle_landmark/horizon/decktwo/port_aft - name = "Deck One, Port Aft of Horizon" - landmark_tag = "deck_two_port_aft" - - -////Deck three landmarks that overmap shuttles can go to -/obj/effect/shuttle_landmark/horizon/deckthree - base_turf = /turf/space - base_area = /area/space - -//This is in front of the bridge, which I think deserves particular notice here -/obj/effect/shuttle_landmark/horizon/deckthree/fore - name = "Deck Three, Fore of Horizon" - landmark_tag = "deck_three_fore_of_horizon" - -/obj/effect/shuttle_landmark/horizon/deckthree/starboardfore - name = "Deck Three, Starboard Fore of Horizon" - landmark_tag = "deck_three_fore_starboard_of_horizon" - -/obj/effect/shuttle_landmark/horizon/deckthree/portfore - name = "Deck Three, Fore Port of Horizon" - landmark_tag = "deck_three_port_fore_of_horizon" - -/obj/effect/shuttle_landmark/horizon/deckthree/portaft - name = "Deck Three, Aft Port of Horizon" - landmark_tag = "deck_three_port_aft_of_horizon" - -/obj/effect/shuttle_landmark/horizon/deckthree/aft - name = "Deck Three, Aft of Horizon" - landmark_tag = "deck_three_aft_of_horizon" diff --git a/maps/sccv_horizon/code/sccv_horizon_shuttles.dm b/maps/sccv_horizon/code/sccv_horizon_shuttles.dm index 0954ec367b4..14126769b9b 100644 --- a/maps/sccv_horizon/code/sccv_horizon_shuttles.dm +++ b/maps/sccv_horizon/code/sccv_horizon_shuttles.dm @@ -11,8 +11,9 @@ destination_tags = list( "nav_burglar_start", "nav_burglar_hangar", - "nav_burglar_second_deck", - "nav_burglar_third_deck" + "nav_horizon_dock_deck_3_starboard_1", + NAV_HORIZON_EXTERIOR_ALL_DECKS, + NAV_HORIZON_EXTERIOR_ALL_SNEAKY, ) announcer = "Automated Radar System" @@ -36,18 +37,6 @@ landmark_tag = "nav_burglar_hangar" landmark_flags = SLANDMARK_FLAG_AUTOSET -/obj/effect/shuttle_landmark/burglar_ship/second_deck - name = "Second Deck" - landmark_tag = "nav_burglar_second_deck" - base_turf = /turf/space - base_area = /area/space - -/obj/effect/shuttle_landmark/burglar_ship/third_deck - name = "Third Deck" - landmark_tag = "nav_burglar_third_deck" - landmark_flags = SLANDMARK_FLAG_AUTOSET - - //-// Raider Skipjack //-// /datum/shuttle/autodock/multi/antag/skipjack_ship @@ -60,9 +49,9 @@ shuttle_area = /area/shuttle/skipjack destination_tags = list( "nav_skipjack_start", - "nav_skipjack_third_deck", - "nav_skipjack_second_deck", - "nav_skipjack_first_deck" + "nav_horizon_dock_deck_3_starboard_3", + NAV_HORIZON_EXTERIOR_ALL_DECKS, + NAV_HORIZON_EXTERIOR_ALL_SNEAKY, ) landmark_transition = "nav_skipjack_interim" @@ -75,28 +64,12 @@ landmark_tag = "nav_skipjack_start" docking_controller = "pirate_hideout" base_turf = /turf/space/dynamic - base_area = /area/template_noop /obj/effect/shuttle_landmark/skipjack_ship/interim name = "In Transit" landmark_tag = "nav_skipjack_interim" base_turf = /turf/space/transit/north -/obj/effect/shuttle_landmark/skipjack_ship/third_deck - name = "Third Deck" - landmark_tag = "nav_skipjack_third_deck" - landmark_flags = SLANDMARK_FLAG_AUTOSET - -/obj/effect/shuttle_landmark/skipjack_ship/second_deck - name = "Second Deck" - landmark_tag = "nav_skipjack_second_deck" - landmark_flags = SLANDMARK_FLAG_AUTOSET - -/obj/effect/shuttle_landmark/skipjack_ship/first_deck - name = "First Deck" - landmark_tag = "nav_skipjack_first_deck" - landmark_flags = SLANDMARK_FLAG_AUTOSET - //-// Mercenary Shuttle //-// /datum/shuttle/autodock/multi/antag/merc_ship @@ -108,11 +81,10 @@ move_time = 75 shuttle_area = /area/shuttle/mercenary destination_tags = list( - "nav_merc_dock", "nav_merc_start", - "nav_third_deck", - "nav_second_deck", - "nav_first_deck" + "nav_horizon_dock_deck_3_starboard_1", + NAV_HORIZON_EXTERIOR_ALL_DECKS, + NAV_HORIZON_EXTERIOR_ALL_SNEAKY, ) landmark_transition = "nav_merc_interim" @@ -131,29 +103,6 @@ name = "In Transit" landmark_tag = "nav_merc_interim" base_turf = /turf/space/transit/north - base_area = /area/template_noop - -/obj/effect/shuttle_landmark/merc_ship/dock - name = "Third Deck Starboard Dock 1" - landmark_tag = "nav_merc_dock" - docking_controller = "nuke_shuttle_dock_airlock" - base_turf = /turf/simulated/floor/reinforced/airless - base_area = /area/space - -/obj/effect/shuttle_landmark/merc_ship/third_deck - name = "Third Deck Outside" - landmark_tag = "nav_third_deck" - landmark_flags = SLANDMARK_FLAG_AUTOSET - -/obj/effect/shuttle_landmark/merc_ship/second_deck - name = "Second Deck Outside" - landmark_tag = "nav_second_deck" - landmark_flags = SLANDMARK_FLAG_AUTOSET - -/obj/effect/shuttle_landmark/merc_ship/first_deck - name = "First Deck Outside" - landmark_tag = "nav_first_deck" - landmark_flags = SLANDMARK_FLAG_AUTOSET // Intrepid /datum/shuttle/autodock/overmap/intrepid diff --git a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm index a76bdd14646..bffb723b649 100644 --- a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm +++ b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm @@ -3983,7 +3983,7 @@ /turf/simulated/floor/tiled, /area/operations/storage) "cPq" = ( -/obj/effect/shuttle_landmark/horizon/deckone/starboard_propulsion, +/obj/effect/shuttle_landmark/horizon/exterior/deck_1/starboard_propulsion, /turf/template_noop, /area/template_noop) "cPt" = ( @@ -5458,7 +5458,7 @@ }, /area/maintenance/wing/starboard/deck1) "dTk" = ( -/obj/effect/shuttle_landmark/horizon/nav2, +/obj/effect/shuttle_landmark/horizon/hangar2, /turf/simulated/floor/plating, /area/hangar/auxiliary) "dUP" = ( @@ -11970,12 +11970,6 @@ /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/propulsion) -"itT" = ( -/obj/effect/shuttle_landmark/skipjack_ship/first_deck{ - dir = 1 - }, -/turf/template_noop, -/area/template_noop) "iuk" = ( /turf/simulated/wall/shuttle/unique/scc/mining{ icon_state = "7,5" @@ -12866,7 +12860,7 @@ /turf/simulated/floor/plating, /area/shuttle/intrepid/engine_compartment) "jbS" = ( -/obj/effect/shuttle_landmark/horizon/deckone/starboard, +/obj/effect/shuttle_landmark/horizon/exterior/deck_1/starboard, /turf/template_noop, /area/template_noop) "jcd" = ( @@ -15909,12 +15903,6 @@ }, /turf/simulated/floor/tiled, /area/hangar/intrepid) -"lnk" = ( -/obj/effect/shuttle_landmark/merc_ship/first_deck{ - dir = 4 - }, -/turf/template_noop, -/area/template_noop) "lnt" = ( /obj/effect/floor_decal/corner/dark_green{ dir = 9 @@ -18824,7 +18812,7 @@ /turf/simulated/floor/tiled/dark, /area/storage/eva) "nhU" = ( -/obj/effect/shuttle_landmark/horizon/deckone/fore, +/obj/effect/shuttle_landmark/horizon/exterior/deck_1/fore, /turf/template_noop, /area/template_noop) "nie" = ( @@ -19747,7 +19735,7 @@ /turf/simulated/floor/plating, /area/hallway/primary/aft) "nOU" = ( -/obj/effect/shuttle_landmark/horizon/deckone/port, +/obj/effect/shuttle_landmark/horizon/exterior/deck_1/port, /turf/template_noop, /area/template_noop) "nPq" = ( @@ -25109,7 +25097,7 @@ }, /area/shuttle/intrepid/atmos_compartment) "rDi" = ( -/obj/effect/shuttle_landmark/horizon/deckone/aft, +/obj/effect/shuttle_landmark/horizon/exterior/deck_1/aft, /turf/template_noop, /area/template_noop) "rDE" = ( @@ -27370,7 +27358,7 @@ }, /area/shuttle/mining) "tjN" = ( -/obj/effect/shuttle_landmark/horizon/nav1, +/obj/effect/shuttle_landmark/horizon/hangar1, /turf/simulated/floor/plating, /area/hangar/auxiliary) "tkS" = ( @@ -32874,7 +32862,7 @@ /turf/simulated/floor/plating, /area/shuttle/intrepid/quarters) "xaf" = ( -/obj/effect/shuttle_landmark/horizon/deckone/port_propulsion, +/obj/effect/shuttle_landmark/horizon/exterior/deck_1/port_propulsion, /turf/template_noop, /area/template_noop) "xaE" = ( @@ -52550,7 +52538,7 @@ eSV eSV eSV eSV -itT +eSV eSV eSV eSV @@ -66262,7 +66250,7 @@ eSV eSV eSV eSV -lnk +eSV eSV eSV eSV diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm index d4697aef690..55c8806c2f7 100644 --- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm +++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm @@ -200,6 +200,10 @@ }, /turf/simulated/floor/tiled, /area/horizon/hydroponics) +"acL" = ( +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/dark, +/area/maintenance/wing/starboard/far) "adv" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -513,7 +517,7 @@ /turf/simulated/floor/plating, /area/engineering/engine_room) "ang" = ( -/obj/effect/shuttle_landmark/horizon/decktwo/port_fore, +/obj/effect/shuttle_landmark/horizon/exterior/deck_2/port_fore, /turf/template_noop, /area/template_noop) "anJ" = ( @@ -3466,8 +3470,10 @@ /turf/simulated/floor/plating, /area/engineering/engine_room) "bAF" = ( -/obj/structure/foamedmetal, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/turf/simulated/floor/tiled/dark, /area/maintenance/wing/starboard/far) "bAU" = ( /obj/structure/table/wood, @@ -7386,7 +7392,7 @@ /turf/simulated/floor/reinforced/airless, /area/turret_protected/ai_upload) "dAy" = ( -/obj/effect/shuttle_landmark/horizon/decktwo/starboard_fore, +/obj/effect/shuttle_landmark/horizon/exterior/deck_2/starboard_fore, /turf/template_noop, /area/template_noop) "dAF" = ( @@ -8266,7 +8272,7 @@ /turf/simulated/floor/tiled/full, /area/horizon/security/hallway) "dXD" = ( -/obj/effect/shuttle_landmark/horizon/decktwo/port_aft, +/obj/effect/shuttle_landmark/horizon/exterior/deck_2/port_aft, /turf/template_noop, /area/template_noop) "dYe" = ( @@ -9255,7 +9261,7 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard/far) "exF" = ( -/obj/effect/shuttle_landmark/horizon/decktwo/fore, +/obj/effect/shuttle_landmark/horizon/exterior/deck_2/fore, /turf/template_noop, /area/template_noop) "exU" = ( @@ -19416,7 +19422,7 @@ /turf/simulated/floor/tiled, /area/operations/mail_room) "jib" = ( -/obj/effect/shuttle_landmark/horizon/decktwo/aft, +/obj/effect/shuttle_landmark/horizon/exterior/deck_2/aft, /turf/template_noop, /area/template_noop) "jih" = ( @@ -21932,6 +21938,12 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/full, /area/horizon/security/equipment) +"ktw" = ( +/obj/machinery/door/airlock/maintenance_hatch{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/maintenance/wing/starboard/far) "ktC" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance{ @@ -26685,12 +26697,6 @@ }, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) -"mLd" = ( -/obj/effect/shuttle_landmark/merc_ship/second_deck{ - dir = 4 - }, -/turf/template_noop, -/area/template_noop) "mLn" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -27371,6 +27377,12 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/full, /area/maintenance/wing/port) +"mYa" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/turf/simulated/floor/tiled/dark, +/area/maintenance/wing/starboard/far) "mYp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -33883,6 +33895,9 @@ /obj/effect/landmark/entry_point/fore{ name = "fore, ballast" }, +/obj/effect/shuttle_landmark/horizon/exterior/sneaky/starboard_nacelle_2{ + dir = 1 + }, /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/maintenance/wing/starboard/far) "qhf" = ( @@ -38306,7 +38321,7 @@ /turf/simulated/floor/tiled/white, /area/rnd/research) "sph" = ( -/obj/effect/shuttle_landmark/horizon/decktwo/starboard_aft, +/obj/effect/shuttle_landmark/horizon/exterior/deck_2/starboard_aft, /turf/template_noop, /area/template_noop) "spn" = ( @@ -42564,7 +42579,7 @@ /turf/simulated/wall, /area/horizon/kitchen) "upQ" = ( -/obj/effect/shuttle_landmark/burglar_ship/second_deck{ +/obj/effect/shuttle_landmark/horizon/exterior/sneaky/starboard_nacelle_1{ dir = 4 }, /turf/simulated/wall/shuttle/scc_space_ship/cardinal, @@ -50544,12 +50559,6 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/full, /area/rnd/hallway) -"xWc" = ( -/obj/effect/shuttle_landmark/skipjack_ship/second_deck{ - dir = 1 - }, -/turf/template_noop, -/area/template_noop) "xWr" = ( /obj/machinery/door/firedoor{ dir = 4 @@ -55935,7 +55944,7 @@ nox nox nox dEz -bAF +nox bAF kDC kDC @@ -56137,9 +56146,9 @@ dMK dMK mQi dEz -bAF -bAF -bAF +nox +acL +nsx kDC qgN qgN @@ -56338,10 +56347,10 @@ vaL vaL vaL czJ -dEz -bAF -bAF -bAF +ktw +nox +acL +nsx qgO qgN qgN @@ -56541,9 +56550,9 @@ vuI vuI vPt dEz -bAF -bAF -bAF +nox +acL +nsx kDC qgN qgN @@ -56743,8 +56752,8 @@ nox nox nox dEz -bAF -bAF +nox +mYa kDC kDC qgN @@ -56890,7 +56899,7 @@ qgN qgN qgN qgN -xWc +qgN qgN qgN qgN @@ -76059,7 +76068,7 @@ qgN qgN qgN qgN -mLd +qgN qgN qgN qgN diff --git a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm index 96d78fdfba3..92ee6440fd8 100644 --- a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm +++ b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm @@ -45,6 +45,9 @@ /obj/effect/landmark/entry_point/port{ name = "port, deck 3 port docks" }, +/obj/effect/shuttle_landmark/horizon/dock/deck_3/port_3{ + dir = 8 + }, /turf/simulated/floor/plating, /area/horizon/hallway/deck_three/primary/port/docks) "abD" = ( @@ -1671,6 +1674,13 @@ }, /turf/simulated/floor/plating, /area/engineering/break_room) +"bgl" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/effect/map_effect/map_helper/ruler_tiles_3, +/turf/simulated/floor/reinforced/airless, +/area/template_noop) "bgx" = ( /obj/structure/cable{ icon_state = "1-2" @@ -2900,7 +2910,7 @@ pixel_y = -12; req_one_access = list(13) }, -/obj/effect/shuttle_landmark/horizon/dock3{ +/obj/effect/shuttle_landmark/horizon/dock/deck_3/starboard_3{ dir = 1 }, /turf/simulated/floor/plating, @@ -4540,7 +4550,7 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/central) "dOV" = ( -/obj/effect/shuttle_landmark/horizon/deckthree/aft, +/obj/effect/shuttle_landmark/horizon/exterior/deck_3/aft, /turf/template_noop, /area/template_noop) "dQq" = ( @@ -6879,7 +6889,7 @@ /turf/simulated/floor/tiled/dark, /area/horizon/security/meeting_room) "fxV" = ( -/obj/effect/shuttle_landmark/horizon/deckthree/portfore, +/obj/effect/shuttle_landmark/horizon/exterior/deck_3/portfore, /turf/template_noop, /area/template_noop) "fyw" = ( @@ -8452,6 +8462,12 @@ }, /turf/simulated/floor/tiled/dark, /area/horizon/security/evidence_storage) +"gGV" = ( +/obj/effect/map_effect/map_helper/ruler_tiles_3{ + dir = 4 + }, +/turf/simulated/floor/reinforced/airless, +/area/template_noop) "gHo" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -9267,12 +9283,6 @@ /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/horizon/hallway/deck_three/primary/port/docks) -"hll" = ( -/obj/effect/shuttle_landmark/skipjack_ship/third_deck{ - dir = 1 - }, -/turf/template_noop, -/area/template_noop) "hlt" = ( /obj/machinery/newscaster/east{ pixel_y = 10 @@ -11201,6 +11211,13 @@ }, /turf/simulated/floor/tiled/dark, /area/horizon/crew_armoury) +"iLW" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/effect/map_effect/map_helper/ruler_tiles_3{ + dir = 4 + }, +/turf/simulated/floor/reinforced/airless, +/area/template_noop) "iMd" = ( /obj/structure/bed/stool/chair/sofa/red, /obj/effect/floor_decal/corner/brown/diagonal, @@ -12264,6 +12281,10 @@ }, /turf/simulated/open/airless, /area/template_noop) +"jBQ" = ( +/obj/effect/map_effect/map_helper/ruler_tiles_3, +/turf/simulated/wall/shuttle/scc_space_ship/cardinal, +/area/horizon/hallway/deck_three/primary/starboard/docks) "jCl" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -12350,7 +12371,7 @@ name = "Docking Port Airlock"; req_access = list(13) }, -/obj/effect/shuttle_landmark/horizon/dock4{ +/obj/effect/shuttle_landmark/horizon/dock/deck_3/port_2{ dir = 1 }, /turf/simulated/floor/plating, @@ -13604,7 +13625,7 @@ /turf/simulated/floor/tiled/dark, /area/horizon/security/meeting_room) "kyo" = ( -/obj/effect/shuttle_landmark/horizon/dock1, +/obj/effect/shuttle_landmark/horizon/dock/deck_3/starboard_2, /obj/machinery/door/airlock/external{ dir = 1; frequency = 1380; @@ -16861,7 +16882,8 @@ /turf/simulated/floor/bluegrid, /area/tcommsat/chamber) "mUu" = ( -/obj/effect/shuttle_landmark/ert/dock, +/obj/effect/floor_decal/industrial/warning, +/obj/effect/map_effect/map_helper/ruler_tiles_3, /turf/simulated/floor/reinforced/airless, /area/template_noop) "mUv" = ( @@ -16995,7 +17017,7 @@ name = "Docking Port Airlock"; req_access = list(13) }, -/obj/effect/shuttle_landmark/merc_ship/dock{ +/obj/effect/shuttle_landmark/horizon/dock/deck_3/starboard_1{ dir = 4 }, /turf/simulated/floor/plating, @@ -18422,6 +18444,12 @@ }, /turf/simulated/floor, /area/horizon/maintenance/deck_three/aft/starboard) +"nZi" = ( +/obj/effect/map_effect/map_helper/ruler_tiles_3{ + dir = 4 + }, +/turf/template_noop, +/area/template_noop) "nZt" = ( /obj/machinery/door/airlock/maintenance{ dir = 4; @@ -19766,7 +19794,7 @@ name = "Emergency Services Dock"; req_access = list(13) }, -/obj/effect/shuttle_landmark/horizon/dock2{ +/obj/effect/shuttle_landmark/horizon/dock/deck_3/port_1{ dir = 2 }, /turf/simulated/floor/plating, @@ -21402,9 +21430,7 @@ /turf/simulated/floor/reinforced/airless, /area/horizon/exterior) "qCN" = ( -/obj/effect/shuttle_landmark/legion/green{ - dir = 2 - }, +/obj/effect/map_effect/map_helper/ruler_tiles_3, /turf/simulated/floor/reinforced/airless, /area/template_noop) "qDc" = ( @@ -24939,7 +24965,7 @@ /turf/simulated/floor/tiled/dark, /area/horizon/crew_armoury) "tmK" = ( -/obj/effect/shuttle_landmark/horizon/deckthree/starboardfore, +/obj/effect/shuttle_landmark/horizon/exterior/deck_3/starboardfore, /turf/template_noop, /area/template_noop) "tmU" = ( @@ -26040,7 +26066,7 @@ /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/crew_quarters/lounge) "ubP" = ( -/obj/effect/shuttle_landmark/horizon/deckthree/fore, +/obj/effect/shuttle_landmark/horizon/exterior/deck_3/fore, /turf/template_noop, /area/template_noop) "ubX" = ( @@ -27333,12 +27359,6 @@ /obj/structure/displaycase/captain_revolver, /turf/simulated/floor/wood, /area/crew_quarters/captain) -"vbi" = ( -/obj/effect/shuttle_landmark/merc_ship/third_deck{ - dir = 4 - }, -/turf/template_noop, -/area/template_noop) "vbE" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/green{ @@ -30612,7 +30632,7 @@ /turf/simulated/floor/tiled/white, /area/hallway/medical/upper) "xsC" = ( -/obj/effect/shuttle_landmark/horizon/deckthree/portaft, +/obj/effect/shuttle_landmark/horizon/exterior/deck_3/portaft, /turf/template_noop, /area/template_noop) "xuf" = ( @@ -31382,12 +31402,6 @@ }, /turf/simulated/floor/wood, /area/bridge/minibar) -"yja" = ( -/obj/effect/shuttle_landmark/burglar_ship/third_deck{ - dir = 4 - }, -/turf/template_noop, -/area/template_noop) "yjx" = ( /obj/machinery/light{ dir = 4 @@ -35387,7 +35401,7 @@ dSF dSF dSF dSF -yja +dSF dSF dSF dSF @@ -39847,7 +39861,7 @@ wGH wGH wGH wGH -wGH +qCN wGH wGH wGH @@ -40449,24 +40463,24 @@ wGH wGH wGH wGH +gGV wGH wGH +gGV +qCN wGH -wGH -wGH -wGH -wGH +gGV ebZ lPM mWT ebZ +gGV +wGH +qCN +gGV wGH wGH -wGH -wGH -wGH -wGH -vkb +iLW dSF dSF dSF @@ -41059,7 +41073,7 @@ wGH wGH wGH wGH -wGH +qCN wGH wGH ebZ @@ -41068,7 +41082,7 @@ joS ebZ wGH wGH -wGH +qCN wGH vkb dSF @@ -41674,7 +41688,7 @@ xPy ebZ wGH wGH -wGH +qCN wGH wGH vBY @@ -41817,7 +41831,7 @@ dSF dSF dSF dSF -vbi +dSF dSF dSF dSF @@ -42069,7 +42083,7 @@ wGH wGH wGH wGH -wGH +qCN wGH wGH ebZ @@ -42675,7 +42689,7 @@ wGH wGH wGH wGH -wGH +qCN wGH wGH ebZ @@ -42684,7 +42698,7 @@ sEe ebZ wGH wGH -wGH +qCN wGH wGH wGH @@ -43281,7 +43295,7 @@ wGH wGH wGH wGH -wGH +qCN wGH wGH dce @@ -43290,7 +43304,7 @@ ccL ebZ wGH wGH -wGH +qCN wGH wGH wGH @@ -43896,7 +43910,7 @@ sgv rdE pfL lbB -ebZ +jBQ wGH wGH wGH @@ -59644,7 +59658,7 @@ wGH wGH wGH wGH -wGH +qCN wGH mIx fGN @@ -59652,7 +59666,7 @@ rPg mIx wGH wGH -wGH +qCN wGH wGH wGH @@ -60250,7 +60264,7 @@ wGH wGH wGH wGH -wGH +qCN wGH tcM fgF @@ -60258,7 +60272,7 @@ rFk tcM wGH wGH -wGH +qCN wGH wGH wGH @@ -60856,7 +60870,7 @@ wGH wGH wGH wGH -dHX +bgl wGH tcM cMi @@ -60864,7 +60878,7 @@ nKD tcM wGH wGH -vkb +mUu wGH wGH wGH @@ -61259,7 +61273,7 @@ wGH wGH wGH wGH -qCN +wGH oWq fYD nDk @@ -61866,7 +61880,7 @@ wGH wGH wGH wGH -dHX +bgl wGH njG wSJ @@ -61874,7 +61888,7 @@ xXh mIx wGH wGH -vkb +mUu wGH wGH vkb @@ -62472,7 +62486,7 @@ wGH wGH wGH wGH -wGH +qCN wGH tcM jqz @@ -62480,7 +62494,7 @@ anT mIx wGH wGH -wGH +qCN bEW kMe dSF @@ -62669,24 +62683,24 @@ wGH wGH wGH wGH +gGV wGH wGH -wGH -wGH +gGV wGH uLF -wGH +gGV tcM abx krF tcM +gGV wGH wGH -wGH -vkb -dSF +iLW dSF dSF +nZi dSF dSF dSF @@ -62879,7 +62893,7 @@ wGH wGH wGH wGH -mUu +wGH wGH dHX wGH @@ -63078,6 +63092,7 @@ wGH wGH wGH opC +qCN wGH wGH wGH @@ -63085,8 +63100,7 @@ wGH wGH wGH wGH -wGH -vkb +mUu dSF dSF dSF @@ -65442,7 +65456,7 @@ dSF dSF dSF dSF -hll +dSF dSF dSF dSF