cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 19:44:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3329 from Kilakk/master

Browse Source 
Small batch fix, voting cleanup, admin-ERT verb uncomment
This commit is contained in:
Mloc
2013-07-21 16:40:02 -07:00
parent 2288dc8abf e9483415d3
commit 09c17452e8
4 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/voting.dm
+4 -10
View File
@@ -59,8 +59,8 @@ datum/controller/vote
if(auto_muted && !ooc_allowed)
auto_muted = 0
ooc_allowed = !( ooc_allowed )
world << "<b>The OOC channel has been automatically enabled due to vote cancellation.</b>"
log_admin("OOC was toggled automatically due to vote cancellation.")
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.")
@@ -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 << "<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)
@@ -235,7 +229,7 @@ datum/controller/vote
if(mode == "crew_transfer" && ooc_allowed)
auto_muted = 1
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.")
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 << "<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.")
message_admins("OOC has been toggled off automatically.")
code/modules/admin/admin_verbs.dm
+2 -4
View File
@@ -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)
maptools/new_clean.bat
+1 -1
View File
@@ -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
maptools/new_prepare.bat
+1 -1
View File
@@ -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