Merge remote-tracking branch 'citadel/master' into mobility_flags

2020-01-19 23:12:17 -07:00
parent fce8e18ccc 0f4f07dc95
commit 89e204b980
20 changed files with 167 additions and 126 deletions
@@ -22,6 +22,8 @@
 			if(!(M.ckey in timeouts))
 				timeouts += M.ckey
 				timeouts[M.ckey] = 0
+			else if(timeouts[M.ckey] == CANT_REENTER_ROUND)
+				return
 			timeouts[M.ckey] = max(timeouts[M.ckey],penalty)

 /datum/element/ghost_role_eligibility/Detach(mob/M)