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

This commit is contained in:
Razharas
2014-01-23 04:08:10 +04:00
29 changed files with 233 additions and 309 deletions

View File

@@ -164,5 +164,5 @@
if(R.emagged == 1)
return 0
R.emagged = 1
R.SetEmagged(1)
return 1