mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-21 12:02:31 +01:00
Moves the Intrepid Navpoint Back (#15815)
This commit is contained in:
@@ -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"
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user