From a17d42a84c9be84f544d4355972e97921b3106ff Mon Sep 17 00:00:00 2001 From: SinTwo Date: Fri, 5 Aug 2016 16:27:07 -0400 Subject: [PATCH] mode name and ert sechud fix --- code/controllers/voting.dm | 2 +- code/modules/admin/topic.dm | 6 ++-- code/modules/mob/new_player/new_player.dm | 2 +- code/unit_tests/unit_test.dm | 2 +- html/changelogs/Sin4 - miscfixes.yml | 37 ++++++++++++++++++++++ icons/mob/hud.dmi | Bin 6766 -> 3512 bytes 6 files changed, 43 insertions(+), 6 deletions(-) create mode 100644 html/changelogs/Sin4 - miscfixes.yml diff --git a/code/controllers/voting.dm b/code/controllers/voting.dm index e6f88731b6f..aa06984f692 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 cf98ede72f1..261c95515a7 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 46cead5a3b9..1f09ea251c2 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 b8acf60c218..a090548623c 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 00000000000..ae61151c33b --- /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 b6d4ba748dccebe924f946d98730552cce04ba27..18238c0543c494b940bfeee433c3babba3999313 100644 GIT binary patch literal 3512 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 literal 6766 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 ijsE;goo(O9IW_7#