Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research

This commit is contained in:
LatD
2016-05-25 18:45:31 +03:00
139 changed files with 5077 additions and 972 deletions

View File

@@ -141,7 +141,7 @@
user << "<span class='warning'>This MMI does not seem to fit!</span>"
return
if(M.syndiemmi)
if(M.hacked)
user << "<span class='warning'>This MMI does not seem to fit!</span>"
return