From da171e9d3e91c14e1e71aabe7d7d6f2e064e616c Mon Sep 17 00:00:00 2001 From: WickedCybs <52309324+WickedCybs@users.noreply.github.com> Date: Tue, 14 Feb 2023 15:59:12 -0500 Subject: [PATCH] Moves the Intrepid Navpoint Back (#15815) --- html/changelogs/wickedcybs_intrepnav.yml | 7 ++++++ .../crashed_elyran_tanker.dmm | 24 +++++++++---------- maps/away/away_site/magshield/magshield.dmm | 8 +++---- .../overgrown_mining_station.dmm | 4 ++-- .../away_site/romanovich/grand_romanovich.dmm | 6 +---- .../tajara/mining_jack/mining_jack.dmm | 24 +++++++++---------- .../away_site/tajara/scrapper/scrapper.dmm | 4 ++-- .../ships/kataphracts/kataphract_ship.dmm | 24 +++++++++---------- maps/away/ships/orion/orion_express_ship.dmm | 10 +++++--- .../tajara/taj_smuggler/tajaran_smuggler.dmm | 24 +++++++++---------- .../sccv_horizon/code/sccv_horizon_overmap.dm | 4 ++-- .../code/sccv_horizon_shuttles.dm | 1 - maps/sccv_horizon/sccv_horizon-1_deck_1.dmm | 20 ++++------------ maps/sccv_horizon/sccv_horizon-3_deck_3.dmm | 12 +++++----- 14 files changed, 83 insertions(+), 89 deletions(-) create mode 100644 html/changelogs/wickedcybs_intrepnav.yml diff --git a/html/changelogs/wickedcybs_intrepnav.yml b/html/changelogs/wickedcybs_intrepnav.yml new file mode 100644 index 00000000000..2e9e0f900da --- /dev/null +++ b/html/changelogs/wickedcybs_intrepnav.yml @@ -0,0 +1,7 @@ +author: WickedCybs + +delete-after: True + +changes: + - bugfix: "The Intrepid navpoint was moved back to its original position in roughly the middle of the shuttle. The recent change to its position ended up causing issues on away sites and how it interacted with other overmap ships." + - bugfix: "Some of the bridge deck navpoints had identical names and that meant they wouldn't work. That's been fixed too" \ No newline at end of file diff --git a/maps/away/away_site/crashed_elyran_tanker/crashed_elyran_tanker.dmm b/maps/away/away_site/crashed_elyran_tanker/crashed_elyran_tanker.dmm index 42870e1b792..7945b05fd3f 100644 --- a/maps/away/away_site/crashed_elyran_tanker/crashed_elyran_tanker.dmm +++ b/maps/away/away_site/crashed_elyran_tanker/crashed_elyran_tanker.dmm @@ -48424,6 +48424,18 @@ Dg Dg Dg Dg +Dg +Dg +Dg +Dg +Dg +Dg +Dg +Dg +Dg +Dg +Dg +Dg Ue Dg Dg @@ -48576,18 +48588,6 @@ Dg Dg Dg Dg -Dg -Dg -Dg -Dg -Dg -Dg -Dg -Dg -Dg -Dg -Dg -Dg "} (169,1,1) = {" Dg diff --git a/maps/away/away_site/magshield/magshield.dmm b/maps/away/away_site/magshield/magshield.dmm index 7f06368f244..e9ca44c1259 100644 --- a/maps/away/away_site/magshield/magshield.dmm +++ b/maps/away/away_site/magshield/magshield.dmm @@ -2402,8 +2402,8 @@ /area/magshield/west) "hc" = ( /obj/effect/shuttle_landmark/nav_magshield/nav1, -/turf/simulated/floor/airless, -/area/magshield/north) +/turf/template_noop, +/area/space) "hd" = ( /obj/structure/cable{ d1 = 4; @@ -20670,7 +20670,7 @@ de de jH dw -hc +dj aa aa aa @@ -21046,7 +21046,7 @@ aa aa aa aa -aa +hc aa aa aa diff --git a/maps/away/away_site/overgrown_mining_station/overgrown_mining_station.dmm b/maps/away/away_site/overgrown_mining_station/overgrown_mining_station.dmm index 16a94104fb3..60c47ff5ba9 100644 --- a/maps/away/away_site/overgrown_mining_station/overgrown_mining_station.dmm +++ b/maps/away/away_site/overgrown_mining_station/overgrown_mining_station.dmm @@ -52368,7 +52368,7 @@ gV gV gV gV -gV +gG gV gV gV @@ -53127,7 +53127,7 @@ gV gV gV gV -gG +gV gV gV gV diff --git a/maps/away/away_site/romanovich/grand_romanovich.dmm b/maps/away/away_site/romanovich/grand_romanovich.dmm index f9a3f6d6bf6..9fda76f6a0d 100644 --- a/maps/away/away_site/romanovich/grand_romanovich.dmm +++ b/maps/away/away_site/romanovich/grand_romanovich.dmm @@ -5703,10 +5703,6 @@ }, /turf/simulated/floor/carpet/art, /area/grand_romanovich) -"qO" = ( -/obj/effect/shuttle_landmark/automatic, -/turf/simulated/floor/tiled/dark, -/area/grand_romanovich) "qP" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 5; @@ -20893,7 +20889,7 @@ OF gZ lS lS -qO +lS lS gY ZO diff --git a/maps/away/away_site/tajara/mining_jack/mining_jack.dmm b/maps/away/away_site/tajara/mining_jack/mining_jack.dmm index 9bb283eeb7c..2c6fe1c8d0a 100644 --- a/maps/away/away_site/tajara/mining_jack/mining_jack.dmm +++ b/maps/away/away_site/tajara/mining_jack/mining_jack.dmm @@ -39721,6 +39721,18 @@ Kn Kn Kn Kn +Kn +Kn +Kn +Kn +Kn +Kn +Kn +Kn +Kn +Kn +Kn +Kn xL Kn Kn @@ -39875,18 +39887,6 @@ Kn Kn Kn Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn "} (146,1,1) = {" Kn diff --git a/maps/away/away_site/tajara/scrapper/scrapper.dmm b/maps/away/away_site/tajara/scrapper/scrapper.dmm index a7876c3dd2b..1ccd1a2f908 100644 --- a/maps/away/away_site/tajara/scrapper/scrapper.dmm +++ b/maps/away/away_site/tajara/scrapper/scrapper.dmm @@ -49264,7 +49264,7 @@ Kn Kn Kn Kn -Kn +zx Kn Kn Kn @@ -49509,7 +49509,7 @@ Kn Kn Kn Kn -zx +Kn Kn Kn Kn diff --git a/maps/away/ships/kataphracts/kataphract_ship.dmm b/maps/away/ships/kataphracts/kataphract_ship.dmm index edc4744f230..793c6c4b715 100644 --- a/maps/away/ships/kataphracts/kataphract_ship.dmm +++ b/maps/away/ships/kataphracts/kataphract_ship.dmm @@ -29834,6 +29834,18 @@ iB iB iB iB +iB +iB +iB +iB +iB +iB +iB +iB +iB +iB +iB +iB Cx iB iB @@ -29890,18 +29902,6 @@ iB iB iB iB -iB -iB -iB -iB -iB -iB -iB -iB -iB -iB -iB -iB "} (119,1,1) = {" iB diff --git a/maps/away/ships/orion/orion_express_ship.dmm b/maps/away/ships/orion/orion_express_ship.dmm index 1508ed19389..f88c1272044 100644 --- a/maps/away/ships/orion/orion_express_ship.dmm +++ b/maps/away/ships/orion/orion_express_ship.dmm @@ -967,6 +967,10 @@ /obj/machinery/atmospherics/binary/pump/high_power, /turf/simulated/floor/airless, /area/ship/orion_express_ship) +"hfG" = ( +/obj/effect/shuttle_landmark/automatic, +/turf/template_noop, +/area/space) "hjK" = ( /obj/machinery/atm{ pixel_x = 32 @@ -22337,7 +22341,7 @@ xRX xRX xRX xRX -xRX +hfG xRX xRX xRX @@ -35910,7 +35914,7 @@ xRX xRX xRX xRX -xRX +hfG xRX xRX xRX @@ -35990,7 +35994,7 @@ xRX xRX xRX xRX -xRX +hfG xRX xRX xRX diff --git a/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dmm b/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dmm index 9377b5fe9f0..9a52dc1d354 100644 --- a/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dmm +++ b/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dmm @@ -41047,6 +41047,18 @@ xRX xRX xRX xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX afL xRX xRX @@ -41237,18 +41249,6 @@ xRX xRX xRX xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX "} (146,1,1) = {" xRX diff --git a/maps/sccv_horizon/code/sccv_horizon_overmap.dm b/maps/sccv_horizon/code/sccv_horizon_overmap.dm index 501b834e382..4ac397401ef 100644 --- a/maps/sccv_horizon/code/sccv_horizon_overmap.dm +++ b/maps/sccv_horizon/code/sccv_horizon_overmap.dm @@ -193,11 +193,11 @@ landmark_tag = "deck_three_fore_of_horizon" /obj/effect/shuttle_landmark/horizon/deckthree/starboardfore - name = "Deck Three, Starboard of Horizon" + 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, Starboard of Horizon" + name = "Deck Three, Port Fore of Horizon" landmark_tag = "deck_three_port_fore_of_horizon" /obj/effect/shuttle_landmark/horizon/deckthree/portaft diff --git a/maps/sccv_horizon/code/sccv_horizon_shuttles.dm b/maps/sccv_horizon/code/sccv_horizon_shuttles.dm index 46f8185ae25..077b20a9740 100644 --- a/maps/sccv_horizon/code/sccv_horizon_shuttles.dm +++ b/maps/sccv_horizon/code/sccv_horizon_shuttles.dm @@ -170,7 +170,6 @@ docking_controller = "intrepid_dock" base_area = /area/hangar/intrepid base_turf = /turf/simulated/floor/plating - movable_flags = MOVABLE_FLAG_EFFECTMOVE /obj/effect/shuttle_landmark/intrepid/transit name = "In transit" diff --git a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm index 0bafc57d5c3..812e850f307 100644 --- a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm +++ b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm @@ -796,11 +796,8 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/rotary) +/turf/simulated/floor/plating, +/area/hangar/intrepid) "aHY" = ( /obj/effect/map_effect/window_spawner/full/reinforced/firedoor, /turf/simulated/floor/tiled/dark/full, @@ -14774,16 +14771,6 @@ /obj/effect/floor_decal/corner/brown/diagonal, /turf/simulated/floor/tiled/dark, /area/outpost/mining_main/eva) -"lyY" = ( -/obj/effect/floor_decal/corner/black{ - dir = 10 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/obj/effect/shuttle_landmark/intrepid/hangar, -/turf/simulated/floor/tiled, -/area/hangar/intrepid) "lzb" = ( /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 4 @@ -25917,6 +25904,7 @@ icon_state = "4-8" }, /obj/machinery/bluespace_beacon, +/obj/effect/shuttle_landmark/intrepid/hangar, /turf/simulated/floor/tiled/dark, /area/shuttle/intrepid/crew_compartment) "unS" = ( @@ -51440,7 +51428,7 @@ kEt hYy apf iZk -lyY +dhi ayq xvk nyz diff --git a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm index 84c721079db..4c7091142e5 100644 --- a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm +++ b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm @@ -51473,6 +51473,12 @@ dSF dSF dSF dSF +dSF +dSF +dSF +dSF +dSF +dSF ubP dSF dSF @@ -51505,12 +51511,6 @@ dSF dSF dSF dSF -dSF -dSF -dSF -dSF -dSF -dSF "} (106,1,1) = {" dSF