diff --git a/baystation12.dme b/baystation12.dme index d07a049e0f6eb..817d5507d961b 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -2646,7 +2646,6 @@ #include "code\modules\overmap\overmap_shuttle.dm" #include "code\modules\overmap\sectors.dm" #include "code\modules\overmap\spacetravel.dm" -#include "code\modules\overmap\trading_locations.dm" #include "code\modules\overmap\contacts\_contacts.dm" #include "code\modules\overmap\contacts\contact_sensors.dm" #include "code\modules\overmap\contacts\tracker.dm" diff --git a/code/modules/overmap/trading_locations.dm b/code/modules/overmap/trading_locations.dm deleted file mode 100644 index 86dcc6f8449c4..0000000000000 --- a/code/modules/overmap/trading_locations.dm +++ /dev/null @@ -1,20 +0,0 @@ -/obj/overmap/trading - name = "station" - desc = "A trading station." - icon_state = "sector" - scannable = TRUE - requires_contact = FALSE // Whether or not the effect must be identified by ship sensors before being seen. - instant_contact = TRUE // Do we instantly identify ourselves to any ship in sensors range? - plane = 4 - - var/datum/trader/trader_merchant_datum - -/obj/overmap/trading/on_update_icon() - return - -/obj/overmap/trading/ship - name = "ship" - desc = "A trading ship." - icon_state = "ship" - requires_contact = FALSE // Whether or not the effect must be identified by ship sensors before being seen. - instant_contact = TRUE // Do we instantly identify ourselves to any ship in sensors range? diff --git a/mods/_fd/expanded_traders/_expanded_traders.dme b/mods/_fd/expanded_traders/_expanded_traders.dme index 8433bd2cc38be..9f0ef67e2b300 100644 --- a/mods/_fd/expanded_traders/_expanded_traders.dme +++ b/mods/_fd/expanded_traders/_expanded_traders.dme @@ -4,6 +4,7 @@ #include "_expanded_traders.dm" #include "code/ai.dm" +#include "code/trading_locations.dm" #include "code/preset_console.dm" diff --git a/mods/_fd/expanded_traders/code/trading_locations.dm b/mods/_fd/expanded_traders/code/trading_locations.dm new file mode 100644 index 0000000000000..f9aafa5714cbf --- /dev/null +++ b/mods/_fd/expanded_traders/code/trading_locations.dm @@ -0,0 +1,19 @@ +/obj/overmap/trading + name = "station" + desc = "A trading station." + icon = 'mods/_fd/fd_assets/icons/overmap.dmi' + icon_state = "trading_sector" + scannable = TRUE + requires_contact = TRUE // Whether or not the effect must be identified by ship sensors before being seen. + instant_contact = TRUE // Do we instantly identify ourselves to any ship in sensors range? + plane = 4 + + var/datum/trader/trader_merchant_datum + +/obj/overmap/trading/on_update_icon() + return + +/obj/overmap/trading/ship + name = "ship" + desc = "A trading ship." + icon_state = "trading_ship" diff --git a/mods/_fd/fd_assets/icons/overmap.dmi b/mods/_fd/fd_assets/icons/overmap.dmi new file mode 100644 index 0000000000000..c802d623cd5a2 Binary files /dev/null and b/mods/_fd/fd_assets/icons/overmap.dmi differ