From 72eb714df3079529b921ecb4ff4b49171b18b475 Mon Sep 17 00:00:00 2001
From: vect0r <71346830+Vect0r2@users.noreply.github.com>
Date: Mon, 30 Sep 2024 07:54:28 -0700
Subject: [PATCH 1/5] s

---
 code/datums/shuttles.dm                             | 1 +
 code/modules/overmap/ships/controlled_ship_datum.dm | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm
index 789e689745c..36a025a5f47 100644
--- a/code/datums/shuttles.dm
+++ b/code/datums/shuttles.dm
@@ -12,6 +12,7 @@
 	var/port_y_offset
 	var/port_dir
 
+	var/ship_icon = "globe"
 	var/limit = 2
 	var/enabled
 	var/short_name
diff --git a/code/modules/overmap/ships/controlled_ship_datum.dm b/code/modules/overmap/ships/controlled_ship_datum.dm
index ab6a8a7a861..495ee103644 100644
--- a/code/modules/overmap/ships/controlled_ship_datum.dm
+++ b/code/modules/overmap/ships/controlled_ship_datum.dm
@@ -96,6 +96,8 @@
 		source_template = creation_template
 		unique_ship_access = source_template.unique_ship_access
 		job_slots = source_template.job_slots?.Copy()
+		if(source_template.ship_icon)
+			token_icon_state = source_template.ship_icon
 		if(create_shuttle)
 			shuttle_port = SSshuttle.load_template(creation_template, src)
 			if(!shuttle_port) //Loading failed, if the shuttle is supposed to be created, we need to delete ourselves.

From 63231524b982869687087eec59e1da9dc9d5d7a3 Mon Sep 17 00:00:00 2001
From: vect0r <71346830+Vect0r2@users.noreply.github.com>
Date: Mon, 30 Sep 2024 08:25:11 -0700
Subject: [PATCH 2/5] a

---
 code/datums/shuttles.dm                             | 2 +-
 code/modules/overmap/ships/controlled_ship_datum.dm | 1 +
 code/modules/overmap/ships/ship_datum.dm            | 5 +++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm
index 36a025a5f47..114e64f7228 100644
--- a/code/datums/shuttles.dm
+++ b/code/datums/shuttles.dm
@@ -12,7 +12,7 @@
 	var/port_y_offset
 	var/port_dir
 
-	var/ship_icon = "globe"
+	var/ship_icon
 	var/limit = 2
 	var/enabled
 	var/short_name
diff --git a/code/modules/overmap/ships/controlled_ship_datum.dm b/code/modules/overmap/ships/controlled_ship_datum.dm
index 495ee103644..063c2ca9816 100644
--- a/code/modules/overmap/ships/controlled_ship_datum.dm
+++ b/code/modules/overmap/ships/controlled_ship_datum.dm
@@ -98,6 +98,7 @@
 		job_slots = source_template.job_slots?.Copy()
 		if(source_template.ship_icon)
 			token_icon_state = source_template.ship_icon
+			base_token_icon_state = source_template.ship_icon
 		if(create_shuttle)
 			shuttle_port = SSshuttle.load_template(creation_template, src)
 			if(!shuttle_port) //Loading failed, if the shuttle is supposed to be created, we need to delete ourselves.
diff --git a/code/modules/overmap/ships/ship_datum.dm b/code/modules/overmap/ships/ship_datum.dm
index ed8f40a28f6..c59a6dcc4c5 100644
--- a/code/modules/overmap/ships/ship_datum.dm
+++ b/code/modules/overmap/ships/ship_datum.dm
@@ -7,6 +7,7 @@
 /datum/overmap/ship
 	name = "overmap vessel"
 	char_rep = ">"
+	var/base_token_icon_state = "ship"
 	token_icon_state = "ship"
 	///Timer ID of the looping movement timer
 	var/movement_callback_id
@@ -230,7 +231,7 @@
 	else if(direction & SOUTH)
 		char_rep = "v"
 	if(direction)
-		token.icon_state = "ship_moving"
+		token.icon_state = base_token_icon_state +"_moving"
 		token.dir = direction
 	else
-		token.icon_state = "ship"
+		token.icon_state = base_token_icon_state

From 1e50226342ee4c19df1acd1ee2ce23103d812f9c Mon Sep 17 00:00:00 2001
From: vect0r <71346830+Vect0r2@users.noreply.github.com>
Date: Mon, 30 Sep 2024 09:42:17 -0700
Subject: [PATCH 3/5] getting it workin'

---
 _maps/configs/nanotrasen_cheyenne.json   |   1 +
 code/controllers/subsystem/mapping.dm    |   3 ++-
 code/datums/shuttles.dm                  |   3 ++-
 code/modules/overmap/_overmap_datum.dm   |   1 +
 code/modules/overmap/ships/ship_datum.dm |   2 +-
 icons/misc/overmap.dmi                   | Bin 5704 -> 6123 bytes
 6 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/_maps/configs/nanotrasen_cheyenne.json b/_maps/configs/nanotrasen_cheyenne.json
index 5b910775001..e06cc9bcb70 100644
--- a/_maps/configs/nanotrasen_cheyenne.json
+++ b/_maps/configs/nanotrasen_cheyenne.json
@@ -12,6 +12,7 @@
 	"map_id": "nanotrasen_cheyenne",
 	"description": "The Cheyenne-Class is a state-of-the-art Flotilla style vessel, designed and constructed by NanoTrasen to serve as a central hub for frontier operations. Built with versatility and durability in mind, the Frontier Voyager combines the functionality of a large, stationary space station with the mobility of a capital-class starship. Its vast interior is equipped with all the necessary facilities to support a variety of operations, from scientific research and mineral extraction to security and medical response.",
 	"limit": 1,
+	"ship_icon": "cheyenne",
 	"tags": [
 		"RP Focus",
 		"Generalist",
diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm
index 03720e4d641..d8d0ef8fe56 100644
--- a/code/controllers/subsystem/mapping.dm
+++ b/code/controllers/subsystem/mapping.dm
@@ -176,7 +176,8 @@ SUBSYSTEM_DEF(mapping)
 		CHECK_LIST_EXISTS("job_slots")
 		var/datum/map_template/shuttle/S = new(data["map_path"], data["map_name"], TRUE)
 		S.file_name = data["map_path"]
-
+		if(istext(data["ship_icon"]))
+			S.ship_icon = data["ship_icon"]
 		if(istext(data["map_short_name"]))
 			S.short_name = data["map_short_name"]
 		else
diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm
index 114e64f7228..e14f034b84e 100644
--- a/code/datums/shuttles.dm
+++ b/code/datums/shuttles.dm
@@ -13,6 +13,7 @@
 	var/port_dir
 
 	var/ship_icon
+
 	var/limit = 2
 	var/enabled
 	var/short_name
@@ -220,7 +221,6 @@
 	.["templateSpawnCoeff"] = spawn_time_coeff
 	.["templateOfficerCoeff"] = officer_time_coeff
 	.["templateEnabled"] = enabled
-
 	.["templateJobs"] = list()
 	for(var/datum/job/job as anything in job_slots)
 		var/list/jobdetails = list()
@@ -329,6 +329,7 @@
 
 /datum/map_template/shuttle/subshuttles
 	category = "subshuttles"
+	ship_icon = "shuttle"
 	starting_funds = 0
 
 /datum/map_template/shuttle/subshuttles/pill
diff --git a/code/modules/overmap/_overmap_datum.dm b/code/modules/overmap/_overmap_datum.dm
index 5244f285018..2eec5074889 100644
--- a/code/modules/overmap/_overmap_datum.dm
+++ b/code/modules/overmap/_overmap_datum.dm
@@ -37,6 +37,7 @@
 	var/token_type = /obj/overmap
 	/// The icon state the token will be set to on init.
 	var/token_icon_state = "object"
+	var/base_token_icon_state
 
 	/// The current docking ticket of this object, if any
 	var/datum/docking_ticket/current_docking_ticket
diff --git a/code/modules/overmap/ships/ship_datum.dm b/code/modules/overmap/ships/ship_datum.dm
index c59a6dcc4c5..68e3fb7d904 100644
--- a/code/modules/overmap/ships/ship_datum.dm
+++ b/code/modules/overmap/ships/ship_datum.dm
@@ -7,8 +7,8 @@
 /datum/overmap/ship
 	name = "overmap vessel"
 	char_rep = ">"
-	var/base_token_icon_state = "ship"
 	token_icon_state = "ship"
+
 	///Timer ID of the looping movement timer
 	var/movement_callback_id
 	///Max possible speed (1 tile per tick / 600 tiles per minute)
diff --git a/icons/misc/overmap.dmi b/icons/misc/overmap.dmi
index f0c9f6e446779c6989ef3c08927b08a15debdd9a..68ef6f39659ef9e8106975f7a9dda608d1a4f57c 100644
GIT binary patch
literal 6123
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

literal 5704
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


From 42ed4f5ee0aa800d8ee03d1040906bcdfe7e4df3 Mon Sep 17 00:00:00 2001
From: vect0r <71346830+Vect0r2@users.noreply.github.com>
Date: Tue, 1 Oct 2024 12:31:16 -0700
Subject: [PATCH 4/5] adds empty space icons

---
 _maps/configs/nanotrasen_cheyenne.json        |   1 +
 code/controllers/subsystem/mapping.dm         |   2 ++
 code/datums/shuttles.dm                       |   1 +
 .../overmap/ships/controlled_ship_datum.dm    |   8 ++++++++
 icons/misc/overmap.dmi                        | Bin 6123 -> 6178 bytes
 5 files changed, 12 insertions(+)

diff --git a/_maps/configs/nanotrasen_cheyenne.json b/_maps/configs/nanotrasen_cheyenne.json
index e06cc9bcb70..8ae6b6e5fc4 100644
--- a/_maps/configs/nanotrasen_cheyenne.json
+++ b/_maps/configs/nanotrasen_cheyenne.json
@@ -13,6 +13,7 @@
 	"description": "The Cheyenne-Class is a state-of-the-art Flotilla style vessel, designed and constructed by NanoTrasen to serve as a central hub for frontier operations. Built with versatility and durability in mind, the Frontier Voyager combines the functionality of a large, stationary space station with the mobility of a capital-class starship. Its vast interior is equipped with all the necessary facilities to support a variety of operations, from scientific research and mineral extraction to security and medical response.",
 	"limit": 1,
 	"ship_icon": "cheyenne",
+	"empty_space_icon": "cheyenne_space",
 	"tags": [
 		"RP Focus",
 		"Generalist",
diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm
index d8d0ef8fe56..e7fc71a3e79 100644
--- a/code/controllers/subsystem/mapping.dm
+++ b/code/controllers/subsystem/mapping.dm
@@ -178,6 +178,8 @@ SUBSYSTEM_DEF(mapping)
 		S.file_name = data["map_path"]
 		if(istext(data["ship_icon"]))
 			S.ship_icon = data["ship_icon"]
+		if(istext(data["empty_space_icon"]))
+			S.empty_space_icon = data["empty_space_icon"]
 		if(istext(data["map_short_name"]))
 			S.short_name = data["map_short_name"]
 		else
diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm
index e14f034b84e..518a0f92b13 100644
--- a/code/datums/shuttles.dm
+++ b/code/datums/shuttles.dm
@@ -13,6 +13,7 @@
 	var/port_dir
 
 	var/ship_icon
+	var/empty_space_icon
 
 	var/limit = 2
 	var/enabled
diff --git a/code/modules/overmap/ships/controlled_ship_datum.dm b/code/modules/overmap/ships/controlled_ship_datum.dm
index 063c2ca9816..72edebe3b54 100644
--- a/code/modules/overmap/ships/controlled_ship_datum.dm
+++ b/code/modules/overmap/ships/controlled_ship_datum.dm
@@ -57,6 +57,9 @@
 	/// Lazylist of /datum/ship_applications for this ship. Only used if join_mode == SHIP_JOIN_MODE_APPLY
 	var/list/datum/ship_application/applications
 
+	///The icon of the empty space we dock at
+	var/space_dock_icon
+
 	/// Short memo of the ship shown to new joins
 	var/memo = null
 	///Assoc list of remaining open job slots (job = remaining slots)
@@ -99,6 +102,8 @@
 		if(source_template.ship_icon)
 			token_icon_state = source_template.ship_icon
 			base_token_icon_state = source_template.ship_icon
+		if(source_template.empty_space_icon)
+			space_dock_icon = source_template.empty_space_icon
 		if(create_shuttle)
 			shuttle_port = SSshuttle.load_template(creation_template, src)
 			if(!shuttle_port) //Loading failed, if the shuttle is supposed to be created, we need to delete ourselves.
@@ -206,6 +211,9 @@
 	if(!E)
 		E = new(list("x" = x, "y" = y))
 	if(E) //Don't make this an else
+		var/obj/overmap/token = E.token
+		if(space_dock_icon)
+			token.icon_state = space_dock_icon
 		Dock(E)
 
 /datum/overmap/ship/controlled/burn_engines(percentage = 100, deltatime)
diff --git a/icons/misc/overmap.dmi b/icons/misc/overmap.dmi
index 68ef6f39659ef9e8106975f7a9dda608d1a4f57c..2e52bf3d260c523b4b7e6707831791da41e17c1c 100644
GIT binary patch
delta 6118
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

delta 6049
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
brT+p2reZH3!*Oc>015yANkvXXu0mjffoqPN


From 55d4f5eac279279491e56aec994dcd2d51978c77 Mon Sep 17 00:00:00 2001
From: vect0r <71346830+Vect0r2@users.noreply.github.com>
Date: Thu, 3 Oct 2024 15:52:14 -0700
Subject: [PATCH 5/5] Update ship_datum.dm

---
 code/modules/overmap/ships/ship_datum.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/overmap/ships/ship_datum.dm b/code/modules/overmap/ships/ship_datum.dm
index 68e3fb7d904..885ee5c049e 100644
--- a/code/modules/overmap/ships/ship_datum.dm
+++ b/code/modules/overmap/ships/ship_datum.dm
@@ -8,7 +8,7 @@
 	name = "overmap vessel"
 	char_rep = ">"
 	token_icon_state = "ship"
-
+	base_token_icon_state = "ship"
 	///Timer ID of the looping movement timer
 	var/movement_callback_id
 	///Max possible speed (1 tile per tick / 600 tiles per minute)