diff --git a/code/modules/client/preference_setup/loadout/loadout_gloves_vr.dm b/code/modules/client/preference_setup/loadout/loadout_gloves_vr.dm index 92a7cd24d4f..cfc0a6b1053 100644 --- a/code/modules/client/preference_setup/loadout/loadout_gloves_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_gloves_vr.dm @@ -29,4 +29,4 @@ /datum/gear/gloves/maid_arms display_name = "maid arm covers" - path = /obj/item/clothing/gloves/maid_arms + path = /obj/item/clothing/accessory/maid_arms diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index 9a734a13704..709c6ea1560 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -136,19 +136,6 @@ drop_sound = 'sound/items/drop/metalboots.ogg' pickup_sound = 'sound/items/pickup/toolbox.ogg' -/obj/item/clothing/gloves/maid_arms - name = "maid arm covers" - desc = "Cylindrical looking tubes that go over your arms, weird." - description_info = "Can be adjusted with alt-click to be worn as a uniform accessory." - icon_state = "maid_arms" - -/obj/item/clothing/gloves/maid_arms/AltClick(mob/user) - if(Adjacent(user)) - to_chat(user, SPAN_NOTICE("You adjust [src].")) - var/obj/item/clothing/accessory/maid_arms/new_accessory = new /obj/item/clothing/accessory/maid_arms(get_turf(user)) - user.put_in_any_hand_if_possible(new_accessory) - qdel(src) - /obj/item/clothing/gloves/ranger var/glovecolor = "white" name = "ranger gloves" diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index a8758ef361e..f0851e780a3 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -16,7 +16,7 @@ icon_state = "halo" /obj/item/clothing/head/headband/maid/modern - name = "maid headband" + name = "modern maid headband" desc = "Just like from my Japanese cartoons!" icon_state = "maid_headband" diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 09fd7995f01..4ac91a10c76 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -183,17 +183,12 @@ /obj/item/clothing/accessory/maid_arms name = "maid arm covers" - desc = "Cylindrical looking tubes that go over your arms, weird. Tightened enough to attach to uniforms." - description_info = "Can be adjusted with alt-click to be worn as gloves." + desc = "Cylindrical looking tubes that go over your arms, weird." + slot_flags = SLOT_GLOVES | SLOT_TIE + body_parts_covered = ARMS + description_info = "Wearable as gloves, or attachable to uniforms. May visually conflict with actual gloves when attached to uniforms. Caveat emptor." icon_state = "maid_arms" -/obj/item/clothing/accessory/maid_arms/AltClick(mob/user) - if(Adjacent(user)) - to_chat(user, SPAN_NOTICE("You adjust [src].")) - var/obj/item/clothing/gloves/maid_arms/new_gloves = new /obj/item/clothing/gloves/maid_arms(get_turf(user)) - user.put_in_any_hand_if_possible(new_gloves) - qdel(src) - /obj/item/clothing/accessory/stethoscope name = "stethoscope" desc = "An outdated medical apparatus for listening to the sounds of the human body. It also makes you look like you know what you're doing." diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 2550699cac2..083588739fb 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -361,7 +361,7 @@ icon_state = "sexymaid" /obj/item/clothing/under/dress/maid/under_maid - name = "cute maid uniform" + name = "modern maid costume" desc = "You're going to use this for housekeeping, right?" icon_state = "under_maid" diff --git a/code/modules/economy/vending_machines_vr.dm b/code/modules/economy/vending_machines_vr.dm index 122f21bee3a..1161a8604ab 100644 --- a/code/modules/economy/vending_machines_vr.dm +++ b/code/modules/economy/vending_machines_vr.dm @@ -1441,7 +1441,7 @@ /obj/item/clothing/shoes/boots/singer/yellow = 3, /obj/item/clothing/under/dress/maid/under_maid = 3, /obj/item/clothing/accessory/maid_neck = 3, - /obj/item/clothing/gloves/maid_arms = 3, + /obj/item/clothing/accessory/maid_arms = 3, /obj/item/clothing/head/headband/maid/modern = 3, /obj/item/clothing/accessory/maidcorset = 3, /obj/item/clothing/suit/shrine_maiden = 3) @@ -1518,7 +1518,7 @@ /obj/item/clothing/shoes/boots/singer/yellow = 50, /obj/item/clothing/under/dress/maid/under_maid = 200, /obj/item/clothing/accessory/maid_neck = 25, - /obj/item/clothing/gloves/maid_arms = 25, + /obj/item/clothing/accessory/maid_arms = 25, /obj/item/clothing/head/headband/maid/modern = 25, /obj/item/clothing/accessory/maidcorset = 25, /obj/item/clothing/suit/shrine_maiden = 200) @@ -1687,7 +1687,7 @@ /obj/item/clothing/shoes/boots/singer/yellow = 3, /obj/item/clothing/under/dress/maid/under_maid = 3, /obj/item/clothing/accessory/maid_neck = 3, - /obj/item/clothing/gloves/maid_arms = 3, + /obj/item/clothing/accessory/maid_arms = 3, /obj/item/clothing/head/headband/maid/modern = 3, /obj/item/clothing/accessory/maidcorset = 3, /obj/item/clothing/suit/shrine_maiden = 3) @@ -2480,7 +2480,7 @@ /obj/item/clothing/shoes/boots/singer/yellow = 3, /obj/item/clothing/under/dress/maid/under_maid = 3, /obj/item/clothing/accessory/maid_neck = 3, - /obj/item/clothing/gloves/maid_arms = 3, + /obj/item/clothing/accessory/maid_arms = 3, /obj/item/clothing/head/headband/maid/modern = 3, /obj/item/clothing/accessory/maidcorset = 3, /obj/item/clothing/suit/shrine_maiden = 3