From 5b38b93a93b7932eb6949c54b9b728536bbe01ae Mon Sep 17 00:00:00 2001
From: Wildkins <john.wildkins@gmail.com>
Date: Wed, 4 Mar 2026 20:54:16 -0500
Subject: [PATCH] Fix Extended not being selected if no votes are cast (#21975)

see title
Odyssey is both a votable mode and added manually (to put it at the top)
so default_choices length != winners length, thus it was picking a
random winner rather than defaulting to Extended

(also fixed a changelog not having the right name format)
---
 code/datums/votes/round_type.dm               |  2 +-
 .../evandorf-horizon-shuttle-airlocks.yml     | 58 +++++++++++++++++++
 html/changelogs/johnwildkins-fixvotes.yml     | 13 +++++
 3 files changed, 72 insertions(+), 1 deletion(-)
 create mode 100644 html/changelogs/evandorf-horizon-shuttle-airlocks.yml
 create mode 100644 html/changelogs/johnwildkins-fixvotes.yml

diff --git a/code/datums/votes/round_type.dm b/code/datums/votes/round_type.dm
index 4a8c347df65..794677a19e9 100644
--- a/code/datums/votes/round_type.dm
+++ b/code/datums/votes/round_type.dm
@@ -26,7 +26,7 @@
 
 	//Actually populate the voting choices, which are now sorted
 	for(var/datum/game_mode/votable_mode_sorted in gamemodes_list)
-		default_choices += capitalize(votable_mode_sorted.name)
+		default_choices |= capitalize(votable_mode_sorted.name)
 
 	//Stop the countdown while we vote
 	GLOB.round_progressing = FALSE
diff --git a/html/changelogs/evandorf-horizon-shuttle-airlocks.yml b/html/changelogs/evandorf-horizon-shuttle-airlocks.yml
new file mode 100644
index 00000000000..f4f81c0f05f
--- /dev/null
+++ b/html/changelogs/evandorf-horizon-shuttle-airlocks.yml
@@ -0,0 +1,58 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#     - (fixes bugs)
+#   wip
+#     - (work in progress)
+#   qol
+#     - (quality of life)
+#   soundadd
+#     - (adds a sound)
+#   sounddel
+#     - (removes a sound)
+#   rscadd
+#     - (adds a feature)
+#   rscdel
+#     - (removes a feature)
+#   imageadd
+#     - (adds an image or sprite)
+#   imagedel
+#     - (removes an image or sprite)
+#   spellcheck
+#     - (fixes spelling or grammar)
+#   experiment
+#     - (experimental change)
+#   balance
+#     - (balance changes)
+#   code_imp
+#     - (misc internal code change)
+#   refactor
+#     - (refactors code)
+#   config
+#     - (makes a change to the config files)
+#   admin
+#     - (makes changes to administrator tools)
+#   server
+#     - (miscellaneous changes to server)
+#################################
+
+# Your name.
+author: Evandorf
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, this gets changed to [] after reading.  Just remove the brackets when you add new shit.
+# Please surround your changes in  double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - rscadd: "Standardizes the airlocks in all shuttles by adding manual shutters to the Spark, Quark, and Canary. This also coincides with changes to SoP - Preflight Safety Checks."
diff --git a/html/changelogs/johnwildkins-fixvotes.yml b/html/changelogs/johnwildkins-fixvotes.yml
new file mode 100644
index 00000000000..6cbb63fe722
--- /dev/null
+++ b/html/changelogs/johnwildkins-fixvotes.yml
@@ -0,0 +1,13 @@
+# Your name.
+author: JohnWildkins
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, this gets changed to [] after reading.  Just remove the brackets when you add new shit.
+# Please surround your changes in  double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - bugfix: "Fixed an issue where Extended wouldn't be selected if no votes for gamemode were cast."