Merge branch 'master' into afk-subsystem-2

code/modules/client/client defines.dm

@@ -20,7 +20,6 @@
 	var/skip_antag = FALSE //TRUE when a player declines to be included for the selection process of game mode antagonists.
 	var/move_delay		= 1
 	var/moving			= null
-	var/adminobs		= null
 	var/area			= null
 	var/time_died_as_mouse = null //when the client last died as a mouse
 

code/modules/client/preference/preferences_mysql.dm

@@ -320,6 +320,10 @@
 	if(!rlimb_data) src.rlimb_data = list()
 	if(!loadout_gear) loadout_gear = list()
 
+	// Check if the current body accessory exists
+	if(!GLOB.body_accessory_by_name[body_accessory])
+		body_accessory = null
+
 	return 1
 
 /datum/preferences/proc/save_character(client/C)