Merge branch 'master' into upstream-merge-33246

2017-12-20 00:27:06 -06:00
parent 5f69eac050 de967e2d8e
commit 92c347d068
808 changed files with 14650 additions and 10287 deletions
@@ -26,9 +26,6 @@

 	reload_fullscreen() // Reload any fullscreen overlays this mob has.

-	if(ckey in GLOB.deadmins)
-		verbs += /client/proc/readmin
-
 	add_click_catcher()

 	sync_mind()