everything but mob stuff

code/modules/clothing/under/accessories.dm

@@ -9,15 +9,15 @@
 	w_class = WEIGHT_CLASS_SMALL
 	var/above_suit = FALSE
 	var/minimize_when_attached = TRUE // TRUE if shown as a small icon in corner, FALSE if overlayed
+	var/datum/component/storage/detached_pockets
 
 /obj/item/clothing/accessory/proc/attach(obj/item/clothing/under/U, user)
-	if(pockets) // Attach storage to jumpsuit
-		if(U.pockets) // storage items conflict
+	GET_COMPONENT(storage, /datum/component/storage)
+	if(storage)
+		if(U.SendSignal(COMSIG_CONTAINS_STORAGE))
 			return FALSE
-
-		pockets.forceMove(U)
-		U.pockets = pockets
-
+		U.TakeComponent(storage)
+		detached_pockets = storage
 	U.attached_accessory = src
 	forceMove(U)
 	layer = FLOAT_LAYER
@@ -41,11 +41,9 @@
 
 	return TRUE
 
-
 /obj/item/clothing/accessory/proc/detach(obj/item/clothing/under/U, user)
-	if(pockets && pockets == U.pockets)
-		pockets.forceMove(src)
-		U.pockets = null
+	if(detached_pockets && detached_pockets.parent == U)
+		TakeComponent(detached_pockets)
 
 	U.armor = U.armor.detachArmor(armor)
 
@@ -301,14 +299,18 @@
 	desc = "Can protect your clothing from ink stains, but you'll look like a nerd if you're using one."
 	icon_state = "pocketprotector"
 	item_color = "pocketprotector"
-	pockets = /obj/item/storage/internal/pocket/pocketprotector
+	pocket_storage_component_path = /datum/component/storage/concrete/pockets/pocketprotector
 
-/obj/item/clothing/accessory/pocketprotector/full
-	pockets = /obj/item/storage/internal/pocket/pocketprotector/full
-
-/obj/item/clothing/accessory/pocketprotector/cosmetology
-	pockets = /obj/item/storage/internal/pocket/pocketprotector/cosmetology
+/obj/item/clothing/accessory/pocketprotector/full/Initialize()
+	. = ..()
+	new /obj/item/pen/red(src)
+	new /obj/item/pen(src)
+	new /obj/item/pen/blue(src)
 
+/obj/item/clothing/accessory/pocketprotector/cosmetology/Initialize()
+	. = ..()
+	for(var/i in 1 to 3)
+		new /obj/item/lipstick/random(src)
 
 ////////////////
 //OONGA BOONGA//
@@ -321,7 +323,6 @@
 	item_color = "talisman"
 	armor = list("melee" = 5, "bullet" = 5, "laser" = 5, "energy" = 5, "bomb" = 20, "bio" = 20, "rad" = 5, "fire" = 0, "acid" = 25)
 
-
 /obj/item/clothing/accessory/skullcodpiece
 	name = "skull codpiece"
 	desc = "A skull shaped ornament, intended to protect the important things in life."