cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-28 11:03:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleaned up vote oocmute a tad

Browse Source
This commit is contained in:
Kilakk
2013-07-21 19:26:05 -04:00
parent 95e9cdde8d
commit afeb753f8e
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/controllers/voting.dm
View File

@@ -59,8 +59,8 @@ datum/controller/vote
if(auto_muted && !ooc_allowed) if(auto_muted && !ooc_allowed)
auto_muted = 0 auto_muted = 0
ooc_allowed = !( ooc_allowed ) ooc_allowed = !( ooc_allowed )
world << "<b>The OOC channel has been automatically enabled due to vote cancellation.</b>" world << "<b>The OOC channel has been automatically enabled due to vote end.</b>"
log_admin("OOC was toggled automatically due to vote cancellation.") log_admin("OOC was toggled automatically due to vote end.")
message_admins("OOC has been toggled on automatically.") message_admins("OOC has been toggled on automatically.")
@@ -154,12 +154,6 @@ datum/controller/vote
if("crew_transfer") if("crew_transfer")
if(. == "Initiate Crew Transfer") if(. == "Initiate Crew Transfer")
init_shift_change(null, 1) init_shift_change(null, 1)
if(auto_muted && !ooc_allowed)
auto_muted = 0
ooc_allowed = !( ooc_allowed )
world << "<b>The OOC channel has been automatically enabled due to vote end.</b>"
log_admin("OOC was toggled automatically due to vote end.")
message_admins("OOC has been toggled on automatically.")
if(restart) if(restart)
@@ -235,7 +229,7 @@ datum/controller/vote
if(mode == "crew_transfer" && ooc_allowed) if(mode == "crew_transfer" && ooc_allowed)
auto_muted = 1 auto_muted = 1
ooc_allowed = !( ooc_allowed ) ooc_allowed = !( ooc_allowed )
world << "<b>The OOC channel has been automatically disabled due to the crew transfer vote.</b>" world << "<b>The OOC channel has been automatically disabled due to a crew transfer vote.</b>"
log_admin("OOC was toggled automatically due to crew_transfer vote.") log_admin("OOC was toggled automatically due to crew_transfer vote.")
message_admins("OOC has been toggled off automatically.") message_admins("OOC has been toggled off automatically.")
if(mode == "gamemode" && ooc_allowed) if(mode == "gamemode" && ooc_allowed)
@@ -247,7 +241,7 @@ datum/controller/vote
if(mode == "custom" && ooc_allowed) if(mode == "custom" && ooc_allowed)
auto_muted = 1 auto_muted = 1
ooc_allowed = !( ooc_allowed ) ooc_allowed = !( ooc_allowed )
world << "<b>The OOC channel has been automatically disabled due to the custom vote.</b>" world << "<b>The OOC channel has been automatically disabled due to a custom vote.</b>"
log_admin("OOC was toggled automatically due to custom vote.") log_admin("OOC was toggled automatically due to custom vote.")
message_admins("OOC has been toggled off automatically.") message_admins("OOC has been toggled off automatically.")