Merge branch 'master' into ItemNameFixingRound3

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

@@ -12,7 +12,7 @@
 /obj/structure/closet/syndicate/personal/New()
 	..()
 	sleep(2)
-	new /obj/item/weapon/tank/jetpack/oxygen(src)
+	new /obj/item/weapon/tank/jetpack/oxygen/harness(src)
 	new /obj/item/clothing/mask/gas/syndicate(src)
 	new /obj/item/clothing/under/syndicate(src)
 	new /obj/item/clothing/head/helmet/space/rig/syndi(src)

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

@@ -120,8 +120,8 @@
 
 /obj/structure/closet/wardrobe/yellow
 	name = "yellow wardrobe"
-	icon_state = "wardrobe-y"
-	icon_closed = "wardrobe-y"
+	icon_state = "yellow"
+	icon_closed = "yeloww"
 
 /obj/structure/closet/wardrobe/yellow/New()
 	new /obj/item/clothing/under/color/yellow(src)
@@ -135,8 +135,8 @@
 
 /obj/structure/closet/wardrobe/atmospherics_yellow
 	name = "atmospherics wardrobe"
-	icon_state = "yellow"
-	icon_closed = "yellow"
+	icon_state = "atmos"
+	icon_closed = "atmos"
 
 /obj/structure/closet/wardrobe/atmospherics_yellow/New()
 	new /obj/item/clothing/under/rank/atmospheric_technician(src)

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

@@ -378,23 +378,3 @@
 			src.req_access += pick(get_all_accesses())
 	..()
 
-
-/obj/structure/closet/crate/ex_act(severity)
-	switch(severity)
-		if(1.0)
-			for(var/obj/O in src.contents)
-				del(O)
-			del(src)
-			return
-		if(2.0)
-			for(var/obj/O in src.contents)
-				if(prob(50))
-					del(O)
-			del(src)
-			return
-		if(3.0)
-			if (prob(50))
-				del(src)
-			return
-		else
-	return