cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-19 03:55:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:tgstation/-tg-station

Browse Source 
Conflicts:
	code/modules/mob/new_player/new_player.dm
This commit is contained in:
Pete Goodfellow
2013-04-01 16:29:36 +01:00
parent 98b37444d0 881e933072
commit 842d9028d3
7 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/randomverbs.dm
+4 -4
View File
@@ -780,12 +780,12 @@ Traitors and the like can also be revived with the previous role mostly intact.
set name = "Make Everyone Random"
set desc = "Make everyone have a random appearance. You can only use this before rounds!"
if (ticker && ticker.mode)
if(ticker && ticker.mode)
usr << "Nope you can't do this, the game's already started. This only works before rounds!"
return
if(ticker.random_players)
ticker.random_players = 0
if(config.force_random_names)
config.force_random_names = 0
message_admins("Admin [key_name_admin(usr)] has disabled \"Everyone is Special\" mode.", 1)
usr << "Disabled."
return
@@ -803,7 +803,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
usr << "<i>Remember: you can always disable the randomness by using the verb again, assuming the round hasn't started yet</i>."
ticker.random_players = 1
config.force_random_names = 1
feedback_add_details("admin_verb","MER") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!