Merge branch 'master' into development

# Conflicts:
#	code/modules/client/preference_setup/loadout/loadout_xeno.dm
#	code/modules/customitems/item_defines.dm

code/game/objects/structures/crates_lockers/closets.dm

@@ -7,6 +7,7 @@
 	w_class = 5
 	var/icon_closed = "closed"
 	var/icon_opened = "open"
+	var/welded_overlay_state = "welded"
 	var/opened = 0
 	var/welded = 0
 	var/wall_mounted = 0 //never solid (You can always pass over it)
@@ -355,7 +356,7 @@
 	if(!opened)
 		icon_state = icon_closed
 		if(welded)
-			add_overlay("welded")
+			add_overlay(welded_overlay_state)
 	else
 		icon_state = icon_opened
 

code/game/objects/structures/crates_lockers/closets/utility_closets.dm

@@ -185,6 +185,7 @@
 	icon_state = "hydrant"
 	icon_closed = "hydrant"
 	icon_opened = "hydrant_open"
+	welded_overlay_state = "welded_wallcloset"
 	anchored = 1
 	density = 0
 	wall_mounted = 1
@@ -209,6 +210,7 @@
 	icon_state = "medical_wall"
 	icon_closed = "medical_wall"
 	icon_opened = "medical_wall_open"
+	welded_overlay_state = "welded_wallcloset"
 	anchored = 1
 	density = 0
 	wall_mounted = 1