diff --git a/code/game/jobs/role_authority.dm b/code/game/jobs/role_authority.dm
index 42ffc22570..55841a9a8a 100644
--- a/code/game/jobs/role_authority.dm
+++ b/code/game/jobs/role_authority.dm
@@ -209,6 +209,15 @@ I hope it's easier to tell what the heck this proc is even doing, unlike previou
 	for(var/mob/new_player/M in GLOB.player_list) //Get all players who are ready.
 		if(!M.ready || M.job)
 			continue
+	// [RU-PVE-EDIT]
+		if(M.client.total_enter_lock)
+			to_chat(M, SPAN_NOTICE("You have BLACKLISTED from entering!"))
+			return
+		if(!enter_allowed)
+			if(!check_rights(, show_msg = FALSE) && M.client.enter_lock_bypass)
+				to_chat(M, SPAN_NOTICE("There is an administrative lock on entering the game!"))
+				return
+	// [/RU-PVE-EDIT]
 
 		unassigned_players += M
 
diff --git a/void-marines/code/admin_tools.dm b/void-marines/code/admin_tools.dm
index f68b4d8339..fdb9c3caa4 100644
--- a/void-marines/code/admin_tools.dm
+++ b/void-marines/code/admin_tools.dm
@@ -141,3 +141,9 @@
 		/client/proc/allow_to_join,
 		/client/proc/gm_lighting,
 	))
+
+/mob/dead/join_as_freed_mob()
+	if(usr.client.total_enter_lock)
+		to_chat(usr, SPAN_WARNING("You have BLACKLISTED from entering!"))
+		return
+	. = ..()