diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm index 17aacdd3b3..c65befb822 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm @@ -139,3 +139,11 @@ Talon pin /datum/gear/accessory/altevian_badge display_name = "altevian badge" path = /obj/item/clothing/accessory/altevian_badge + +/datum/gear/accessory/maid_neck + display_name = "maid neck cover" + path = /obj/item/clothing/accessory/maid_neck + +/datum/gear/accessory/maid_corset + display_name = "maid corset" + path = /obj/item/clothing/accessory/maidcorset 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 269f9e7aa9..92a7cd24d4 100644 --- a/code/modules/client/preference_setup/loadout/loadout_gloves_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_gloves_vr.dm @@ -25,4 +25,8 @@ /datum/gear/gloves/siren display_name = "gloves, Siren" - path = /obj/item/clothing/gloves/fluff/siren \ No newline at end of file + path = /obj/item/clothing/gloves/fluff/siren + +/datum/gear/gloves/maid_arms + display_name = "maid arm covers" + path = /obj/item/clothing/gloves/maid_arms diff --git a/code/modules/client/preference_setup/loadout/loadout_head_vr.dm b/code/modules/client/preference_setup/loadout/loadout_head_vr.dm index 43f8451dbe..d3da18ccb8 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head_vr.dm @@ -11,14 +11,21 @@ display_name = "basic headband" path = /obj/item/clothing/head/fluff/headbando -/datum/gear/head/maid - display_name = "maid headband" - path = /obj/item/clothing/head/headband/maid - /datum/gear/head/headbando/New() ..() gear_tweaks += gear_tweak_free_color_choice +/datum/gear/head/maid + display_name = "maid headband selection" + path = /obj/item/clothing/head/headband/maid + +/datum/gear/head/maid/New() + ..() + var/list/headbands_list = list() + for(var/obj/item/clothing/head/bands as anything in typesof(/obj/item/clothing/head/headband/maid)) + headbands_list[initial(bands.name)] = bands + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(headbands_list)) + //Detective alternative /datum/gear/head/detective_alt display_name = "cyberscope headgear, detective" diff --git a/code/modules/client/preference_setup/loadout/loadout_shoes_vr.dm b/code/modules/client/preference_setup/loadout/loadout_shoes_vr.dm index dab191f306..4a436ddb72 100644 --- a/code/modules/client/preference_setup/loadout/loadout_shoes_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_shoes_vr.dm @@ -20,3 +20,11 @@ /datum/gear/shoes/toeless display_name = "toe-less jackboots" path = /obj/item/clothing/shoes/boots/jackboots/toeless + +/datum/gear/shoes/singer_blue + display_name = "blue performer's boots" + path = /obj/item/clothing/shoes/boots/singer + +/datum/gear/shoes/singer_yellow + display_name = "yellow performer's boots" + path = /obj/item/clothing/shoes/boots/singer/yellow diff --git a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm index b55654dd40..88e6a481dc 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm @@ -152,3 +152,7 @@ Talon winter coat /datum/gear/suit/cyberpunk_recolorable/New() gear_tweaks += gear_tweak_free_color_choice + +/datum/gear/suit/shrine_maiden + display_name = "shrine maiden costume" + path = /obj/item/clothing/suit/shrine_maiden diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index 6af0fd78ce..9a734a1370 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -138,9 +138,17 @@ /obj/item/clothing/gloves/maid_arms name = "maid arm covers" - desc = "Cylindrical looking tubes that go over your arm, weird." + 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" @@ -177,5 +185,3 @@ name = "water wings" desc = "Swim aids designed to help a wearer float in water and learn to swim." icon_state = "waterwings" - - diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 7734817ba3..a8758ef361 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -15,7 +15,7 @@ desc = "a small metal ring, floating above it's wearer." icon_state = "halo" -/obj/item/clothing/head/maid_headband +/obj/item/clothing/head/headband/maid/modern name = "maid headband" desc = "Just like from my Japanese cartoons!" icon_state = "maid_headband" diff --git a/code/modules/clothing/shoes/boots.dm b/code/modules/clothing/shoes/boots.dm index 662aeb746c..3b67295c31 100644 --- a/code/modules/clothing/shoes/boots.dm +++ b/code/modules/clothing/shoes/boots.dm @@ -242,12 +242,12 @@ armor = list(melee = 80, bullet = 60, laser = 50,energy = 25, bomb = 50, bio = 10, rad = 0) siemens_coefficient = 0.6 -/obj/item/clothing/shoes/boots/bsing +/obj/item/clothing/shoes/boots/singer name = "blue performer's boots" desc = "These boots were made for dancing." icon_state = "bsing" -/obj/item/clothing/shoes/boots/ysing +/obj/item/clothing/shoes/boots/singer/yellow name = "yellow performer's boots" desc = "These boots were made for dancing." - icon_state = "ysing" \ No newline at end of file + icon_state = "ysing" diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 01ee539e19..b2df62ef7c 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -278,7 +278,7 @@ item_state_slots = list(slot_r_hand_str = "red_labcoat", slot_l_hand_str = "red_labcoat") /obj/item/clothing/suit/shrine_maiden - name = "Shrine maiden costume." + name = "shrine maiden costume" desc = "Makes you want to exterminate some troublesome youkai." icon_state = "shrine_maiden" body_parts_covered = LOWER_TORSO|UPPER_TORSO|LEGS|ARMS @@ -1049,4 +1049,4 @@ icon_state = "marine" body_parts_covered = FEET|LOWER_TORSO|UPPER_TORSO|LEGS flags_inv = HIDESHOES|HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER - item_state_slots = list(slot_r_hand_str = "green_labcoat", slot_l_hand_str = "green_labcoat") \ No newline at end of file + item_state_slots = list(slot_r_hand_str = "green_labcoat", slot_l_hand_str = "green_labcoat") diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 0e5fab0a08..09fd7995f0 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -181,6 +181,19 @@ desc = "The final touch that holds it all together." icon_state = "maidcorset" +/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." + 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." @@ -593,4 +606,4 @@ /obj/item/clothing/accessory/pride/vore name = "vore pride pin" - icon_state = "pride_vore" \ No newline at end of file + icon_state = "pride_vore" diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 3cd9f11f16..2550699cac 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -362,7 +362,7 @@ /obj/item/clothing/under/dress/maid/under_maid name = "cute maid uniform" - desc = "You're going to use this for housekeeping, right?." + desc = "You're going to use this for housekeeping, right?" icon_state = "under_maid" /obj/item/clothing/under/dress/dress_fire @@ -592,12 +592,12 @@ desc = "A waistline this high is just made for ripping bodices, swashing buckles, or - just occasionally - sucking blood." icon_state = "gayvampire" -/obj/item/clothing/under/dress/bsing +/obj/item/clothing/under/dress/singer name = "blue singer dress" desc = "Just looking at this makes you want to sing." icon_state = "bsing" -/obj/item/clothing/under/dress/ysing +/obj/item/clothing/under/dress/singer/yellow name = "yellow singer dress" desc = "Just looking at this makes you want to sing." icon_state = "ysing" diff --git a/code/modules/economy/vending_machines_vr.dm b/code/modules/economy/vending_machines_vr.dm index 0e0c1b37cf..122f21bee3 100644 --- a/code/modules/economy/vending_machines_vr.dm +++ b/code/modules/economy/vending_machines_vr.dm @@ -1435,14 +1435,14 @@ /obj/item/clothing/shoes/knight_costume/black = 3, /obj/item/clothing/suit/storage/hooded/foodcostume/hotdog = 3, /obj/item/clothing/suit/storage/hooded/foodcostume/turnip = 3, - /obj/item/clothing/under/dress/bsing = 3, - /obj/item/clothing/shoes/boots/bsing = 3, - /obj/item/clothing/under/dress/ysing = 3, - /obj/item/clothing/shoes/boots/ysing = 3, + /obj/item/clothing/under/dress/singer = 3, + /obj/item/clothing/shoes/boots/singer = 3, + /obj/item/clothing/under/dress/singer/yellow = 3, + /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/head/maid_headband = 3, + /obj/item/clothing/head/headband/maid/modern = 3, /obj/item/clothing/accessory/maidcorset = 3, /obj/item/clothing/suit/shrine_maiden = 3) prices = list(/obj/item/clothing/suit/storage/hooded/costume/carp = 200, @@ -1512,14 +1512,14 @@ /obj/item/clothing/shoes/knight_costume/black = 200, /obj/item/clothing/suit/storage/hooded/foodcostume/hotdog = 200, /obj/item/clothing/suit/storage/hooded/foodcostume/turnip = 200, - /obj/item/clothing/under/dress/bsing = 200, - /obj/item/clothing/shoes/boots/bsing = 50, - /obj/item/clothing/under/dress/ysing = 200, - /obj/item/clothing/shoes/boots/ysing = 50, + /obj/item/clothing/under/dress/singer = 200, + /obj/item/clothing/shoes/boots/singer = 50, + /obj/item/clothing/under/dress/singer/yellow = 200, + /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/head/maid_headband = 25, + /obj/item/clothing/head/headband/maid/modern = 25, /obj/item/clothing/accessory/maidcorset = 25, /obj/item/clothing/suit/shrine_maiden = 200) premium = list(/obj/item/clothing/suit/imperium_monk = 3, @@ -1681,14 +1681,14 @@ /obj/item/clothing/gloves/combat/knight_costume/brown = 3, /obj/item/clothing/shoes/knight_costume = 3, /obj/item/clothing/shoes/knight_costume/black = 3, - /obj/item/clothing/under/dress/bsing = 3, - /obj/item/clothing/shoes/boots/bsing = 3, - /obj/item/clothing/under/dress/ysing = 3, - /obj/item/clothing/shoes/boots/ysing = 3, + /obj/item/clothing/under/dress/singer = 3, + /obj/item/clothing/shoes/boots/singer = 3, + /obj/item/clothing/under/dress/singer/yellow = 3, + /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/head/maid_headband = 3, + /obj/item/clothing/head/headband/maid/modern = 3, /obj/item/clothing/accessory/maidcorset = 3, /obj/item/clothing/suit/shrine_maiden = 3) @@ -2474,14 +2474,14 @@ /obj/item/clothing/suit/drake_cloak = 2, /obj/item/clothing/head/syndicatefake = 1, /obj/item/clothing/suit/syndicatefake = 1, - /obj/item/clothing/under/dress/bsing = 3, - /obj/item/clothing/shoes/boots/bsing = 3, - /obj/item/clothing/under/dress/ysing = 3, - /obj/item/clothing/shoes/boots/ysing = 3, + /obj/item/clothing/under/dress/singer = 3, + /obj/item/clothing/shoes/boots/singer = 3, + /obj/item/clothing/under/dress/singer/yellow = 3, + /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/head/maid_headband = 3, + /obj/item/clothing/head/headband/maid/modern = 3, /obj/item/clothing/accessory/maidcorset = 3, /obj/item/clothing/suit/shrine_maiden = 3 ) diff --git a/icons/inventory/accessory/item.dmi b/icons/inventory/accessory/item.dmi index 3743797a00..b803b2fc37 100644 Binary files a/icons/inventory/accessory/item.dmi and b/icons/inventory/accessory/item.dmi differ diff --git a/icons/inventory/accessory/mob.dmi b/icons/inventory/accessory/mob.dmi index 4e89fd8635..4909848e7a 100644 Binary files a/icons/inventory/accessory/mob.dmi and b/icons/inventory/accessory/mob.dmi differ