From a388046df4fb57712638a430b8bfd2fa742a5744 Mon Sep 17 00:00:00 2001
From: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date: Sat, 7 May 2022 12:05:53 +0100
Subject: [PATCH] Fixes map vote (#17740)

---
 code/controllers/subsystem/vote.dm     | 10 ++++++----
 code/modules/admin/verbs/mapping.dm    |  3 ++-
 code/modules/mapping/base_map_datum.dm |  2 ++
 code/modules/mapping/test_tiny.dm      |  1 +
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm
index e43f8899e4c..851fd0afd58 100644
--- a/code/controllers/subsystem/vote.dm
+++ b/code/controllers/subsystem/vote.dm
@@ -184,9 +184,10 @@ SUBSYSTEM_DEF(vote)
 				var/datum/map/top_voted_map
 				for(var/x in subtypesof(/datum/map))
 					var/datum/map/M = x
-					// Set top voted map
-					if(. == "[initial(M.fluff_name)] ([initial(M.technical_name)])")
-						top_voted_map = M
+					if(initial(M.voteable))
+						// Set top voted map
+						if(. == "[initial(M.fluff_name)] ([initial(M.technical_name)])")
+							top_voted_map = M
 				to_chat(world, "<font color='purple'>Map for next round: [initial(top_voted_map.fluff_name)] ([initial(top_voted_map.technical_name)])</font>")
 				SSmapping.next_map = new top_voted_map
 
@@ -240,7 +241,8 @@ SUBSYSTEM_DEF(vote)
 				question = "Map for next round"
 				for(var/x in subtypesof(/datum/map))
 					var/datum/map/M = x
-					choices.Add("[initial(M.fluff_name)] ([initial(M.technical_name)])")
+					if(initial(M.voteable))
+						choices.Add("[initial(M.fluff_name)] ([initial(M.technical_name)])")
 
 			if("custom")
 				question = html_encode(input(usr,"What is the vote for?") as text|null)
diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm
index 90b0fb912ae..1b4d5a18851 100644
--- a/code/modules/admin/verbs/mapping.dm
+++ b/code/modules/admin/verbs/mapping.dm
@@ -190,7 +190,8 @@ GLOBAL_VAR_INIT(intercom_range_display_status, 0)
 	var/list/map_datums = list()
 	for(var/x in subtypesof(/datum/map))
 		var/datum/map/M = x
-		map_datums["[initial(M.fluff_name)] ([initial(M.technical_name)])"] = M // Put our map in
+		if(initial(M.voteable))
+			map_datums["[initial(M.fluff_name)] ([initial(M.technical_name)])"] = M // Put our map in
 
 	var/target_map_name = input(usr, "Select target map", "Next map", null) as null|anything in map_datums
 
diff --git a/code/modules/mapping/base_map_datum.dm b/code/modules/mapping/base_map_datum.dm
index a1962d8bba1..8b04d0ac156 100644
--- a/code/modules/mapping/base_map_datum.dm
+++ b/code/modules/mapping/base_map_datum.dm
@@ -14,3 +14,5 @@
 	var/map_path
 	/// URL to the maps webmap
 	var/webmap_url
+	/// Is this map voteable?
+	var/voteable = TRUE
diff --git a/code/modules/mapping/test_tiny.dm b/code/modules/mapping/test_tiny.dm
index 518e5504608..0c6294c15d0 100644
--- a/code/modules/mapping/test_tiny.dm
+++ b/code/modules/mapping/test_tiny.dm
@@ -2,3 +2,4 @@
 	fluff_name = "test_tiny"
 	technical_name = "test_tiny"
 	map_path = "_maps/map_files/test_tiny/test_tiny.dmm"
+	voteable = FALSE