Merge remote-tracking branch 'upstream/master' into morepreferences

This commit is contained in:
Yoshax
2016-03-27 00:17:24 +00:00
229 changed files with 3262 additions and 2386 deletions

View File

@@ -161,7 +161,7 @@ var/syndicate_code_response//Code response for traitors.
Obviously, some people will be better at this than others but in theory, everyone should be able to do it and it only enhances roleplay.
Can probably be done through "{ }" but I don't really see the practical benefit.
One example of an earlier system is commented below.
/N
-N
*/
/proc/generate_code_phrase()//Proc is used for phrase and response in master_controller.dm