Merge branch 'master' into development

This commit is contained in:
skull132
2017-03-06 01:01:12 +02:00
23 changed files with 542 additions and 167 deletions
-5
View File
@@ -194,11 +194,6 @@
return
// Antag contest shit
if (href_list["contest_action"] && config.antag_contest_enabled)
src.process_contest_topic(href_list)
return
..() //redirect to hsrc.()
/client/proc/handle_spam_prevention(var/message, var/mute_type)