From a52a54d0dfc8a51eb3b00de9cb39d5ed371c1498 Mon Sep 17 00:00:00 2001
From: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Date: Fri, 24 May 2024 15:46:14 -0400
Subject: [PATCH] Trade Shuttle Console Fix + Standardization (#25466)

* Trade Shuttle Console Fix + Standardization

* Gets rid of other "Jupiter Station" references on trader spawn area
---
 _maps/map_files/generic/centcomm.dmm | 6 +++---
 code/game/area/centcom_areas.dm      | 2 +-
 code/modules/shuttle/shuttle.dm      | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/_maps/map_files/generic/centcomm.dmm b/_maps/map_files/generic/centcomm.dmm
index 6949d75e90f..3bae9832cf0 100644
--- a/_maps/map_files/generic/centcomm.dmm
+++ b/_maps/map_files/generic/centcomm.dmm
@@ -4462,7 +4462,7 @@
 /area/centcom/specops)
 "oQ" = (
 /obj/machinery/door/poddoor/multi_tile/impassable/four_tile_ver{
-	name = "Jupiter Station Central Access"
+	name = "Trading Satellite Central Access"
 	},
 /turf/simulated/floor/plating/airless,
 /area/trader_station/sol)
@@ -5873,7 +5873,7 @@
 	dwidth = 4;
 	height = 11;
 	id = "trade_sol_base";
-	name = "docking bay 2 at Jupiter Station";
+	name = "docking bay at Trading Satellite";
 	width = 9
 	},
 /obj/structure/fans/tiny,
@@ -12878,7 +12878,7 @@
 /area/shuttle/transport)
 "Tu" = (
 /obj/machinery/door/airlock/centcom/glass{
-	name = "Jupiter Station Central Access"
+	name = "Trading Satellite Central Access"
 	},
 /turf/simulated/floor/wood,
 /area/trader_station/sol)
diff --git a/code/game/area/centcom_areas.dm b/code/game/area/centcom_areas.dm
index ca23f1ace4f..455911a1b11 100644
--- a/code/game/area/centcom_areas.dm
+++ b/code/game/area/centcom_areas.dm
@@ -135,7 +135,7 @@
 	dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
 
 /area/trader_station/sol
-	name = "Jupiter Station 6"
+	name = "Trading Satellite"
 
 /area/ghost_bar
 	name = "Ghost Bar"
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index ca248928dbb..95089f65910 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -985,6 +985,7 @@
 /obj/machinery/computer/shuttle/trade
 	name = "Freighter Console"
 	resistance_flags = INDESTRUCTIBLE
+	flags = NODECONSTRUCT
 
 /obj/machinery/computer/shuttle/trade/sol
 	req_access = list(ACCESS_TRADE_SOL)