diff --git a/code/WorkInProgress/Sigyn/Department Sec/jobs.dm b/code/WorkInProgress/Sigyn/Department Sec/jobs.dm
index cd38d78f7a8..aa306ab4240 100644
--- a/code/WorkInProgress/Sigyn/Department Sec/jobs.dm
+++ b/code/WorkInProgress/Sigyn/Department Sec/jobs.dm
@@ -112,17 +112,13 @@ var/list/sec_departments = list("engineering", "supply", "medical", "science")
keyslot2 = new /obj/item/device/encryptionkey/headset_sci
/obj/item/clothing/under/rank/security/cargo/New()
- var/obj/item/clothing/tie/armband/cargo/A = new /obj/item/clothing/tie/armband/cargo
- hastie = A
+ attachTie(new /obj/item/clothing/tie/armband/cargo)
/obj/item/clothing/under/rank/security/engine/New()
- var/obj/item/clothing/tie/armband/engine/A = new /obj/item/clothing/tie/armband/engine
- hastie = A
+ attachTie(new /obj/item/clothing/tie/armband/engine)
/obj/item/clothing/under/rank/security/science/New()
- var/obj/item/clothing/tie/armband/science/A = new /obj/item/clothing/tie/armband/science
- hastie = A
+ attachTie(new /obj/item/clothing/tie/armband/science)
/obj/item/clothing/under/rank/security/med/New()
- var/obj/item/clothing/tie/armband/medgreen/A = new /obj/item/clothing/tie/armband/medgreen
- hastie = A
\ No newline at end of file
+ attachTie(new /obj/item/clothing/tie/armband/medgreen)
\ No newline at end of file
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index bb70f37ffc6..20c059bfbd1 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -158,15 +158,22 @@ BLIND // can't see anything
var/obj/item/clothing/tie/hastie = null
/obj/item/clothing/under/attackby(obj/item/I, mob/user)
+ attachTie(I, user)
+ ..()
+
+/obj/item/clothing/under/proc/attachTie(obj/item/I, mob/user)
if(istype(I, /obj/item/clothing/tie))
if(hastie)
- user << "[src] already has an accessory."
+ if(user)
+ user << "[src] already has an accessory."
return
else
- user.drop_item()
+ if(user)
+ user.drop_item()
hastie = I
I.loc = src
- user << "You attach [I] to [src]."
+ if(user)
+ user << "You attach [I] to [src]."
I.transform *= 0.5 //halve the size so it doesn't overpower the under
I.pixel_x += 8
I.pixel_y -= 8
@@ -180,7 +187,6 @@ BLIND // can't see anything
return
- ..()
/obj/item/clothing/under/examine()
set src in view()