Merge repair

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

@@ -46,6 +46,7 @@
 	new /obj/item/weapon/cartridge/janitor(src)
 	new /obj/item/clothing/gloves/black(src)
 	new /obj/item/clothing/head/soft/purple(src)
+	new /obj/item/clothing/head/beret/jan(src)
 	new /obj/item/device/flashlight(src)
 	new /obj/item/weapon/caution(src)
 	new /obj/item/weapon/caution(src)

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

@@ -29,6 +29,8 @@
 		new /obj/item/clothing/suit/armor/captain(src)
 		new /obj/item/weapon/melee/telebaton(src)
 		new /obj/item/clothing/under/dress/dress_cap(src)
+		new /obj/item/clothing/head/helmet/formalcaptain(src)
+		new /obj/item/clothing/under/captainformal(src)
 		return
 
 
@@ -82,6 +84,7 @@
 		new /obj/item/clothing/shoes/leather(src)
 		new /obj/item/clothing/shoes/white(src)
 		new /obj/item/clothing/under/rank/head_of_personnel_whimsy(src)
+		new /obj/item/clothing/head/helmet/hop(src)
 		return
 
 

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

@@ -401,3 +401,23 @@
 	new /obj/item/clothing/shoes/jackboots(src)
 	new /obj/item/clothing/gloves/black(src)
 	return
+
+/obj/structure/closet/wardrobe/suit
+	name = "suit locker"
+	icon_state = "mixed"
+	icon_closed = "mixed"
+
+/obj/structure/closet/wardrobe/suit/New()
+	..()
+	new /obj/item/clothing/under/assistantformal(src)
+	new /obj/item/clothing/under/suit_jacket/charcoal(src)
+	new /obj/item/clothing/under/suit_jacket/navy(src)
+	new /obj/item/clothing/under/suit_jacket/burgundy(src)
+	new /obj/item/clothing/under/suit_jacket/checkered(src)
+	new /obj/item/clothing/under/suit_jacket/tan(src)
+	new /obj/item/clothing/under/sl_suit(src)
+	new /obj/item/clothing/under/suit_jacket(src)
+	new /obj/item/clothing/under/suit_jacket/female(src)
+	new /obj/item/clothing/under/suit_jacket/really_black(src)
+	new /obj/item/clothing/under/suit_jacket/red(src)
+	new /obj/item/clothing/under/scratch(src)