diff --git a/code/controllers/voting.dm b/code/controllers/voting.dm
index e6f88731b6..aa06984f69 100644
--- a/code/controllers/voting.dm
+++ b/code/controllers/voting.dm
@@ -120,7 +120,7 @@ var/global/list/round_voters = list() // Keeps track of the individuals voting f
if(choices[current_votes[key]] == .)
round_voters += key // Keep track of who voted for the winning round.
if(mode != VOTE_GAMEMODE || . == "Extended" || ticker.hide_mode == 0) // Announce Extended gamemode, but not other gamemodes
- text += "Vote Result: [.]"
+ text += "Vote Result: [mode == VOTE_GAMEMODE ? gamemode_names[.] : .]"
else
text += "The vote has ended."
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index cf98ede72f..261c95515a 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -892,9 +892,9 @@
if (ticker && ticker.mode)
return alert(usr, "The game has already started.", null, null, null, null)
master_mode = href_list["c_mode2"]
- log_admin("[key_name(usr)] set the mode as [master_mode].")
- message_admins("\blue [key_name_admin(usr)] set the mode as [master_mode].", 1)
- world << "\blue The mode is now: [master_mode]"
+ log_admin("[key_name(usr)] set the mode as [config.mode_names[master_mode]].")
+ message_admins("\blue [key_name_admin(usr)] set the mode as [config.mode_names[master_mode]].", 1)
+ world << "\blue The mode is now: [config.mode_names[master_mode]]"
Game() // updates the main game menu
world.save_mode(master_mode)
.(href, list("c_mode"=1))
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index 46cead5a3b..1f09ea251c 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -76,7 +76,7 @@
stat("Game Mode:", "Secret")
else
if(ticker.hide_mode == 0)
- stat("Game Mode:", "[master_mode]") // Old setting for showing the game mode
+ stat("Game Mode:", "[config.mode_names[master_mode]]") // Old setting for showing the game mode
if(ticker.current_state == GAME_STATE_PREGAME)
stat("Time To Start:", "[ticker.pregame_timeleft][round_progressing ? "" : " (DELAYED)"]")
diff --git a/code/unit_tests/unit_test.dm b/code/unit_tests/unit_test.dm
index b8acf60c21..a090548623 100644
--- a/code/unit_tests/unit_test.dm
+++ b/code/unit_tests/unit_test.dm
@@ -75,7 +75,7 @@ var/total_unit_tests = 0
//
// Check the async tests to see if they are finished.
- //
+ //
while(async_test.len)
for(var/datum/unit_test/test in async_test)
diff --git a/html/changelogs/Sin4 - miscfixes.yml b/html/changelogs/Sin4 - miscfixes.yml
new file mode 100644
index 0000000000..ae61151c33
--- /dev/null
+++ b/html/changelogs/Sin4 - miscfixes.yml
@@ -0,0 +1,37 @@
+################################
+# 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
+# wip (For works in progress)
+# tweak
+# soundadd
+# sounddel
+# rscadd (general adding of nice things)
+# rscdel (general deleting of nice things)
+# imageadd
+# imagedel
+# maptweak
+# spellcheck (typo fixes)
+# experiment
+#################################
+
+# Your name.
+author: Sin4
+
+# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - bugfix: "Fixed ERT icon not showing up properly for sechuds."
+ - tweak: "Fixed instances of the game mode's config_tag being displayed instead of the game mode name."
diff --git a/icons/mob/hud.dmi b/icons/mob/hud.dmi
index b6d4ba748d..18238c0543 100644
Binary files a/icons/mob/hud.dmi and b/icons/mob/hud.dmi differ