From afeb753f8e9c72fc3172fe29526e446793e02cc4 Mon Sep 17 00:00:00 2001 From: Kilakk Date: Sun, 21 Jul 2013 19:26:05 -0400 Subject: [PATCH] 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.")