Merge branch 'master' into upstream-merge-33246

code/modules/clothing/under/accessories.dm

@@ -15,11 +15,11 @@
 		if(U.pockets) // storage items conflict
 			return FALSE
 
-		pockets.loc = U
+		pockets.forceMove(U)
 		U.pockets = pockets
 
 	U.attached_accessory = src
-	loc = U
+	forceMove(U)
 	layer = FLOAT_LAYER
 	plane = FLOAT_PLANE
 	if(minimize_when_attached)
@@ -39,7 +39,7 @@
 
 /obj/item/clothing/accessory/proc/detach(obj/item/clothing/under/U, user)
 	if(pockets && pockets == U.pockets)
-		pockets.loc = src
+		pockets.forceMove(src)
 		U.pockets = null
 
 	for(var/armor_type in armor)

code/modules/clothing/under/miscellaneous.dm

@@ -662,7 +662,6 @@
 	name = "envirosuit extinguisher cartridge"
 	desc = "A cartridge loaded with a compressed extinguisher mix, used to refill the automatic extinguisher on plasma envirosuits."
 	icon_state = "plasmarefill"
-	origin_tech = "materials=2;plasmatech=3;biotech=1"
 
 /obj/item/clothing/under/rank/security/navyblue/russian
 	name = "russian officer's uniform"