Merge remote-tracking branch 'origin/master' into rustsql

2021-02-23 11:36:05 +08:00
parent 0bb5ec3316 d1475285b3
commit 5c39381117
222 changed files with 1149 additions and 610 deletions
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -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