Fix accessories being added to pockets (#8331)

discordia-space · Oct 6, 2023 · ccdbcf9 · ccdbcf9
1 parent 4ce31ca
commit ccdbcf9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm
@@ -98,5 +98,6 @@
 	..(over_object)
 
 /obj/item/clothing/suit/space/medicus/attackby(obj/item/W, mob/user)
+	if(!istype(W, /obj/item/clothing/accessory)) // Do not put accessories into pockets
+		pockets.attackby(W, user)
 	..()
-	pockets.attackby(W, user)
diff --git a/code/modules/clothing/spacesuits/void/station.dm b/code/modules/clothing/spacesuits/void/station.dm
@@ -447,8 +447,9 @@
 	..(over_object)
 
 /obj/item/clothing/suit/space/void/riggedvoidsuit/attackby(obj/item/W, mob/user)
+	if(!istype(W, /obj/item/clothing/accessory)) // Do not put accessories into pockets
+		pockets.attackby(W, user)
 	..()
-	pockets.attackby(W, user)
 
 /obj/item/clothing/suit/space/void/riggedvoidsuit/emp_act(severity)
 	pockets.emp_act(severity)

diff --git a/code/modules/clothing/suits/storage.dm b/code/modules/clothing/suits/storage.dm
@@ -26,8 +26,9 @@
 	..(over_object)
 
 /obj/item/clothing/suit/storage/attackby(obj/item/W, mob/user)
+	if(!istype(W, /obj/item/clothing/accessory)) // Do not put accessories into pockets
+		pockets.attackby(W, user)
 	..()
-	pockets.attackby(W, user)
 
 /obj/item/clothing/suit/storage/emp_act(severity)
 	pockets.emp_act(severity)