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
@@ -165,7 +165,7 @@ SUBSYSTEM_DEF(vote)

 			var/admin = FALSE
 			var/ckey = ckey(initiator_key)
-			if((GLOB.admin_datums[ckey]) || (ckey in GLOB.deadmins))
+			if(GLOB.admin_datums[ckey])
 				admin = TRUE

 			if(next_allowed_time > world.time && !admin)