Modular Traders ver 1

RepoStash · Jul 25, 2024 · 7e47b81 · 7e47b81
1 parent 602a432
commit 7e47b81
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 21 deletions.
diff --git 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
diff --git 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
@@ -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