Iiiiit's merge conflict time!

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_allocation
2026-07-21 03:55:05 +01:00 · 2016-08-07 23:42:02 -07:00
parent 7db4094a38 7a2edce535
commit 031dd2bb3d
100 changed files with 1166 additions and 700 deletions
@@ -1252,6 +1252,7 @@
 		message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] back to the Lobby.")

 		var/mob/new_player/NP = new()
+		non_respawnable_keys -= M.ckey
 		NP.ckey = M.ckey
 		qdel(M)