From 95e9cdde8d7c8caaf4e06de6eab695b90069bdd5 Mon Sep 17 00:00:00 2001 From: Kilakk Date: Sun, 21 Jul 2013 19:25:18 -0400 Subject: [PATCH 1/3] Fixed a really stupid batch mistake --- maptools/new_clean.bat | 2 +- maptools/new_prepare.bat | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/maptools/new_clean.bat b/maptools/new_clean.bat index 019d90bc2e2..9d9ec108b5d 100644 --- a/maptools/new_clean.bat +++ b/maptools/new_clean.bat @@ -89,7 +89,7 @@ goto :qm_error echo ... echo That wasn't a valid response, or you didn't choose anything! echo Valid responses: y, n, yes, no -goto :quitmayber +goto :quitmaybe :exit pause diff --git a/maptools/new_prepare.bat b/maptools/new_prepare.bat index d3c3849a9a4..ddcdfabe1cb 100644 --- a/maptools/new_prepare.bat +++ b/maptools/new_prepare.bat @@ -65,7 +65,7 @@ goto :qm_error echo ... echo That wasn't a valid response, or you didn't choose anything! echo Valid responses: y, n, yes, no -goto :quitmayber +goto :quitmaybe :exit pause From afeb753f8e9c72fc3172fe29526e446793e02cc4 Mon Sep 17 00:00:00 2001 From: Kilakk Date: Sun, 21 Jul 2013 19:26:05 -0400 Subject: [PATCH 2/3] Cleaned up vote oocmute a tad --- code/controllers/voting.dm | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/code/controllers/voting.dm b/code/controllers/voting.dm index 8c31d17f6c1..7fc7f20b8fc 100644 --- a/code/controllers/voting.dm +++ b/code/controllers/voting.dm @@ -59,8 +59,8 @@ datum/controller/vote if(auto_muted && !ooc_allowed) auto_muted = 0 ooc_allowed = !( ooc_allowed ) - world << "The OOC channel has been automatically enabled due to vote cancellation." - log_admin("OOC was toggled automatically due to vote cancellation.") + world << "The OOC channel has been automatically enabled due to vote end." + log_admin("OOC was toggled automatically due to vote end.") message_admins("OOC has been toggled on automatically.") @@ -154,12 +154,6 @@ datum/controller/vote if("crew_transfer") if(. == "Initiate Crew Transfer") init_shift_change(null, 1) - if(auto_muted && !ooc_allowed) - auto_muted = 0 - ooc_allowed = !( ooc_allowed ) - world << "The OOC channel has been automatically enabled due to vote end." - log_admin("OOC was toggled automatically due to vote end.") - message_admins("OOC has been toggled on automatically.") if(restart) @@ -235,7 +229,7 @@ datum/controller/vote if(mode == "crew_transfer" && ooc_allowed) auto_muted = 1 ooc_allowed = !( ooc_allowed ) - world << "The OOC channel has been automatically disabled due to the crew transfer vote." + world << "The OOC channel has been automatically disabled due to a crew transfer vote." log_admin("OOC was toggled automatically due to crew_transfer vote.") message_admins("OOC has been toggled off automatically.") if(mode == "gamemode" && ooc_allowed) @@ -247,7 +241,7 @@ datum/controller/vote if(mode == "custom" && ooc_allowed) auto_muted = 1 ooc_allowed = !( ooc_allowed ) - world << "The OOC channel has been automatically disabled due to the custom vote." + world << "The OOC channel has been automatically disabled due to a custom vote." log_admin("OOC was toggled automatically due to custom vote.") message_admins("OOC has been toggled off automatically.") From e9483415d311c4df64a8f4c403cd84da4bdad1eb Mon Sep 17 00:00:00 2001 From: Kilakk Date: Sun, 21 Jul 2013 19:38:32 -0400 Subject: [PATCH 3/3] Fixes #3326 - uncommented admin-ERT verb --- code/modules/admin/admin_verbs.dm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 63400f73e8f..fee4b0bdeaf 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -69,9 +69,7 @@ var/list/admin_verbs_admin = list( /client/proc/check_customitem_activity, /client/proc/man_up, /client/proc/global_man_up - /* Currently unticked. - /client/proc/response_team - */ + /client/proc/response_team // Response Teams admin verb ) var/list/admin_verbs_ban = list( /client/proc/unban_panel, @@ -764,4 +762,4 @@ var/list/admin_verbs_mod = list( T << 'sound/voice/ManUp1.ogg' log_admin("[key_name(usr)] told everyone to man up and deal with it.") - message_admins("\blue [key_name_admin(usr)] told everyone to man up and deal with it.", 1) + message_admins("\blue [key_name_admin(usr)] told everyone to man up and deal with it.", 1)