diff --git a/code/modules/clothing/accessories/accessory.dm b/code/modules/clothing/accessories/accessory.dm index 7610687a9a0..8850256b0cd 100644 --- a/code/modules/clothing/accessories/accessory.dm +++ b/code/modules/clothing/accessories/accessory.dm @@ -8,6 +8,7 @@ slot_flags = SLOT_TIE w_class = ITEMSIZE_SMALL var/slot = ACCESSORY_SLOT_DECOR + var/can_remove = TRUE // Can it be taken off once attached? var/obj/item/clothing/has_suit = null // The suit the tie may be attached to var/image/inv_overlay = null // Overlay used when attached to clothing. var/image/mob_overlay = null diff --git a/code/modules/clothing/accessories/torch.dm b/code/modules/clothing/accessories/torch.dm index 4c299d8b7f3..aa701ceee26 100644 --- a/code/modules/clothing/accessories/torch.dm +++ b/code/modules/clothing/accessories/torch.dm @@ -462,6 +462,7 @@ department tags desc = "Coloured panelling denoting assignment to a specific department." icon_state = "gorka_dept" on_rolled = list("down" = "none") + can_remove = FALSE /obj/item/clothing/accessory/gorka/department/civilian name = "civilian insignia" @@ -513,6 +514,7 @@ department tags desc = "Silver trim denoting a higher rank within one's department." icon_state = "gorka_rank" on_rolled = list("down" = "none") + can_remove = FALSE /********* ranks - ec diff --git a/code/modules/clothing/clothing_accessories.dm b/code/modules/clothing/clothing_accessories.dm index 4e2dd1b9628..106e5ea44d8 100644 --- a/code/modules/clothing/clothing_accessories.dm +++ b/code/modules/clothing/clothing_accessories.dm @@ -135,7 +135,11 @@ A = tgui_input_list(usr, "Select an accessory to remove from \the [src]", "Accessory Choice", accessories) if(A) - remove_accessory(usr,A) + if(A.can_remove) + remove_accessory(usr,A) + else + to_chat(usr, span_warning("It doesn't look like \the [A] can be taken off \the [src].")) + if(!LAZYLEN(accessories)) src.verbs -= /obj/item/clothing/proc/removetie_verb