Atoms #11768

code/game/objects/items/storage/backpack.dm

@@ -618,11 +618,23 @@
 
 // Captain gets Capdrobe, other heads need some storage
 
-/obj/item/storage/backpack/duffelbag/hop/clothing
+/obj/item/storage/backpack/duffelbag/clothing
+	name = "Clothing Dufflebag"
+	desc = "Dufflebag designed for clothing in mind"
+
+/obj/item/storage/backpack/duffelbag/clothing/ComponentInitialize()
+	. = ..()
+	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+	STR.max_items = 35
+	STR.max_w_class = WEIGHT_CLASS_BULKY
+	STR.max_combined_w_class = 60
+	STR.set_holdable(list(/obj/item/clothing))
+
+/obj/item/storage/backpack/duffelbag/clothing/hop
 	name = "Head of Personnels clothing duffelbag"
 	desc = "A large duffel bag filled with clothing."
 
-/obj/item/storage/backpack/duffelbag/hop/clothing/PopulateContents()
+/obj/item/storage/backpack/duffelbag/clothing/hop/PopulateContents()
 	new /obj/item/clothing/under/rank/head_of_personnel(src)
 	new /obj/item/clothing/under/rank/head_of_personnel/skirt(src)
 	new /obj/item/clothing/head/hopcap(src)
@@ -632,11 +644,11 @@
 	new /obj/item/clothing/suit/armor/vest/sovietcoat(src)
 	new /obj/item/clothing/under/yogs/hopcasual(src)
 
-/obj/item/storage/backpack/duffelbag/rd/clothing
+/obj/item/storage/backpack/duffelbag/clothing/rd
 	name = "Research Directors clothing duffelbag"
 	desc = "A large duffel bag filled with clothing."
 
-/obj/item/storage/backpack/duffelbag/rd/clothing/PopulateContents()
+/obj/item/storage/backpack/duffelbag/clothing/rd/PopulateContents()
 	new /obj/item/clothing/neck/yogs/shawl/rd(src) //Yogs
 	new /obj/item/clothing/suit/bio_suit/scientist(src)
 	new /obj/item/clothing/head/bio_hood/scientist(src)
@@ -649,13 +661,14 @@
 	new /obj/item/clothing/under/rank/research_director/turtleneck/skirt(src)
 	new /obj/item/clothing/shoes/sneakers/brown(src)
 	new /obj/item/clothing/under/yogs/rdema(src)
-	new /obj/item/clothing/shoes/xeno_wraps/command(src)
 
-/obj/item/storage/backpack/duffelbag/engineering/chief/clothing
+/obj/item/storage/backpack/duffelbag/clothing/ce
 	name = "Chief Engineers clothing duffelbag"
 	desc = "A large duffel bag filled with clothing."
+	item_state = "duffel-eng"
+	icon_state = "duffel-eng"
 
-/obj/item/storage/backpack/duffelbag/engineering/chief/clothing/PopulateContents()
+/obj/item/storage/backpack/duffelbag/clothing/ce/PopulateContents()
 	new /obj/item/clothing/neck/yogs/shawl/ce(src) //Yogs
 	new /obj/item/clothing/under/rank/chief_engineer(src)
 	new /obj/item/clothing/under/rank/chief_engineer/skirt(src)
@@ -670,13 +683,15 @@
 	new /obj/item/clothing/suit/hazardvest(src)
 	new /obj/item/clothing/mask/gas(src)
 	new /obj/item/clothing/glasses/meson/engine(src)
-	new /obj/item/clothing/shoes/xeno_wraps/command(src)
 
-/obj/item/storage/backpack/duffelbag/sec/detective/clothing
+/obj/item/storage/backpack/duffelbag/clothing/sec
+	icon_state = "duffel-sec"
+	item_state = "duffel-sec"
+/obj/item/storage/backpack/duffelbag/clothing/sec/detective
 	name = "Detective's clothing duffelbag"
 	desc = "A large duffel bag filled with clothing."
 
-/obj/item/storage/backpack/duffelbag/sec/detective/clothing/PopulateContents()
+/obj/item/storage/backpack/duffelbag/clothing/sec/detective/PopulateContents()
 	new /obj/item/clothing/under/rank/det(src)
 	new /obj/item/clothing/under/rank/det/skirt(src)
 	new /obj/item/clothing/suit/det_suit(src)
@@ -689,7 +704,6 @@
 	new /obj/item/clothing/suit/det_suit/noir(src)
 	new /obj/item/clothing/head/fedora(src)
 	new /obj/item/clothing/shoes/laceup(src)
-	new /obj/item/clothing/shoes/xeno_wraps/jackboots(src)
 	new /obj/item/clothing/under/yogs/forensictech(src)
 	new /obj/item/clothing/under/yogs/bluedetective(src)
 	new /obj/item/clothing/under/yogs/golddetective(src)
@@ -699,11 +713,11 @@
 	new /obj/item/clothing/suit/yogs/detectivecoat(src)
 	new /obj/item/clothing/suit/yogs/bluedetective(src)
 
-/obj/item/storage/backpack/duffelbag/sec/warden/clothing
+/obj/item/storage/backpack/duffelbag/clothing/sec/warden
 	name = "Warden's clothing duffelbag"
 	desc = "A large duffel bag filled with clothing."
 
-/obj/item/storage/backpack/duffelbag/sec/warden/clothing/PopulateContents()
+/obj/item/storage/backpack/duffelbag/clothing/sec/warden/PopulateContents()
 	new /obj/item/clothing/under/yogs/ocelot(src)
 	new /obj/item/clothing/under/yogs/krofficer(src)
 	new /obj/item/clothing/head/beret/corpwarden(src)
@@ -716,11 +730,11 @@
 	new /obj/item/clothing/under/rank/warden/skirt(src)
 	new /obj/item/clothing/shoes/jackboots/warden(src)
 
-/obj/item/storage/backpack/duffelbag/sec/head/clothing
+/obj/item/storage/backpack/duffelbag/clothing/sec/head
 	name = "Head of Security's clothing duffelbag"
 	desc = "A large duffel bag filled with clothing."
 
-/obj/item/storage/backpack/duffelbag/sec/head/clothing/PopulateContents()
+/obj/item/storage/backpack/duffelbag/clothing/sec/head/PopulateContents()
 	new /obj/item/clothing/under/hosparadefem(src)
 	new /obj/item/clothing/under/hosparademale(src)
 	new /obj/item/clothing/suit/armor/vest/leather(src)
@@ -739,13 +753,14 @@
 	new /obj/item/clothing/under/yogs/hoslatenight(src)
 	new /obj/item/clothing/under/yogs/hoscasual(src)
 	new /obj/item/clothing/suit/armor/vest/hosjacket(src)
-	new /obj/item/clothing/shoes/xeno_wraps/command(src)
 
-/obj/item/storage/backpack/duffelbag/med/chief/clothing
+/obj/item/storage/backpack/duffelbag/clothing/med/chief
 	name = "Chief Medical Officer's clothing duffelbag"
 	desc = "A large duffel bag filled with clothing."
+	icon_state = "duffel-med"
+	item_state = "duffel-med"
 
-/obj/item/storage/backpack/duffelbag/med/chief/clothing/PopulateContents()
+/obj/item/storage/backpack/duffelbag/clothing/med/chief/PopulateContents()
 	new /obj/item/clothing/suit/bio_suit/cmo(src)
 	new /obj/item/clothing/head/bio_hood/cmo(src)
 	new /obj/item/clothing/suit/toggle/labcoat/cmo(src)
@@ -754,4 +769,3 @@
 	new /obj/item/clothing/shoes/sneakers/brown(src)
 	new /obj/item/clothing/neck/yogs/shawl/cmo(src) //Yogs
 	new /obj/item/clothing/head/beret/cmo(src)
-	new /obj/item/clothing/shoes/xeno_wraps/command(src)

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

@@ -25,7 +25,7 @@
 	new /obj/item/energy_harvester(src)
 	new /obj/item/clipboard/yog/paperwork/ce(src)
 	new /obj/item/poster/firstsingularity(src)
-	new /obj/item/storage/backpack/duffelbag/engineering/chief/clothing(src)
+	new /obj/item/storage/backpack/duffelbag/clothing/ce(src)
 
 /obj/structure/closet/secure_closet/engineering_electrical
 	name = "electrical supplies locker"
@@ -90,4 +90,4 @@
 	new /obj/item/clothing/suit/fire/atmos(src)
 	new /obj/item/clothing/head/hardhat/atmos(src)
 	new /obj/item/clothing/glasses/meson/engine/tray(src)
-	new /obj/item/extinguisher/advanced(src)
+	new /obj/item/extinguisher/advanced(src)

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

@@ -69,7 +69,7 @@
 	new /obj/item/circuitboard/machine/techfab/department/medical(src)
 	new /obj/item/storage/photo_album/CMO(src)
 	new /obj/item/clipboard/yog/paperwork/cmo(src)
-	new /obj/item/storage/backpack/duffelbag/med/chief/clothing(src)
+	new /obj/item/storage/backpack/duffelbag/clothing/med/chief(src)
 
 
 /obj/structure/closet/secure_closet/paramedic

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

@@ -19,4 +19,4 @@
 	new /obj/item/circuitboard/machine/techfab/department/science(src)
 	new /obj/item/storage/photo_album/RD(src)
 	new /obj/item/clipboard/yog/paperwork/rd(src)
-	new /obj/item/storage/backpack/duffelbag/rd/clothing(src)
+	new /obj/item/storage/backpack/duffelbag/clothing/rd(src)

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

@@ -42,7 +42,7 @@
 	new /obj/item/storage/photo_album/HoP(src)
 	new /obj/item/clipboard/yog/paperwork/hop(src)
 	new /obj/item/gun/energy/e_gun/mini(src) //hop doesn't get a proper gun
-	new /obj/item/storage/backpack/duffelbag/hop/clothing(src)
+	new /obj/item/storage/backpack/duffelbag/clothing/hop(src)
 
 /obj/structure/closet/secure_closet/hos
 	name = "\proper head of security's locker"
@@ -69,7 +69,7 @@
 	new /obj/item/storage/photo_album/HoS(src)
 	new /obj/item/clipboard/yog/paperwork/hos(src)
 	new /obj/item/radio/security(src)
-	new /obj/item/storage/backpack/duffelbag/sec/head/clothing(src)
+	new /obj/item/storage/backpack/duffelbag/clothing/sec/head(src)
 
 /obj/structure/closet/secure_closet/warden
 	name = "\proper warden's locker"
@@ -93,7 +93,7 @@
 	new /obj/item/gun/ballistic/shotgun/automatic/combat/compact(src)
 	new /obj/item/clipboard/yog/paperwork/warden(src)
 	new /obj/item/radio/security(src)
-	new /obj/item/storage/backpack/duffelbag/sec/warden/clothing(src)
+	new /obj/item/storage/backpack/duffelbag/clothing/sec/warden(src)
 
 /obj/structure/closet/secure_closet/security
 	name = "security officer's locker"
@@ -172,7 +172,7 @@
 	new /obj/item/storage/belt/holster/full(src)
 	new /obj/item/pinpointer/crew(src)
 	new /obj/item/twohanded/binoculars(src)
-	new /obj/item/storage/backpack/duffelbag/sec/detective/clothing(src)
+	new /obj/item/storage/backpack/duffelbag/clothing/sec/detective(src)
 
 /obj/structure/closet/secure_closet/injection
 	name = "lethal injections"
@@ -303,7 +303,7 @@
 
 /obj/structure/closet/secure_closet/physician/PopulateContents()
 	..()
-	new /obj/item/storage/backpack/duffelbag/sec/physician/clothing(src)
+	new /obj/item/storage/backpack/duffelbag/clothing/sec/physician(src)
 	new /obj/item/cartridge/medical(src)
 	new /obj/item/radio/headset/headset_medsec(src)
 	new /obj/item/storage/belt/medical(src)

yogstation/code/game/objects/items/storage/backpack.dm

@@ -212,11 +212,11 @@
 	item_state = "clownfacebackpack"
 
 //Clothing Bags
-/obj/item/storage/backpack/duffelbag/sec/physician/clothing
+/obj/item/storage/backpack/duffelbag/clothing/sec/physician
 	name = "Brig Physician's clothing duffelbag"
 	desc = "A large duffel bag filled with clothing."
 
-/obj/item/storage/backpack/duffelbag/sec/physician/clothing/PopulateContents()
+/obj/item/storage/backpack/duffelbag/clothing/sec/physician/PopulateContents()
 	new /obj/item/clothing/under/yogs/rank/physician(src)
 	new /obj/item/clothing/suit/toggle/labcoat/emt/physician(src)
 	new /obj/item/clothing/head/soft/emt/phys(src)