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

This commit is contained in:
Remie Richards
2016-09-10 20:28:23 +01:00
216 changed files with 4331 additions and 1228 deletions
+1 -1
View File
@@ -151,7 +151,7 @@ var/global/normal_ooc_colour = OOC_COLOR
usr << "<span class='notice'>Sorry, that function is not enabled on this server.</span>"
return
show_note(usr, null, 1)
show_note(usr.ckey, null, 1)
/client/proc/ignore_key(client)
var/client/C = client