Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13

2026-08-23 21:27:23 +01:00 · 2021-02-21 23:29:09 -03:00
parent 95ec3e5024 d7b20d27c2
commit 98e11d88a9
221 changed files with 1082 additions and 806 deletions
@@ -257,9 +257,8 @@

 		for(var/mob/M in GLOB.player_list)
 			if(M.ckey == banckey)
-				playermob = M
-				break
-
+				if(!playermob || M.client) // prioritise mobs with a client to stop the 'oops the dead body with no client got forwarded'
+					playermob = M

 		banreason = "(MANUAL BAN) "+banreason