Merge 24394332d9 into a0cac516fc

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

Implementing NSV Endevour, the final name of the new ship name. 
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game

NEW MAP!!!
<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

🆑
add: All files related to NSV Endeavour
/🆑

<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Co-authored-by: AlphaM01 <AlphaaMachh@gmail.com>
Co-authored-by: LordME <58342752+TheLordME@users.noreply.github.com>

citadel.dme

@@ -1023,7 +1023,7 @@
 #include "code\game\area\Space Station 13 areas.dm"
 #include "code\game\area\ss13_deprecated_areas.dm"
 #include "code\game\area\Tether_areas.dm"
-#include "code\game\area\victory_areas.dm"
+#include "code\game\area\endeavour_areas.dm"
 #include "code\game\area\station\exporation.dm"
 #include "code\game\area\station\security_areas.dm"
 #include "code\game\atoms\action_feedback.dm"
@@ -5331,14 +5331,14 @@
 #include "maps\triumph\triumph-shuttle-landmarks.dm"
 #include "maps\triumph\triumph-turbolifts.dm"
 #include "maps\triumph\triumph.dm"
-#include "maps\victory\engines.dm"
-#include "maps\victory\sectors.dm"
-#include "maps\victory\shuttles.dm"
-#include "maps\victory\telecomms.dm"
-#include "maps\victory\victory-areas.dm"
-#include "maps\victory\victory-overmap.dm"
-#include "maps\victory\victory-sectors.dm"
-#include "maps\victory\victory-shuttle-landmarks.dm"
-#include "maps\victory\victory-turbolifts.dm"
-#include "maps\victory\victory.dm"
+#include "maps\endeavour\engines.dm"
+#include "maps\endeavour\sectors.dm"
+#include "maps\endeavour\shuttles.dm"
+#include "maps\endeavour\telecomms.dm"
+#include "maps\endeavour\endeavour-areas.dm"
+#include "maps\endeavour\endeavour-overmap.dm"
+#include "maps\endeavour\endeavour-sectors.dm"
+#include "maps\endeavour\endeavour-shuttle-landmarks.dm"
+#include "maps\endeavour\endeavour-turbolifts.dm"
+#include "maps\endeavour\endeavour.dm"
 // END_INCLUDE

code/game/area/endeavour_areas.dm

@@ -0,0 +1,146 @@
+/** Endeavour Hallways
+ */
+
+/** Deck 4
+ */
+/area/endeavour/hallway/d4aftmaint
+	name = "\improper Deck 4 Aft Maintenance"
+	icon_state = "amaint"
+
+/area/endeavour/hallway/d4fwdmaint
+	name = "\improper Deck 4 Forward Maintenance"
+	icon_state = "fmaint"
+
+/area/endeavour/hallway/d4fwdhall
+	name = "\improper Deck 4 Forward Hallway"
+	icon_state = "hallF"
+
+/area/endeavour/hallway/d4afthall
+	name = "\improper Deck 4 Aft Hallway"
+	icon_state = "hallA"
+
+/area/endeavour/hallway/d4porthall
+	name = "\improper Deck 4 Port Hallway"
+	icon_state = "hallP"
+
+/area/endeavour/hallway/d4starboardhall
+	name = "\improper Deck 4 Starboard Hallway"
+	icon_state = "hallS"
+
+/** Deck 3
+ */
+/area/endeavour/hallway/d3aftmaint
+	name = "\improper Deck 3 Aft Maintenance"
+	icon_state = "amaint"
+
+/area/endeavour/hallway/d3fwdmaint
+	name = "\improper Deck 3 Forward Maintenance"
+	icon_state = "fmaint"
+
+/area/endeavour/hallway/d3fwdhall
+	name = "\improper Deck 3 Forward Hallway"
+	icon_state = "hallF"
+
+/area/endeavour/hallway/d3afthall
+	name = "\improper Deck 3 Aft Hallway"
+	icon_state = "hallA"
+
+/area/endeavour/hallway/d3porthall
+	name = "\improper Deck 3 Port Hallway"
+	icon_state = "hallP"
+
+/area/endeavour/hallway/d3starboardhall
+	name = "\improper Deck 3 Starboard Hallway"
+	icon_state = "hallS"
+
+/** Deck 2
+ */
+/area/endeavour/hallway/d2aftmaint
+	name = "\improper Deck 2 Aft Maintenance"
+	icon_state = "amaint"
+
+/area/endeavour/hallway/d2fwdmaint
+	name = "\improper Deck 2 Forward Maintenance"
+	icon_state = "fmaint"
+
+/area/endeavour/hallway/d2fwdhall
+	name = "\improper Deck 2 Forward Hallway"
+	icon_state = "hallF"
+
+/area/endeavour/hallway/d2afthall
+	name = "\improper Deck 2 Aft Hallway"
+	icon_state = "hallA"
+
+/area/endeavour/hallway/d2porthall
+	name = "\improper Deck 2 Port Hallway"
+	icon_state = "hallP"
+
+/area/endeavour/hallway/d2starboardhall
+	name = "\improper Deck 2 Starboard Hallway"
+	icon_state = "hallS"
+
+/** Deck 1
+ */
+/area/endeavour/hallway/d1aftmaint
+	name = "\improper Deck 1 Aft Maintenance"
+	icon_state = "amaint"
+
+/area/endeavour/hallway/d1fwdmaint
+	name = "\improper Deck 1 Forward Maintenance"
+	icon_state = "fmaint"
+
+/area/endeavour/hallway/d1fwdhall
+	name = "\improper Deck 1 Forward Hallway"
+	icon_state = "hallF"
+
+/area/endeavour/hallway/d1afthall
+	name = "\improper Deck 1 Aft Hallway"
+	icon_state = "hallA"
+
+/area/endeavour/hallway/d1porthall
+	name = "\improper Deck 1 Port Hallway"
+	icon_state = "hallP"
+
+/area/endeavour/hallway/d1starboardhall
+	name = "\improper Deck 1 Starboard Hallway"
+	icon_state = "hallS"
+
+/** Command
+ */
+/area/endeavour/command/turrets
+	name = "\improper Point Defense Systems"
+	icon_state = "bridge"
+
+/** Science
+ */
+/area/rnd/robotics/morgue
+	name = "\improper Robotics Morgue"
+	icon_state = "robotics"
+
+/** Exploration
+ */
+/area/endeavour/exploration
+	name = "\improper Exploration Department"
+	icon_state = "purple"
+	holomap_color = HOLOMAP_AREACOLOR_SCIENCE
+
+/area/endeavour/exploration/hallway_fore
+	name = "\improper Exploration Fore Hallway"
+
+/area/endeavour/exploration/hallway_aft
+	name = "\improper Exploration Aft Hallway"
+
+/** Medical
+ */
+
+/area/medical/virology_fore_access
+	name = "\improper Virology Fore Access"
+	icon_state = "virology"
+
+/area/medical/virology_aft_access
+	name = "\improper Virology Aft Access"
+	icon_state = "virology"
+
+/area/medical/oncall_room
+	name = "\improper On-Call Room"
+	icon_state = "medbay"

code/game/area/victory_areas.dm

@@ -121,7 +121,7 @@
  */
 /area/victory/exploration
 	name = "\improper Exploration Department"
-	icon_state = "yellow"
+	icon_state = "purple"
 	holomap_color = HOLOMAP_AREACOLOR_SCIENCE
 
 /area/victory/exploration/hallway_fore

maps/endeavour/endeavour-areas.dm

@@ -1,184 +1,184 @@
 
-/area/victory/surfacebase
+/area/endeavour/surfacebase
 	name = "Surface Base"
 
-/area/victory/surfacebase/outside
+/area/endeavour/surfacebase/outside
 	name = "Outside - Surface"
 	sound_env = MOUNTAINS
 	is_outside = OUTSIDE_YES
 
-/area/victory/surfacebase/outside/outside1
+/area/endeavour/surfacebase/outside/outside1
 	icon_state = "outside1"
 
-/area/victory/surfacebase/outside/outside2
+/area/endeavour/surfacebase/outside/outside2
 	icon_state = "outside2"
 
-/area/victory/surfacebase/outside/outside3
+/area/endeavour/surfacebase/outside/outside3
 	icon_state = "outside3"
 
-/area/victory/surfacebase/outside/empty
+/area/endeavour/surfacebase/outside/empty
 	name = "Outside - Empty Area"
 
-/area/victory/surfacebase/outside/wilderness
+/area/endeavour/surfacebase/outside/wilderness
 	name = "Outside - Wilderness"
 	icon_state = "invi"
 
-/area/victory/surfacebase/temple
+/area/endeavour/surfacebase/temple
 	name = "Outside - Wilderness" // ToDo: Make a way to hide spoiler areas off the list of areas ghosts can jump to.
 	icon_state = "red"
-/area/victory/surfacebase/crash
+/area/endeavour/surfacebase/crash
 	name = "Outside - Wilderness" // ToDo: Make a way to hide spoiler areas off the list of areas ghosts can jump to.
 	icon_state = "yellow"
-/area/victory/surfacebase/tram
+/area/endeavour/surfacebase/tram
 	name = "\improper Tram Station"
 	icon_state = "dk_yellow"
 	area_flags = AREA_FLAG_ERODING
-/area/victory/surfacebase/atrium_one
+/area/endeavour/surfacebase/atrium_one
 	name = "\improper Atrium First Floor"
 	icon_state = "dk_yellow"
-/area/victory/surfacebase/atrium_two
+/area/endeavour/surfacebase/atrium_two
 	name = "\improper Atrium Second Floor"
 	icon_state = "dk_yellow"
-/area/victory/surfacebase/atrium_three
+/area/endeavour/surfacebase/atrium_three
 	name = "\improper Atrium Third Floor"
 	icon_state = "dk_yellow"
-/area/victory/surfacebase/north_stairs_one
+/area/endeavour/surfacebase/north_stairs_one
 	name = "\improper North Stairwell First Floor"
 	icon_state = "dk_yellow"
-/area/victory/surfacebase/north_stairs_two
+/area/endeavour/surfacebase/north_stairs_two
 	name = "\improper North Stairwell Second Floor"
 	icon_state = "dk_yellow"
-/area/victory/surfacebase/north_stairs_three
+/area/endeavour/surfacebase/north_stairs_three
 	name = "\improper North Stairwell Third Floor"
 	icon_state = "dk_yellow"
-/area/victory/surfacebase/public_garden_one
+/area/endeavour/surfacebase/public_garden_one
 	name = "\improper Public Garden First Floor"
 	icon_state = "green"
-/area/victory/surfacebase/public_garden_two
+/area/endeavour/surfacebase/public_garden_two
 	name = "\improper Public Garden Second Floor"
 	icon_state = "green"
-/area/victory/surfacebase/public_garden_three
+/area/endeavour/surfacebase/public_garden_three
 	name = "\improper Public Garden Third Floor"
 	icon_state = "green"
-/area/victory/surfacebase/public_garden
+/area/endeavour/surfacebase/public_garden
 	name = "\improper Public Garden"
 	icon_state = "purple"
-/area/victory/surfacebase/bar_backroom
+/area/endeavour/surfacebase/bar_backroom
 	name = "\improper Bar Backroom"
 	icon_state = "red"
 	sound_env = SMALL_SOFTFLOOR
-/area/victory/surfacebase/fishing_garden
+/area/endeavour/surfacebase/fishing_garden
 	name = "\improper Fish Pond"
 	icon_state = "blue"
-/area/victory/surfacebase/sauna
+/area/endeavour/surfacebase/sauna
 	name = "\improper Public Sauna"
 	icon_state = "green"
-/area/victory/surfacebase/lounge
+/area/endeavour/surfacebase/lounge
 	name = "\improper Station Lounge"
 	icon_state = "purple"
-// /area/victory/surfacebase/east_stairs_one //This is just part of a lower hallway
-/area/victory/surfacebase/east_stairs_two
+// /area/endeavour/surfacebase/east_stairs_one //This is just part of a lower hallway
+/area/endeavour/surfacebase/east_stairs_two
 	name = "\improper East Stairwell Second Floor"
 	icon_state = "dk_yellow"
-// /area/victory/surfacebase/east_stairs_three //This is just part of an upper hallway
-/area/victory/surfacebase/emergency_storage
+// /area/endeavour/surfacebase/east_stairs_three //This is just part of an upper hallway
+/area/endeavour/surfacebase/emergency_storage
 	icon_state = "emergencystorage"
-/area/victory/surfacebase/emergency_storage/panic_shelter
+/area/endeavour/surfacebase/emergency_storage/panic_shelter
 	name = "\improper Panic Shelter Emergency Storage"
-/area/victory/surfacebase/emergency_storage/rnd
+/area/endeavour/surfacebase/emergency_storage/rnd
 	name = "\improper RnD Emergency Storage"
-/area/victory/surfacebase/emergency_storage/atmos
+/area/endeavour/surfacebase/emergency_storage/atmos
 	name = "\improper Atmospherics Emergency Storage"
-/area/victory/surfacebase/emergency_storage/atrium
+/area/endeavour/surfacebase/emergency_storage/atrium
 	name = "\improper Atrium Emergency Storage"
 // Main mining area
-/area/victory/surfacebase/mining_main
+/area/endeavour/surfacebase/mining_main
 	icon_state = "outpost_mine_main"
-/area/victory/surfacebase/mining_main/airlock
+/area/endeavour/surfacebase/mining_main/airlock
 	name = "\improper Mining Airlock"
-/area/victory/surfacebase/mining_main/storage
+/area/endeavour/surfacebase/mining_main/storage
 	name = "\improper Mining Gear Storage"
-/area/victory/surfacebase/mining_main/uxstorage
+/area/endeavour/surfacebase/mining_main/uxstorage
 	name = "\improper Mining Secondary Storage"
-/area/victory/surfacebase/mining_main/ore
+/area/endeavour/surfacebase/mining_main/ore
 	name = "\improper Mining Ore Storage"
-/area/victory/surfacebase/mining_main/eva
+/area/endeavour/surfacebase/mining_main/eva
 	name = "\improper Mining EVA"
-/area/victory/surfacebase/mining_main/break_room
+/area/endeavour/surfacebase/mining_main/break_room
 	name = "\improper Mining Crew Area"
-/area/victory/surfacebase/mining_main/refinery
+/area/endeavour/surfacebase/mining_main/refinery
 	name = "\improper Mining Refinery"
-/area/victory/surfacebase/mining_main/external
+/area/endeavour/surfacebase/mining_main/external
 	name = "\improper Mining Refinery"
-/area/victory/surfacebase/mining_main/bathroom
+/area/endeavour/surfacebase/mining_main/bathroom
 	name = "\improper Mining Bathroom"
-/area/victory/surfacebase/mining_main/lobby
+/area/endeavour/surfacebase/mining_main/lobby
 	name = "\improper Mining Lobby"
 // Solars map areas
-/area/victory/outpost/solars_outside
+/area/endeavour/outpost/solars_outside
 	name = "\improper Solar Farm"
 	is_outside = OUTSIDE_YES
-/area/victory/outpost/solars_shed
+/area/endeavour/outpost/solars_shed
 	name = "\improper Solar Farm Shed"
 //Surface med
-/area/victory/surfacebase/medical
+/area/endeavour/surfacebase/medical
 	icon_state = "medical"
-/area/victory/surfacebase/medical/lobby
+/area/endeavour/surfacebase/medical/lobby
 	name = "\improper Surface Medical Lobby"
-/area/victory/surfacebase/medical/triage
+/area/endeavour/surfacebase/medical/triage
 	name = "\improper Surface Triage"
-/area/victory/surfacebase/medical/first_aid_west
+/area/endeavour/surfacebase/medical/first_aid_west
 	name = "\improper First Aid West"
 //Surface sec
-/area/victory/surfacebase/security
+/area/endeavour/surfacebase/security
 	icon_state = "security"
-/area/victory/surfacebase/security/breakroom
+/area/endeavour/surfacebase/security/breakroom
 	name = "\improper Surface Security Break Room"
-/area/victory/surfacebase/security/lobby
+/area/endeavour/surfacebase/security/lobby
 	name = "\improper Surface Security Lobby"
-/area/victory/surfacebase/security/common
+/area/endeavour/surfacebase/security/common
 	name = "\improper Surface Security Room"
-/area/victory/surfacebase/security/armory
+/area/endeavour/surfacebase/security/armory
 	name = "\improper Surface Armory"
-/area/victory/surfacebase/security/checkpoint
+/area/endeavour/surfacebase/security/checkpoint
 	name = "\improper Surface Checkpoint Office"
-/area/victory/surfacebase/security/hallway
+/area/endeavour/surfacebase/security/hallway
 	name = "\improper Surface Checkpoint Hallway"
 //Misc
-/area/victory/surfacebase/shuttle_pad
+/area/endeavour/surfacebase/shuttle_pad
 	name = "\improper Victory Shuttle Pad"
-/area/victory/surfacebase/reading_room
+/area/endeavour/surfacebase/reading_room
 	name = "\improper Reading Room"
-/area/victory/surfacebase/vacant_site
+/area/endeavour/surfacebase/vacant_site
 	name = "\improper Vacant Site"
 
-/area/victory/station/public_meeting_room
+/area/endeavour/station/public_meeting_room
 	name = "Public Meeting Room"
 	icon_state = "blue"
 	sound_env = SMALL_SOFTFLOOR
 	nightshift_level = NIGHTSHIFT_LEVEL_PUBLIC_FACILITIES
 
-/area/victory/surfacebase
+/area/endeavour/surfacebase
 	name = "Victory Debug Surface"
 
-/area/victory/transit
+/area/endeavour/transit
 	name = "Victory Debug Transit"
 	requires_power = 0
 
-/area/victory/space
+/area/endeavour/space
 	name = "Victory Debug Space"
 	requires_power = 0
 
-/area/victory/station/stairs_three
+/area/endeavour/station/stairs_three
 	name = "\improper Station Stairwell Third Floor"
 	icon_state = "dk_yellow"
 
-/area/victory/station/stairs_four
+/area/endeavour/station/stairs_four
 	name = "\improper Station Stairwell Fourth Floor"
 	icon_state = "dk_yellow"
-/area/victory/station/dock_one
+/area/endeavour/station/dock_one
 	name = "\improper Dock One"
 	icon_state = "dk_yellow"
-/area/victory/station/dock_two
+/area/endeavour/station/dock_two
 	name = "\improper Dock Two"
 	icon_state = "dk_yellow"

maps/endeavour/endeavour-overmap.dm

@@ -0,0 +1,27 @@
+/obj/overmap/entity/visitable/ship/endeavour
+	name = "NSV Endeavour"	// Name of the location on the overmap.
+	desc = "The Endeavour is one of the many ships that is a part of the NCV Oracle's fleet in this sector"
+
+	scanner_desc = @{"[i]Registration[/i]: NSV Endeavour
+[i]Class[/i]: Science Vessel
+[i]Transponder[/i]: Transmitting (CIV), Nanotrasen IFF
+[b]Notice[/b]: Nanotrasen Vessel, authorized personnel only"}
+
+	icon_state = "ship"
+	vessel_mass = 18500 // temporarily buffed by 3x due to vorestation fucking up large gas thruster code
+	burn_delay = 2 SECONDS
+	fore_dir = EAST	// Which direction the ship/z-level is facing.  It will move dust particles from that direction when moving.
+	base = TRUE		// Honestly unsure what this does but it seems the main sector or "Map" we're at has this so here it stays
+	// The waypoints that are avaliable once you are at this Navpoint
+	initial_generic_waypoints = list("nav_capitalship_docking2", "endeavour_excursion_hangar", "endeavour_space_SW", "endeavour_mining_port")
+
+	initial_restricted_waypoints = list(
+		"Excursion Shuttle" = list("endeavour_excursion_hangar"),
+		"Courser Scouting Vessel" = list("endeavour_courser_hangar"),
+		"Hammerhead Patrol Barge" = list("endeavour_hammerhead_hangar"),
+		"Civilian Transport" = list("endeavour_civvie_home"),
+		"Dart EMT Shuttle" = list("endeavour_emt_dock"),
+		"Beruang Trade Ship" = list("endeavour_annex_dock"),
+		"Mining Shuttle" = list("endeavour_mining_port"),
+		"NDV Quicksilver" = list("endeavour_specops_dock")
+		)

maps/endeavour/endeavour-sectors.dm

@@ -0,0 +1,14 @@
+
+/obj/overmap/entity/visitable/sector/centcom_endeavour
+	name = "NDV Oracle"
+	desc = "The NDV Oracle is a Nanotrasen Fleet Support Ship that serves as the flagship for the eponymous Oracle Fleet."
+	scanner_desc = @{"[i]Information[/i]: The NCV Oracle is a Nanotrasen Fleet Support Ship that serves as the flagship for the eponymous Oracle Fleet."}
+	in_space = 1
+	known = TRUE
+	icon = 'icons/modules/overmap/tiled.dmi'
+	icon_state = "fleet"
+	color = "#007396"
+
+	initial_restricted_waypoints = list(
+		"NDV Quicksilver" = list("specops_hangar")
+		)

maps/endeavour/endeavour-shuttle-landmarks.dm

@@ -0,0 +1,154 @@
+/*
+Preset landmarks from Endeavour. Still in use for a few maps. At some point need to remap these but
+right now its not a big priority - Bloop 2022
+
+ */
+
+// Shared landmark for docking at the station
+
+/obj/effect/shuttle_landmark/automatic/station_dockpoint1
+	name = "Station Docking Point 1"
+	landmark_tag = "nav_station_docking1"
+	docking_controller = "deck4_dockarm1"
+	base_turf = /turf/space
+	base_area = /area/space
+
+/obj/effect/shuttle_landmark/automatic/station_dockpoint2
+	name = "NSV Endeavour - Docking Arm 2"
+	landmark_tag = "nav_capitalship_docking2"
+	docking_controller = "deck4_dockarm2"
+	base_turf = /turf/space
+	base_area = /area/space
+
+
+// Exclusive landmark for docking at the station
+
+/obj/effect/shuttle_landmark/endeavour/deck4/specops
+	name = "NSV Endeavour - Special Operations Dock"
+	landmark_tag = "endeavour_specops_dock"
+	docking_controller = "endeavour_specops_dock"
+	base_turf = /turf/space
+	base_area = /area/space
+
+/obj/effect/shuttle_landmark/endeavour/deck2/trade
+	name = "NSV Endeavour Annex Dock"
+	landmark_tag = "endeavour_annex_dock"
+	docking_controller = "endeavour_annex_dock"
+	base_turf = /turf/space
+	base_area = /area/space
+
+// Shared landmark for docking *inside* the station
+
+
+// Exclusive landmark for docking *inside* the station
+
+/obj/effect/shuttle_landmark/endeavour/deck4/excursion
+	name = "NSV Endeavour - Excursion Hangar"
+	landmark_tag = "endeavour_excursion_hangar"
+	docking_controller = "expshuttle_dock"
+	base_turf = /turf/simulated/floor/tiled/techfloor/grid
+	base_area = /area/exploration/excursion_dock
+
+/obj/effect/shuttle_landmark/endeavour/deck4/courser
+	name = "NSV Endeavour - Courser Hangar"
+	landmark_tag = "endeavour_courser_hangar"
+	docking_controller = "courser_dock"
+	base_turf = /turf/simulated/floor/tiled/techfloor/grid
+	base_area = /area/exploration/courser_dock
+
+/obj/effect/shuttle_landmark/endeavour/deck3/emt
+	name = "NSV Endeavour - EMT Shuttle Dock"
+	landmark_tag = "endeavour_emt_dock"
+	docking_controller = "emt_shuttle_dock"
+	base_turf = /turf/simulated/floor/tiled/techfloor/grid
+	base_area = /area/hallway/station/docks
+
+/obj/effect/shuttle_landmark/endeavour/deck2/mining
+	name = "NSV Endeavour Mining Dock"
+	landmark_tag = "endeavour_mining_port"
+	base_turf = /turf/simulated/floor/tiled/techfloor/grid
+	base_area = /area/quartermaster/miningdock
+
+/obj/effect/shuttle_landmark/endeavour/deck4/civvie
+	name = "NSV Endeavour - Civilian Transport Dock"
+	landmark_tag = "endeavour_civvie_home"
+	docking_controller = "civvie_dock"
+	base_turf = /turf/simulated/floor/tiled/techfloor/grid
+	base_area = /area/hallway/secondary/docking_hallway
+
+// ON STATION NAV POINTS
+
+/obj/effect/shuttle_landmark/endeavour/deck4/excursion_space
+	name = "Near NSV Endeavour (SW)"
+	landmark_tag = "endeavour_space_SW"
+	base_turf = /turf/space
+	base_area = /area/space
+
+/obj/effect/shuttle_landmark/endeavour/deck3/port
+	name = "Near NSV Endeavour (Port Deck 3)"
+	landmark_tag = "endeavour_space_port_3"
+	base_turf = /turf/space
+	base_area = /area/space
+
+/obj/effect/shuttle_landmark/endeavour/deck3/starboard
+	name = "Near NSV Endeavour (Starboard Deck 3)"
+	landmark_tag = "endeavour_space_starboard_3"
+	base_turf = /turf/space
+	base_area = /area/space
+
+/obj/effect/shuttle_landmark/endeavour/deck2/port
+	name = "Near NSV Endeavour (Port Deck 2)"
+	landmark_tag = "endeavour_space_port_2"
+	base_turf = /turf/space
+	base_area = /area/space
+
+/obj/effect/shuttle_landmark/endeavour/deck2/starboard
+	name = "Near NSV Endeavour (Starboard Deck 2)"
+	landmark_tag = "endeavour_space_starboard_2"
+	base_turf = /turf/space
+	base_area = /area/space
+
+/obj/effect/shuttle_landmark/endeavour/deck1/port
+	name = "Near NSV Endeavour (Port Deck 1)"
+	landmark_tag = "endeavour_space_port_1"
+	base_turf = /turf/space
+	base_area = /area/space
+
+/obj/effect/shuttle_landmark/endeavour/deck1/starboard
+	name = "Near NSV Endeavour (Starboard Deck 1)"
+	landmark_tag = "endeavour_space_starboard_1"
+	base_turf = /turf/space
+	base_area = /area/space
+
+// OFF-STATION NAV POINTS
+
+
+// TRANSIT NAV POINTS
+
+/obj/effect/shuttle_landmark/transit/endeavour/excursion
+	name = "In transit"
+	landmark_tag = "nav_transit_exploration"
+
+/obj/effect/shuttle_landmark/transit/endeavour/courser
+	name = "In transit"
+	landmark_tag = "nav_transit_courser"
+
+/obj/effect/shuttle_landmark/transit/endeavour/pirate
+	name = "In transit"
+	landmark_tag = "nav_transit_pirate"
+
+/obj/effect/shuttle_landmark/transit/endeavour/civvie
+	name = "In transit"
+	landmark_tag = "nav_transit_civvie"
+
+/obj/effect/shuttle_landmark/transit/endeavour/mining
+	name = "In transit"
+	landmark_tag = "nav_transit_mining"
+
+/obj/effect/shuttle_landmark/transit/endeavour/trade
+	name = "In transit"
+	landmark_tag = "nav_transit_trade"
+
+/obj/effect/shuttle_landmark/transit/endeavour/emt
+	name = "In transit"
+	landmark_tag = "nav_transit_emt"

maps/endeavour/endeavour-turbolifts.dm

@@ -1,6 +1,6 @@
 
-/obj/turbolift_map_holder/victory
-	name = "Victory Climber"
+/obj/turbolift_map_holder/endeavour
+	name = "Endeavour Climber"
 	depth = 4
 	lift_size_x = 3
 	lift_size_y = 1

maps/endeavour/endeavour.dm

@@ -1,14 +1,14 @@
-/datum/map/station/victory
-	id = "victory"
-	name = "World - Victory"
+/datum/map/station/endeavour
+	id = "endeavour"
+	name = "World - Endeavour"
 	levels = list(
-		/datum/map_level/victory/ship/deck_four,
-		/datum/map_level/victory/ship/deck_three,
-		/datum/map_level/victory/ship/deck_two,
-		/datum/map_level/victory/ship/deck_one,
-		/datum/map_level/victory/misc,
-		/datum/map_level/victory/transit,
-		/datum/map_level/victory/flagship,
+		/datum/map_level/endeavour/ship/deck_four,
+		/datum/map_level/endeavour/ship/deck_three,
+		/datum/map_level/endeavour/ship/deck_two,
+		/datum/map_level/endeavour/ship/deck_one,
+		/datum/map_level/endeavour/misc,
+		/datum/map_level/endeavour/transit,
+		/datum/map_level/endeavour/flagship,
 	)
 	width = 192
 	height = 192
@@ -33,40 +33,40 @@
 	//* LEGACY BELOW *//
 
 	legacy_assert_shuttle_datums = list(
-		/datum/shuttle/autodock/overmap/excursion/victory,
-		/datum/shuttle/autodock/ferry/emergency/escape/victory,
-		/datum/shuttle/autodock/ferry/supply/cargo/victory,
-		/datum/shuttle/autodock/overmap/emt/victory,
-		/datum/shuttle/autodock/overmap/mining/victory,
-		/datum/shuttle/autodock/overmap/civvie/victory,
-		/datum/shuttle/autodock/overmap/courser/victory,
+		/datum/shuttle/autodock/overmap/excursion/endeavour,
+		/datum/shuttle/autodock/ferry/emergency/escape/endeavour,
+		/datum/shuttle/autodock/ferry/supply/cargo/endeavour,
+		/datum/shuttle/autodock/overmap/emt/endeavour,
+		/datum/shuttle/autodock/overmap/mining/endeavour,
+		/datum/shuttle/autodock/overmap/civvie/endeavour,
+		/datum/shuttle/autodock/overmap/courser/endeavour,
 		/datum/shuttle/autodock/ferry/belter,
 	)
 
-	full_name = "NSV Victory"
+	full_name = "NSV Endeavour"
 
 	use_overmap = TRUE
 	overmap_size = 60
 	overmap_event_areas = 50
-	usable_email_tlds = list("victory.nt")
+	usable_email_tlds = list("endeavour.nt")
 
-	station_name	= "NSV Victory"
-	station_short	= "Victory"
-	dock_name		= "NDV Marksman"
+	station_name	= "NSV Endeavour"
+	station_short	= "Endeavour"
+	dock_name		= "NCV Oracle"
 	dock_type		= "space"
 	boss_name		= "Central Command"
 	boss_short		= "CentCom"
 	company_name	= "Nanotrasen"
 	company_short	= "NT"
-	starsys_name	= "Sigmar Concord"
+	starsys_name	= "Lythios-43"
 
-	shuttle_docked_message = "This is the %dock_name% calling to the NSV Victory. The scheduled crew transfer shuttle has docked with the NSV Victory. Departing crew should board the shuttle within %ETD%."
+	shuttle_docked_message = "This is the %dock_name% calling to the NSV Endeavour. The scheduled NCS Herrera II shuttle flight has docked with the NSV Endeavour. Departing crew should board the shuttle within %ETD%."
 	shuttle_leaving_dock = "The transfer shuttle has left the ship. Estimate %ETA% until the shuttle arrives at the %dock_name%."
-	shuttle_called_message = "This is the %dock_name% calling to the NSV Victory. A scheduled crew transfer to the %dock_name% is commencing. Those departing should proceed to the shuttle bay within %ETA%."
+	shuttle_called_message = "This is the %dock_name% calling to the NSV Endeavour. A scheduled crew transfer to the %dock_name% is commencing. Those departing should proceed to the shuttle bay within %ETA%."
 	shuttle_recall_message = "The scheduled crew transfer has been cancelled."
-	shuttle_name = "Crew Hands Transfer"
+	shuttle_name = "NCS Herrera II"
 	emergency_shuttle_docked_message = "The evacuation shuttle has arrived at the ship. You have approximately %ETD% to board the shuttle."
-	emergency_shuttle_leaving_dock = "The emergency shuttle has left the station. Estimate %ETA% until the shuttle arrives at %dock_name%."
+	emergency_shuttle_leaving_dock = "The emergency shuttle has left the ship. Estimate %ETA% until the shuttle arrives at %dock_name%."
 	emergency_shuttle_called_message = "An emergency evacuation has begun, and an off-schedule shuttle has been called. It will arrive at the hanger bay in approximately %ETA%."
 	emergency_shuttle_recall_message = "The evacuation shuttle has been recalled."
 
@@ -87,7 +87,7 @@
 							NETWORK_ROBOTS,
 							NETWORK_SECURITY,
 							NETWORK_TCOMMS,
-							"Victory",
+							"Endeavour",
 							)
 	secondary_networks = list(
 							NETWORK_ERT,
@@ -120,103 +120,103 @@
 		/area/solar/)
 
 // For making the 4-in-1 holomap, we calculate some offsets
-/// Width and height of compiled in victory z levels.
-#define VICTORY_MAP_SIZE 192
+/// Width and height of compiled in endeavour z levels.
+#define ENDEAVOUR_MAP_SIZE 192
 /// 40px central gutter between columns
-#define VICTORY_HOLOMAP_CENTER_GUTTER 20
+#define ENDEAVOUR_HOLOMAP_CENTER_GUTTER 20
 /// 100
-#define VICTORY_HOLOMAP_MARGIN_X ((HOLOMAP_ICON_SIZE - (2*VICTORY_MAP_SIZE) - VICTORY_HOLOMAP_CENTER_GUTTER) / 2)
+#define ENDEAVOUR_HOLOMAP_MARGIN_X ((HOLOMAP_ICON_SIZE - (2*ENDEAVOUR_MAP_SIZE) - ENDEAVOUR_HOLOMAP_CENTER_GUTTER) / 2)
 /// 60
-#define VICTORY_HOLOMAP_MARGIN_Y ((HOLOMAP_ICON_SIZE - (3*VICTORY_MAP_SIZE)) / 2)
+#define ENDEAVOUR_HOLOMAP_MARGIN_Y ((HOLOMAP_ICON_SIZE - (3*ENDEAVOUR_MAP_SIZE)) / 2)
 // We have a bunch of stuff common to the station z levels
 
-/datum/map_level/victory/ship
+/datum/map_level/endeavour/ship
 	flags = LEGACY_LEVEL_STATION|LEGACY_LEVEL_CONTACT|LEGACY_LEVEL_PLAYER|LEGACY_LEVEL_CONSOLES
 	persistence_allowed = TRUE
 
-/datum/map_level/victory/ship/deck_one
-	id = "VictoryDeck1"
-	name = "Victory - Deck 1"
-	display_id = "victory-deck-1"
-	display_name = "NSV Victory - Engineering Deck"
-	absolute_path = "maps/victory/levels/deck1.dmm"
+/datum/map_level/endeavour/ship/deck_one
+	id = "EndeavourDeck1"
+	name = "Endeavour - Deck 1"
+	display_id = "endeavour-deck-1"
+	display_name = "NSV Endeavour - Command Deck"
+	absolute_path = "maps/endeavour/levels/deck1.dmm"
 	traits = list(
 		ZTRAIT_STATION,
 		ZTRAIT_FACILITY_SAFETY,
 	)
 	base_turf = /turf/space
-	link_below = /datum/map_level/victory/ship/deck_two
+	link_below = /datum/map_level/endeavour/ship/deck_two
 	flags = LEGACY_LEVEL_STATION|LEGACY_LEVEL_CONTACT|LEGACY_LEVEL_PLAYER|LEGACY_LEVEL_CONSOLES
 
-/datum/map_level/victory/ship/deck_two
-	id = "VictoryDeck2"
-	name = "Victory - Deck 2"
-	display_id = "victory-deck-2"
-	display_name = "NSV Victory - Service Deck"
-	absolute_path = "maps/victory/levels/deck2.dmm"
+/datum/map_level/endeavour/ship/deck_two
+	id = "EndeavourDeck2"
+	name = "Endeavour - Deck 2"
+	display_id = "endeavour-deck-2"
+	display_name = "NSV Endeavour - MedSci Deck"
+	absolute_path = "maps/endeavour/levels/deck2.dmm"
 	traits = list(
 		ZTRAIT_STATION,
 		ZTRAIT_FACILITY_SAFETY,
 		ZTRAIT_LEGACY_BELTER_DOCK,
 	)
 	base_turf = /turf/simulated/open
-	link_below = /datum/map_level/victory/ship/deck_three
-	link_above = /datum/map_level/victory/ship/deck_one
+	link_below = /datum/map_level/endeavour/ship/deck_three
+	link_above = /datum/map_level/endeavour/ship/deck_one
 	flags = LEGACY_LEVEL_STATION|LEGACY_LEVEL_CONTACT|LEGACY_LEVEL_PLAYER|LEGACY_LEVEL_CONSOLES
 
-/datum/map_level/victory/ship/deck_three
-	id = "VictoryDeck3"
-	name = "Victory - Deck 3"
-	display_id = "victory-deck-3"
-	display_name = "NSV Victory - Operations Deck"
-	absolute_path = "maps/victory/levels/deck3.dmm"
+/datum/map_level/endeavour/ship/deck_three
+	id = "EndeavourDeck3"
+	name = "Endeavour - Deck 3"
+	display_id = "endeavour-deck-3"
+	display_name = "NSV Endeavour - Service & Security Deck"
+	absolute_path = "maps/endeavour/levels/deck3.dmm"
 	traits = list(
 		ZTRAIT_STATION,
 		ZTRAIT_FACILITY_SAFETY,
 	)
 	base_turf = /turf/simulated/open
-	link_below = /datum/map_level/victory/ship/deck_four
-	link_above = /datum/map_level/victory/ship/deck_two
+	link_below = /datum/map_level/endeavour/ship/deck_four
+	link_above = /datum/map_level/endeavour/ship/deck_two
 	flags = LEGACY_LEVEL_STATION|LEGACY_LEVEL_CONTACT|LEGACY_LEVEL_PLAYER|LEGACY_LEVEL_CONSOLES
 
-/datum/map_level/victory/ship/deck_four
-	id = "VictoryDeck4"
-	name = "Victory - Deck 4"
-	display_id = "victory-deck-4"
-	display_name = "NSV Victory - Command Deck"
-	absolute_path = "maps/victory/levels/deck4.dmm"
+/datum/map_level/endeavour/ship/deck_four
+	id = "EndeavourDeck4"
+	name = "Endeavour - Deck 4"
+	display_id = "endeavour-deck-4"
+	display_name = "NSV Endeavour - Engineering Deck"
+	absolute_path = "maps/endeavour/levels/deck4.dmm"
 	traits = list(
 		ZTRAIT_STATION,
 		ZTRAIT_FACILITY_SAFETY,
 	)
 	base_turf = /turf/simulated/open
-	link_above = /datum/map_level/victory/ship/deck_three
+	link_above = /datum/map_level/endeavour/ship/deck_three
 	flags = LEGACY_LEVEL_STATION|LEGACY_LEVEL_CONTACT|LEGACY_LEVEL_PLAYER|LEGACY_LEVEL_CONSOLES
 
-/datum/map_level/victory/flagship
-	id = "VictoryFlagship"
-	name = "Victory - Centcom / Flagship"
-	display_id = "victory-flagship"
-	display_name = "NSV Victory - Flagship Offboarding"
-	absolute_path = "maps/victory/levels/flagship.dmm"
+/datum/map_level/endeavour/flagship
+	id = "EndeavourFlagship"
+	name = "Endeavour - Centcom / Flagship"
+	display_id = "endeavour-flagship"
+	display_name = "NSV Endeavour - Flagship Offboarding"
+	absolute_path = "maps/endeavour/levels/flagship.dmm"
 	flags = LEGACY_LEVEL_ADMIN|LEGACY_LEVEL_CONTACT
 
-/datum/map_level/victory/transit
-	id = "VictoryTransit"
-	name = "Victory - Ships / Static Transit"
-	absolute_path = "maps/victory/levels/transit.dmm"
+/datum/map_level/endeavour/transit
+	id = "EndeavourTransit"
+	name = "Endeavour - Ships / Static Transit"
+	absolute_path = "maps/endeavour/levels/transit.dmm"
 	traits = list(
 		ZTRAIT_LEGACY_BELTER_TRANSIT,
 	)
 	flags = LEGACY_LEVEL_ADMIN
 
-/datum/map_level/victory/misc
-	id = "VictoryMisc"
-	name = "Victory - Misc"
-	absolute_path = "maps/victory/levels/misc.dmm"
+/datum/map_level/endeavour/misc
+	id = "EndeavourMisc"
+	name = "Endeavour - Misc"
+	absolute_path = "maps/endeavour/levels/misc.dmm"
 	flags = LEGACY_LEVEL_ADMIN
 
-#undef VICTORY_MAP_SIZE
-#undef VICTORY_HOLOMAP_CENTER_GUTTER
-#undef VICTORY_HOLOMAP_MARGIN_X
-#undef VICTORY_HOLOMAP_MARGIN_Y
+#undef ENDEAVOUR_MAP_SIZE
+#undef ENDEAVOUR_HOLOMAP_CENTER_GUTTER
+#undef ENDEAVOUR_HOLOMAP_MARGIN_X
+#undef ENDEAVOUR_HOLOMAP_MARGIN_Y

maps/endeavour/engines.dm

@@ -1,29 +1,29 @@
-/datum/map_template/engine/victory
-	abstract_type = /datum/map_template/engine/victory
-	prefix = "maps/victory/engines/"
-	for_map = /datum/map/station/victory
+/datum/map_template/engine/endeavour
+	abstract_type = /datum/map_template/engine/endeavour
+	prefix = "maps/endeavour/engines/"
+	for_map = /datum/map/station/endeavour
 
-/datum/map_template/engine/victory/rust
-	name = "ProcEngine_Victory_RUST"
+/datum/map_template/engine/endeavour/rust
+	name = "ProcEngine_Endeavour_RUST"
 	desc = "R-UST Fusion Tokamak Engine"
 	suffix = "rust.dmm"
 	display_name = list("Budget Star", "Bane of Synthetics", "Glowy Field", "Funny Spinny EM Field", "Protean Rarity Enforcement")
 /*
-/datum/map_template/engine/victory/supermatter
-	name = "ProcEngine_Victory_SME"
+/datum/map_template/engine/endeavour/supermatter
+	name = "ProcEngine_Endeavour_SME"
 	desc = "Old Faithful Supermatter"
 	suffix = "sme.dmm"
 	display_name = list("Angry Rock", "The Forbidden Rock Candy", "Death Crystal", "Spicy Crystal")
 
-/datum/map_template/engine/victory/burnchamber
-	name = "ProcEngine_Victory_Burn"
+/datum/map_template/engine/endeavour/burnchamber
+	name = "ProcEngine_endeavour_Burn"
 	desc = "Burn Chamber Engine"
 	suffix = "burn.dmm"
 	display_name = list("Toxins Lab", "We Knew You Liked Tether Fires, so we Brought One in a Box", "100 Solarmoths", "Teshari's Bane")
 */
 /*
-/datum/map_template/engine/victory/fission
-	name = "ProcEngine_Victory_Fission"
+/datum/map_template/engine/endeavour/fission
+	name = "ProcEngine_Endeavour_Fission"
 	desc = "The Fission Reactor"
 	suffix = "fission.dmm"
 	display_name = list("Chernobyl", "Not as Cool as the Stormdrive", "Radiation Rework", "Spicy Sticks")

maps/endeavour/engines/rust.dmm

@@ -439,6 +439,20 @@
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/engineering/engine_room)
+"iy" = (
+/obj/machinery/door/airlock/hatch{
+	req_one_access = null
+	},
+/obj/map_helper/access_helper/airlock/station/engineering/department,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/engineering/engine_room)
 "iE" = (
 /obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks,
 /turf/simulated/floor,
@@ -1082,15 +1096,9 @@
 /obj/machinery/door/airlock/hatch{
 	req_one_access = null
 	},
-/obj/machinery/door/firedoor,
 /obj/map_helper/access_helper/airlock/station/engineering/department,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
+/obj/machinery/door/firedoor,
+/turf/space/basic,
 /area/engineering/engine_room)
 "Mh" = (
 /obj/structure/window/phoronreinforced/full{
@@ -1743,9 +1751,9 @@ PP
 jf
 jf
 jf
-LT
-cx
 jf
+iy
+LT
 jf
 "}
 (17,1,1) = {"

maps/endeavour/levels/flagship.dmm

@@ -1168,7 +1168,7 @@
 /turf/simulated/shuttle/floor,
 /area/shuttle/escape)
 "dy" = (
-/obj/overmap/entity/visitable/sector/centcom_victory,
+/obj/overmap/entity/visitable/sector/centcom_endeavour,
 /turf/space,
 /area/space)
 "dz" = (

maps/endeavour/levels/transit.dmm

@@ -1,6 +1,6 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "aA" = (
-/obj/effect/shuttle_landmark/transit/victory/civvie,
+/obj/effect/shuttle_landmark/transit/endeavour/civvie,
 /turf/space,
 /area/space)
 "aZ" = (
@@ -107,7 +107,7 @@
 /turf/simulated/floor/holofloor/tiled,
 /area/houseboat/holodeck/basketball)
 "lP" = (
-/obj/effect/shuttle_landmark/transit/victory/excursion,
+/obj/effect/shuttle_landmark/transit/endeavour/excursion,
 /turf/space/transit/east,
 /area/space)
 "mb" = (
@@ -116,7 +116,7 @@
 	},
 /area/space)
 "me" = (
-/obj/effect/shuttle_landmark/transit/victory/courser,
+/obj/effect/shuttle_landmark/transit/endeavour/courser,
 /turf/space/transit/east,
 /area/space)
 "mh" = (
@@ -171,7 +171,7 @@
 	},
 /area/houseboat/holodeck/beach)
 "qN" = (
-/obj/effect/shuttle_landmark/transit/victory/emt,
+/obj/effect/shuttle_landmark/transit/endeavour/emt,
 /turf/space/transit/east,
 /area/space)
 "qR" = (
@@ -267,7 +267,7 @@
 /turf/simulated/floor/holofloor/beach/sand,
 /area/houseboat/holodeck/beach)
 "AW" = (
-/obj/effect/shuttle_landmark/transit/victory/trade,
+/obj/effect/shuttle_landmark/transit/endeavour/trade,
 /turf/space/transit/east,
 /area/space)
 "CQ" = (
@@ -425,7 +425,7 @@
 /turf/simulated/floor/holofloor/tiled,
 /area/houseboat/holodeck/basketball)
 "Pk" = (
-/obj/effect/shuttle_landmark/transit/victory/pirate,
+/obj/effect/shuttle_landmark/transit/endeavour/pirate,
 /turf/space,
 /area/space)
 "PT" = (
@@ -436,7 +436,7 @@
 /turf/space/transit/west,
 /area/space)
 "Si" = (
-/obj/effect/shuttle_landmark/transit/victory/mining,
+/obj/effect/shuttle_landmark/transit/endeavour/mining,
 /turf/space/transit/east,
 /area/space)
 "US" = (

maps/endeavour/sectors.dm

@@ -1,10 +1,10 @@
 //////////////////////////////////////////////////////////////////////////
-// There is literally a dm file for victory shuttles, why are these here//
+// There is literally a dm file for endeavour shuttles, why are these here//
 //////////////////////////////////////////////////////////////////////////
 // EXCURSION SHUTTLE DATA
-/obj/overmap/entity/visitable/ship/landable/excursion/victory
+/obj/overmap/entity/visitable/ship/landable/excursion/endeavour
 	name = "Excursion Shuttle"
-	desc = "A modified Excursion shuttle thats seen in use of the Marksman fleet of Nanotrasen."
+	desc = "A modified Excursion shuttle thats seen in use of the Oracle fleet of Nanotrasen."
 	color = "#72388d" //Purple
 	fore_dir = WEST
 	vessel_mass = 10000
@@ -12,7 +12,7 @@
 	shuttle = "Excursion Shuttle"
 
 //Courser Shuttle Data
-/obj/overmap/entity/visitable/ship/landable/courser/victory
+/obj/overmap/entity/visitable/ship/landable/courser/endeavour
 	name = "Courser Scouting Vessel"
 	desc = "Where there's a cannon, there's a way."
 	color = "#af3e97" //Pinkish Purple
@@ -23,7 +23,7 @@
 
 // Public Civilian Shuttle
 
-/obj/overmap/entity/visitable/ship/landable/civvie/victory
+/obj/overmap/entity/visitable/ship/landable/civvie/endeavour
 	name = "Civilian Transport"
 	desc = "A basic, but slow, transport to ferry civilian to and from the ship."
 	fore_dir = EAST
@@ -35,7 +35,7 @@
 
 // Mining Shuttle
 
-/obj/overmap/entity/visitable/ship/landable/mining/victory
+/obj/overmap/entity/visitable/ship/landable/mining/endeavour
 	name = "Mining Shuttle"
 	desc = "It ain't much, but it's honest work."
 	color = "#ba7d4b" //Tan
@@ -46,7 +46,7 @@
 
 //EMT Shuttle
 
-/obj/overmap/entity/visitable/ship/landable/emt/victory
+/obj/overmap/entity/visitable/ship/landable/emt/endeavour
 	name = "Dart EMT Shuttle"
 	desc = "The budget didn't allow for flashing lights."
 	color = "#00a5f2" //Light Blue

maps/endeavour/shuttles.dm

@@ -1,10 +1,10 @@
 ////////////////////////////////////////
-// Victory custom shuttle implemnetations
+// Endeavour custom shuttle implemnetations
 ////////////////////////////////////////
 
-/obj/machinery/computer/shuttle_control/victory_backup
-	name = "victory backup shuttle control console"
-	shuttle_tag = "Victory Backup"
+/obj/machinery/computer/shuttle_control/endeavour_backup
+	name = "endeavour backup shuttle control console"
+	shuttle_tag = "Endeavour Backup"
 	req_one_access = list(ACCESS_COMMAND_BRIDGE,ACCESS_GENERAL_PILOT)
 
 /obj/machinery/computer/shuttle_control/multi/mercenary
@@ -34,17 +34,17 @@
 
 // EXCURSION SHUTTLE DATA
 
-/datum/shuttle/autodock/overmap/excursion/victory
+/datum/shuttle/autodock/overmap/excursion/endeavour
 	name = "Excursion Shuttle"
 	warmup_time = 0
-	shuttle_area = list(/area/shuttle/excursion/victory)
+	shuttle_area = list(/area/shuttle/excursion/endeavour)
 	shuttle_area = list(/area/shuttle/excursion/cockpit, /area/shuttle/excursion/general, /area/shuttle/excursion/cargo)
-	current_location = "victory_excursion_hangar"
+	current_location = "endeavour_excursion_hangar"
 	docking_controller_tag = "expshuttle_docker"
 	landmark_transition = "nav_transit_exploration"
 	move_time = 20
 
-/area/shuttle/excursion/victory
+/area/shuttle/excursion/endeavour
 	name = "Excursion Shuttle"
 	icon_state = "shuttle"
 
@@ -55,12 +55,12 @@
 
 // COURSER SHUTTLE DATA
 
-/datum/shuttle/autodock/overmap/courser/victory
+/datum/shuttle/autodock/overmap/courser/endeavour
 	name = "Courser Scouting Vessel"
 	warmup_time = 0
 	shuttle_area = list(/area/shuttle/courser/cockpit, /area/shuttle/courser/general, /area/shuttle/courser/battery)
 	//shuttle_area = list(/area/shuttle/excursion/cockpit, /area/shuttle/excursion/general, /area/shuttle/excursion/cargo)
-	current_location = "victory_courser_hangar"
+	current_location = "endeavour_courser_hangar"
 	docking_controller_tag = "courser_docker"
 	landmark_transition = "nav_transit_courser"
 	move_time = 15
@@ -76,11 +76,11 @@
 
 // Public Civilian Shuttle
 
-/datum/shuttle/autodock/overmap/civvie/victory
+/datum/shuttle/autodock/overmap/civvie/endeavour
 	name = "Civilian Transport"
 	warmup_time = 10
 	shuttle_area = list(/area/shuttle/civvie/cockpit, /area/shuttle/civvie/general)
-	current_location = "victory_civvie_home"
+	current_location = "endeavour_civvie_home"
 	docking_controller_tag = "civvie_docker"
 	landmark_transition = "nav_transit_civvie"
 	fuel_consumption = 10
@@ -97,11 +97,11 @@
 
 // Mining Shuttle
 
-/datum/shuttle/autodock/overmap/mining/victory
+/datum/shuttle/autodock/overmap/mining/endeavour
 	name = "Mining Shuttle"
 	warmup_time = 10
 	shuttle_area = list(/area/shuttle/mining_ship/general)
-	current_location = "victory_mining_port"
+	current_location = "endeavour_mining_port"
 	docking_controller_tag = "mining_docker"
 	landmark_transition = "nav_transit_mining"
 	move_time = 30
@@ -115,11 +115,11 @@
 	shuttle_tag = "Mining Shuttle"
 
 //EMT Shuttle
-/datum/shuttle/autodock/overmap/emt/victory
+/datum/shuttle/autodock/overmap/emt/endeavour
 	name = "Dart EMT Shuttle"
 	warmup_time = 5
 	shuttle_area = list(/area/shuttle/emt/general, /area/shuttle/emt/cockpit)
-	current_location = "victory_emt_dock"
+	current_location = "endeavour_emt_dock"
 	docking_controller_tag = "emt_shuttle_docker"
 	landmark_transition = "nav_transit_emt"
 	move_time = 20
@@ -134,18 +134,18 @@
 
 //////////////////////////////////////////////////////////////
 // Escape shuttle and pods
-/datum/shuttle/autodock/ferry/emergency/escape/victory
+/datum/shuttle/autodock/ferry/emergency/escape/endeavour
 	name = "Escape"
 	location = FERRY_LOCATION_OFFSITE
 	shuttle_area = /area/shuttle/escape
 	warmup_time = 10
 	landmark_offsite = "escape_cc"
-	landmark_station = "escape_victory"
+	landmark_station = "escape_endeavour"
 	landmark_transition = "escape_transit"
 	move_time = SHUTTLE_TRANSIT_DURATION_RETURN
 
 // Supply shuttle
-/datum/shuttle/autodock/ferry/supply/cargo/victory
+/datum/shuttle/autodock/ferry/supply/cargo/endeavour
 	name = "Supply"
 	location = FERRY_LOCATION_OFFSITE
 	shuttle_area = /area/shuttle/supply

maps/endeavour/telecomms.dm

@@ -1,29 +1,29 @@
-/obj/machinery/telecomms/relay/preset/victory/deck_one
+/obj/machinery/telecomms/relay/preset/endeavour/deck_one
 	id = "Deck Relay 1"
 	autolinkers = list("tb1_relay")
 
-/obj/machinery/telecomms/relay/preset/centcom/victory/deck_one
+/obj/machinery/telecomms/relay/preset/centcom/endeavour/deck_one
 
-/obj/machinery/telecomms/relay/preset/victory/deck_two
+/obj/machinery/telecomms/relay/preset/endeavour/deck_two
 	id = "Deck Relay 2"
 	autolinkers = list("tb2_relay")
 
-/obj/machinery/telecomms/relay/preset/centcom/victory/deck_two
+/obj/machinery/telecomms/relay/preset/centcom/endeavour/deck_two
 
-/obj/machinery/telecomms/relay/preset/victory/deck_three
+/obj/machinery/telecomms/relay/preset/endeavour/deck_three
 	id = "Deck Relay 3"
 	autolinkers = list("tb3_relay")
 
-/obj/machinery/telecomms/relay/preset/centcom/victory/deck_three
+/obj/machinery/telecomms/relay/preset/centcom/endeavour/deck_three
 
-/obj/machinery/telecomms/relay/preset/victory/deck_four
+/obj/machinery/telecomms/relay/preset/endeavour/deck_four
 	id = "Deck Relay 4"
 	autolinkers = list("tb4_relay")
 
-/obj/machinery/telecomms/relay/preset/centcom/victory/deck_four
+/obj/machinery/telecomms/relay/preset/centcom/endeavour/deck_four
 
 // #### Hub ####
-/obj/machinery/telecomms/hub/preset/victory
+/obj/machinery/telecomms/hub/preset/endeavour
 	id = "Hub"
 	network = "tcommsat"
 	autolinkers = list("hub",
@@ -32,26 +32,26 @@
 		"hb_relay", "receiverA", "broadcasterA"
 	)
 
-/obj/machinery/telecomms/receiver/preset_right/victory
-//	id = "victory_rx"
+/obj/machinery/telecomms/receiver/preset_right/endeavour
+//	id = "endeavour_rx"
 	freq_listening = list(AI_FREQ, SCI_FREQ, MED_FREQ, SUP_FREQ, SRV_FREQ, COMM_FREQ, ENG_FREQ, SEC_FREQ, ENT_FREQ, EXP_FREQ)
 
-/obj/machinery/telecomms/broadcaster/preset_right/victory
-//	id = "victory_tx"
+/obj/machinery/telecomms/broadcaster/preset_right/endeavour
+//	id = "endeavour_tx"
 
-/obj/machinery/telecomms/bus/preset_two/victory
+/obj/machinery/telecomms/bus/preset_two/endeavour
 	freq_listening = list(SUP_FREQ, SRV_FREQ, EXP_FREQ)
 
-/obj/machinery/telecomms/server/presets/service/victory
+/obj/machinery/telecomms/server/presets/service/endeavour
 	freq_listening = list(SRV_FREQ, EXP_FREQ)
 	autolinkers = list("service", "explorer")
 
 // Telecommunications Satellite
 
-/obj/item/multitool/victory_buffered
+/obj/item/multitool/endeavour_buffered
 	name = "pre-linked multitool (tether hub)"
 	desc = "This multitool has already been linked to the Tether telecomms hub and can be used to configure one (1) relay."
 
-/obj/item/multitool/victory_buffered/Initialize(mapload)
+/obj/item/multitool/endeavour_buffered/Initialize(mapload)
 	. = ..()
-	buffer = locate(/obj/machinery/telecomms/hub/preset/victory)
+	buffer = locate(/obj/machinery/telecomms/hub/preset/endeavour)

maps/victory/victory-overmap.dm

@@ -1,27 +0,0 @@
-/obj/overmap/entity/visitable/ship/victory
-	name = "NSV Victory"	// Name of the location on the overmap.
-	desc = "The Victory is one of the many ships that is a part of the NDV Marksmans Fleet in this sector"
-
-	scanner_desc = @{"[i]Registration[/i]: NSV Victory
-[i]Class[/i]: Science Vessel
-[i]Transponder[/i]: Transmitting (CIV), Nanotrasen IFF
-[b]Notice[/b]: Nanotrasen Vessel, authorized personnel only"}
-
-	icon_state = "ship"
-	vessel_mass = 12500 // temporarily buffed by 2x due to vorestation fucking up large gas thruster code
-	burn_delay = 2 SECONDS
-	fore_dir = EAST	// Which direction the ship/z-level is facing.  It will move dust particles from that direction when moving.
-	base = TRUE		// Honestly unsure what this does but it seems the main sector or "Map" we're at has this so here it stays
-	// The waypoints that are avaliable once you are at this Navpoint
-	initial_generic_waypoints = list("nav_capitalship_docking2", "victory_excursion_hangar", "victory_space_SW", "victory_mining_port")
-
-	initial_restricted_waypoints = list(
-		"Excursion Shuttle" = list("victory_excursion_hangar"),
-		"Courser Scouting Vessel" = list("victory_courser_hangar"),
-		"Hammerhead Patrol Barge" = list("victory_hammerhead_hangar"),
-		"Civilian Transport" = list("victory_civvie_home"),
-		"Dart EMT Shuttle" = list("victory_emt_dock"),
-		"Beruang Trade Ship" = list("victory_annex_dock"),
-		"Mining Shuttle" = list("victory_mining_port"),
-		"NDV Quicksilver" = list("victory_specops_dock")
-		)

maps/victory/victory-sectors.dm

@@ -1,14 +0,0 @@
-
-/obj/overmap/entity/visitable/sector/centcom_victory
-	name = "NDV Marksman"
-	desc = "The NDV Marksman is a Nanotrasen supercarrier that serves as the flagship for the eponymous Marksman Fleet."
-	scanner_desc = @{"[i]Information[/i]: The NDV Marksman is a Nanotrasen supercarrier that serves as the flagship for the eponymous Marksman Fleet."}
-	in_space = 1
-	known = TRUE
-	icon = 'icons/modules/overmap/tiled.dmi'
-	icon_state = "fleet"
-	color = "#007396"
-
-	initial_restricted_waypoints = list(
-		"NDV Quicksilver" = list("specops_hangar")
-		)

maps/victory/victory-shuttle-landmarks.dm

@@ -1,161 +0,0 @@
-/*
-Preset landmarks from Victory. Still in use for a few maps. At some point need to remap these but
-right now its not a big priority - Bloop 2022
-
- */
-
-// Shared landmark for docking at the station
-
-/obj/effect/shuttle_landmark/automatic/station_dockpoint1
-	name = "Station Docking Point 1"
-	landmark_tag = "nav_station_docking1"
-	docking_controller = "deck4_dockarm1"
-	base_turf = /turf/space
-	base_area = /area/space
-
-/obj/effect/shuttle_landmark/automatic/station_dockpoint2
-	name = "NSV Victory - Docking Arm 2"
-	landmark_tag = "nav_capitalship_docking2"
-	docking_controller = "deck4_dockarm2"
-	base_turf = /turf/space
-	base_area = /area/space
-
-
-// Exclusive landmark for docking at the station
-
-/obj/effect/shuttle_landmark/victory/deck4/civvie
-	name = "NSV Victory - Civilian Transport Dock"
-	landmark_tag = "victory_civvie_home"
-	docking_controller = "civvie_dock"
-	base_turf = /turf/space
-	base_area = /area/space
-
-/obj/effect/shuttle_landmark/victory/deck4/specops
-	name = "NSV Victory - Special Operations Dock"
-	landmark_tag = "victory_specops_dock"
-	docking_controller = "victory_specops_dock"
-	base_turf = /turf/space
-	base_area = /area/space
-
-/obj/effect/shuttle_landmark/victory/deck3/emt
-	name = "NSV Victory - EMT Shuttle Dock"
-	landmark_tag = "victory_emt_dock"
-	docking_controller = "emt_shuttle_dock"
-	base_turf = /turf/space
-	base_area = /area/space
-
-/obj/effect/shuttle_landmark/victory/deck2/mining
-	name = "NSV Victory Mining Dock"
-	landmark_tag = "victory_mining_port"
-	base_turf = /turf/space
-	base_area = /area/space
-
-/obj/effect/shuttle_landmark/victory/deck2/trade
-	name = "NSV Victory Annex Dock"
-	landmark_tag = "victory_annex_dock"
-	docking_controller = "victory_annex_dock"
-	base_turf = /turf/space
-	base_area = /area/space
-
-// Shared landmark for docking *inside* the station
-
-
-// Exclusive landmark for docking *inside* the station
-
-/obj/effect/shuttle_landmark/victory/deck4/excursion
-	name = "NSV Victory - Excursion Hangar"
-	landmark_tag = "victory_excursion_hangar"
-	docking_controller = "expshuttle_dock"
-	base_turf = /turf/simulated/floor/tiled/techfloor/grid
-	base_area = /area/exploration/excursion_dock
-
-/obj/effect/shuttle_landmark/victory/deck4/courser
-	name = "NSV Victory - Courser Hangar"
-	landmark_tag = "victory_courser_hangar"
-	docking_controller = "courser_dock"
-	base_turf = /turf/simulated/floor/tiled/techfloor/grid
-	base_area = /area/exploration/courser_dock
-
-/obj/effect/shuttle_landmark/victory/deck4/hammerhead
-	name = "NSV Victory - Hammerhead Hangar"
-	landmark_tag = "rift_hammerhead_hangar"
-	docking_controller = "hammerhead_docker"
-	base_turf = /turf/simulated/floor/tiled/techfloor/grid
-	base_area = /area/security/hammerhead_bay
-
-// ON STATION NAV POINTS
-
-/obj/effect/shuttle_landmark/victory/deck4/excursion_space
-	name = "Near NSV Victory (SW)"
-	landmark_tag = "victory_space_SW"
-	base_turf = /turf/space
-	base_area = /area/space
-
-/obj/effect/shuttle_landmark/victory/deck3/port
-	name = "Near NSV Victory (Port Deck 3)"
-	landmark_tag = "victory_space_port_3"
-	base_turf = /turf/space
-	base_area = /area/space
-
-/obj/effect/shuttle_landmark/victory/deck3/starboard
-	name = "Near NSV Victory (Starboard Deck 3)"
-	landmark_tag = "victory_space_starboard_3"
-	base_turf = /turf/space
-	base_area = /area/space
-
-/obj/effect/shuttle_landmark/victory/deck2/port
-	name = "Near NSV Victory (Port Deck 2)"
-	landmark_tag = "victory_space_port_2"
-	base_turf = /turf/space
-	base_area = /area/space
-
-/obj/effect/shuttle_landmark/victory/deck2/starboard
-	name = "Near NSV Victory (Starboard Deck 2)"
-	landmark_tag = "victory_space_starboard_2"
-	base_turf = /turf/space
-	base_area = /area/space
-
-/obj/effect/shuttle_landmark/victory/deck1/port
-	name = "Near NSV Victory (Port Deck 1)"
-	landmark_tag = "victory_space_port_1"
-	base_turf = /turf/space
-	base_area = /area/space
-
-/obj/effect/shuttle_landmark/victory/deck1/starboard
-	name = "Near NSV Victory (Starboard Deck 1)"
-	landmark_tag = "victory_space_starboard_1"
-	base_turf = /turf/space
-	base_area = /area/space
-
-// OFF-STATION NAV POINTS
-
-
-// TRANSIT NAV POINTS
-
-/obj/effect/shuttle_landmark/transit/victory/excursion
-	name = "In transit"
-	landmark_tag = "nav_transit_exploration"
-
-/obj/effect/shuttle_landmark/transit/victory/courser
-	name = "In transit"
-	landmark_tag = "nav_transit_courser"
-
-/obj/effect/shuttle_landmark/transit/victory/pirate
-	name = "In transit"
-	landmark_tag = "nav_transit_pirate"
-
-/obj/effect/shuttle_landmark/transit/victory/civvie
-	name = "In transit"
-	landmark_tag = "nav_transit_civvie"
-
-/obj/effect/shuttle_landmark/transit/victory/mining
-	name = "In transit"
-	landmark_tag = "nav_transit_mining"
-
-/obj/effect/shuttle_landmark/transit/victory/trade
-	name = "In transit"
-	landmark_tag = "nav_transit_trade"
-
-/obj/effect/shuttle_landmark/transit/victory/emt
-	name = "In transit"
-	landmark_tag = "nav_transit_emt"