Complying with suggestions. Also stops dnr observers from getting ghost role notifications

2019-10-20 09:15:35 +02:00
parent f73516a17f
commit ec22088534
15 changed files with 69 additions and 50 deletions
@@ -43,9 +43,8 @@
 		return
 	if(isobserver(user))
 		var/mob/dead/observer/O = user
-		if(O.reenter_round_timeout > world.realtime)
-			to_chat(user, "<span class='warning'>You are unable to reenter the round yet. Your ghost role blacklist will expire in [round((O.reenter_round_timeout - world.realtime)/600)] minutes.</span>")
-			return
+		if(!O.can_reenter_round())
+			return FALSE
 	var/ghost_role = alert(latejoinercalling ? "Latejoin as [mob_name]? (This is a ghost role, and as such, it's very likely to be off-station.)" : "Become [mob_name]? (Warning, You can no longer be cloned!)",,"Yes","No")
 	if(ghost_role == "No" || !loc)
 		return