diff --git a/_maps/map_files/NebulaStation/NebulaStation.dmm b/_maps/map_files/NebulaStation/NebulaStation.dmm index f589a03dcbe..c8a83a4cf8a 100644 --- a/_maps/map_files/NebulaStation/NebulaStation.dmm +++ b/_maps/map_files/NebulaStation/NebulaStation.dmm @@ -16906,10 +16906,8 @@ /obj/effect/turf_decal/siding/dark_blue{ dir = 8 }, -/obj/item/clothing/gloves/maid, /obj/item/clothing/accessory/maidapron, /obj/item/clothing/under/costume/maid, -/obj/item/clothing/neck/maid, /obj/effect/spawner/random/clothing/kittyears_or_rabbitears, /obj/structure/disposalpipe/segment{ dir = 9 diff --git a/_maps/map_files/wawastation/wawastation.dmm b/_maps/map_files/wawastation/wawastation.dmm index 01c6a5934e5..0fe05fbe936 100644 --- a/_maps/map_files/wawastation/wawastation.dmm +++ b/_maps/map_files/wawastation/wawastation.dmm @@ -52186,8 +52186,6 @@ /area/station/science/robotics/lab) "saY" = ( /obj/structure/table/wood, -/obj/item/clothing/gloves/maid, -/obj/item/clothing/neck/maid, /obj/effect/decal/cleanable/blood/old, /turf/open/floor/plating, /area/station/maintenance/central/greater) diff --git a/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm b/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm index 18d54a58c6f..8eddea6a931 100644 --- a/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm +++ b/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm @@ -879,3 +879,41 @@ /datum/greyscale_config/fedora/worn name = "Fedora (Worn)" icon_file = 'icons/mob/clothing/head/hats.dmi' + +/datum/greyscale_config/maid + name = "Maid Uniform" + icon_file = 'icons/obj/clothing/under/costume.dmi' + json_config = 'code/datums/greyscale/json_configs/maid.json' + +/datum/greyscale_config/maid/worn + name = "Maid Uniform(Worn)" + icon_file = 'icons/mob/clothing/under/costume.dmi' + +/datum/greyscale_config/maid_inhands_left + name = "Maid Uniform Inhands Left" + icon_file = 'icons/mob/inhands/clothing/suits_lefthand.dmi' + json_config = 'code/datums/greyscale/json_configs/maid.json' + +/datum/greyscale_config/maid_inhands_right + name = "Maid Uniform Inhands Right" + icon_file = 'icons/mob/inhands/clothing/suits_righthand.dmi' + json_config = 'code/datums/greyscale/json_configs/maid.json' + +/datum/greyscale_config/maid_headband + name = "Maid Headband" + icon_file = 'icons/obj/clothing/head/costume.dmi' + json_config = 'code/datums/greyscale/json_configs/maid.json' + +/datum/greyscale_config/maid_headband/worn + name = "Maid Headband(Worn)" + icon_file = 'icons/mob/clothing/head/costume.dmi' + +/datum/greyscale_config/maid_headband_inhands_left + name = "Maid Headband Inhands Left" + icon_file = 'icons/mob/inhands/clothing/hats_lefthand.dmi' + json_config = 'code/datums/greyscale/json_configs/maid.json' + +/datum/greyscale_config/maid_headband_inhands_right + name = "Maid Headband Inhands Right" + icon_file = 'icons/mob/inhands/clothing/hats_righthand.dmi' + json_config = 'code/datums/greyscale/json_configs/maid.json' diff --git a/code/datums/greyscale/json_configs/maid.json b/code/datums/greyscale/json_configs/maid.json new file mode 100644 index 00000000000..fd670433bdb --- /dev/null +++ b/code/datums/greyscale/json_configs/maid.json @@ -0,0 +1,16 @@ +{ + "maid": [ + { + "type": "icon_state", + "icon_state": "maid_base", + "blend_mode": "overlay", + "color_ids": [1] + }, + { + "type": "icon_state", + "icon_state": "maid_frill", + "blend_mode": "overlay", + "color_ids": [2] + } + ] +} diff --git a/code/game/objects/effects/spawners/random/clothing.dm b/code/game/objects/effects/spawners/random/clothing.dm index 62bb9d4e130..27f3bd0bc8e 100644 --- a/code/game/objects/effects/spawners/random/clothing.dm +++ b/code/game/objects/effects/spawners/random/clothing.dm @@ -204,7 +204,7 @@ /obj/item/clothing/head/costume/cueball, /obj/item/clothing/head/costume/snowman, /obj/item/clothing/head/costume/witchwig, - /obj/item/clothing/head/costume/maidheadband, + /obj/item/clothing/head/costume/maid_headband, /obj/item/clothing/head/costume/chicken, /obj/item/clothing/head/costume/griffin, /obj/item/clothing/head/costume/xenos, diff --git a/code/modules/clothing/gloves/costume.dm b/code/modules/clothing/gloves/costume.dm index e7d23ac870f..d91ef97d0e2 100644 --- a/code/modules/clothing/gloves/costume.dm +++ b/code/modules/clothing/gloves/costume.dm @@ -1,10 +1,3 @@ -/obj/item/clothing/gloves/maid - name = "maid arm covers" - desc = "Cylindrical looking tubes that go over your arm, weird." - icon_state = "maid_arms" - inhand_icon_state = null - greyscale_colors = null - /obj/item/clothing/gloves/kim name = "aerostatic gloves" desc = "Breathable red gloves for expert handling of a pen and notebook." diff --git a/code/modules/clothing/head/costume.dm b/code/modules/clothing/head/costume.dm index 4c6f507f22a..f7b746335f4 100644 --- a/code/modules/clothing/head/costume.dm +++ b/code/modules/clothing/head/costume.dm @@ -50,10 +50,19 @@ inhand_icon_state = null flags_inv = HIDEHAIR -/obj/item/clothing/head/costume/maidheadband +/obj/item/clothing/head/costume/maid_headband name = "maid headband" desc = "Just like from one of those chinese cartoons!" - icon_state = "maid_headband" + greyscale_colors = "#494955#EEEEEE" + icon = 'icons/map_icons/clothing/head/_head.dmi' + icon_state = "/obj/item/clothing/head/costume/maid" + post_init_icon_state = "maid" + greyscale_config = /datum/greyscale_config/maid_headband + greyscale_config_worn = /datum/greyscale_config/maid_headband/worn + greyscale_config_inhand_left = /datum/greyscale_config/maid_headband_inhands_left + greyscale_config_inhand_right = /datum/greyscale_config/maid_headband_inhands_right + inhand_icon_state = "maid" + flags_1 = IS_PLAYER_COLORABLE_1 /obj/item/clothing/head/costume/chicken name = "chicken suit head" diff --git a/code/modules/clothing/neck/_neck.dm b/code/modules/clothing/neck/_neck.dm index 9d82b152de8..236238a2272 100644 --- a/code/modules/clothing/neck/_neck.dm +++ b/code/modules/clothing/neck/_neck.dm @@ -223,11 +223,6 @@ greyscale_config_worn = null greyscale_colors = null -/obj/item/clothing/neck/maid - name = "maid neck cover" - desc = "A neckpiece for a maid costume, it smells faintly of disappointment." - icon_state = "maid_neck" - /obj/item/clothing/neck/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/accessories/vests.dm b/code/modules/clothing/under/accessories/vests.dm index d3b5c5642f0..969279d3f29 100644 --- a/code/modules/clothing/under/accessories/vests.dm +++ b/code/modules/clothing/under/accessories/vests.dm @@ -25,16 +25,6 @@ minimize_when_attached = TRUE attachment_slot = NONE -/obj/item/clothing/accessory/maidcorset - name = "maid corset" - desc = "The final touch that holds it all together." - icon_state = "maidcorset" - inhand_icon_state = "maidapron" - lefthand_file = 'icons/mob/inhands/clothing/suits_lefthand.dmi' - righthand_file = 'icons/mob/inhands/clothing/suits_righthand.dmi' - minimize_when_attached = FALSE - attachment_slot = NONE - /obj/item/clothing/accessory/maidapron name = "maid apron" desc = "The best part of a maid costume." diff --git a/code/modules/clothing/under/costume.dm b/code/modules/clothing/under/costume.dm index 87b0f330dad..edc416fcf5c 100644 --- a/code/modules/clothing/under/costume.dm +++ b/code/modules/clothing/under/costume.dm @@ -115,18 +115,21 @@ /obj/item/clothing/under/costume/maid name = "maid costume" desc = "Maid in China." - icon_state = "maid" + greyscale_colors = "#494955#EEEEEE" + icon = 'icons/map_icons/clothing/under/costume.dmi' + icon_state = "/obj/item/clothing/under/costume/maid" + post_init_icon_state = "maid" + greyscale_config = /datum/greyscale_config/maid + greyscale_config_worn = /datum/greyscale_config/maid/worn + greyscale_config_inhand_left = /datum/greyscale_config/maid_inhands_left + greyscale_config_inhand_right = /datum/greyscale_config/maid_inhands_right inhand_icon_state = "maid" + flags_1 = IS_PLAYER_COLORABLE_1 body_parts_covered = CHEST|GROIN female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY - supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON + alternate_worn_layer = UNDER_SUIT_LAYER can_adjust = FALSE -/obj/item/clothing/under/costume/maid/Initialize(mapload) - . = ..() - var/obj/item/clothing/accessory/maidcorset/A = new (src) - attach_accessory(A) - /obj/item/clothing/under/costume/geisha name = "geisha suit" desc = "Cute space ninja senpai not included." diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm index f6234aa4421..76b17e94787 100644 --- a/code/modules/vending/autodrobe.dm +++ b/code/modules/vending/autodrobe.dm @@ -144,10 +144,8 @@ GLOBAL_LIST_INIT(autodrobe_service_items, list( /obj/item/clothing/under/suit/waiter = 4, /obj/item/clothing/suit/apron = 3, /obj/item/clothing/suit/apron/overalls = 3, - /obj/item/clothing/head/costume/maidheadband = 3, + /obj/item/clothing/head/costume/maid_headband = 3, /obj/item/clothing/under/costume/maid = 3, - /obj/item/clothing/gloves/maid = 3, - /obj/item/clothing/neck/maid = 3, /obj/item/clothing/under/rank/civilian/janitor/maid = 3, /obj/item/clothing/accessory/maidapron = 3, )) diff --git a/icons/map_icons/clothing/head/_head.dmi b/icons/map_icons/clothing/head/_head.dmi index 7de809ebd80..4032ed9f102 100644 Binary files a/icons/map_icons/clothing/head/_head.dmi and b/icons/map_icons/clothing/head/_head.dmi differ diff --git a/icons/map_icons/clothing/under/costume.dmi b/icons/map_icons/clothing/under/costume.dmi index 4e4975cce13..4402789a4c5 100644 Binary files a/icons/map_icons/clothing/under/costume.dmi and b/icons/map_icons/clothing/under/costume.dmi differ diff --git a/icons/mob/clothing/accessories.dmi b/icons/mob/clothing/accessories.dmi index 0e09772a79f..a04df45555a 100644 Binary files a/icons/mob/clothing/accessories.dmi and b/icons/mob/clothing/accessories.dmi differ diff --git a/icons/mob/clothing/hands.dmi b/icons/mob/clothing/hands.dmi index fc27f07c6d2..68433ebef7c 100644 Binary files a/icons/mob/clothing/hands.dmi and b/icons/mob/clothing/hands.dmi differ diff --git a/icons/mob/clothing/head/costume.dmi b/icons/mob/clothing/head/costume.dmi index 585eaaa87a5..f3f29788961 100644 Binary files a/icons/mob/clothing/head/costume.dmi and b/icons/mob/clothing/head/costume.dmi differ diff --git a/icons/mob/clothing/neck.dmi b/icons/mob/clothing/neck.dmi index aed8261f011..91424a70486 100644 Binary files a/icons/mob/clothing/neck.dmi and b/icons/mob/clothing/neck.dmi differ diff --git a/icons/mob/clothing/under/costume.dmi b/icons/mob/clothing/under/costume.dmi index 65643aa8db6..cb3aa993571 100644 Binary files a/icons/mob/clothing/under/costume.dmi and b/icons/mob/clothing/under/costume.dmi differ diff --git a/icons/mob/inhands/clothing/hats_lefthand.dmi b/icons/mob/inhands/clothing/hats_lefthand.dmi index 1566b0e8f23..69e64988443 100644 Binary files a/icons/mob/inhands/clothing/hats_lefthand.dmi and b/icons/mob/inhands/clothing/hats_lefthand.dmi differ diff --git a/icons/mob/inhands/clothing/hats_righthand.dmi b/icons/mob/inhands/clothing/hats_righthand.dmi index 35719a09a7f..58e0b5719f9 100644 Binary files a/icons/mob/inhands/clothing/hats_righthand.dmi and b/icons/mob/inhands/clothing/hats_righthand.dmi differ diff --git a/icons/mob/inhands/clothing/suits_lefthand.dmi b/icons/mob/inhands/clothing/suits_lefthand.dmi index ce0c699dd10..25ca513e70b 100644 Binary files a/icons/mob/inhands/clothing/suits_lefthand.dmi and b/icons/mob/inhands/clothing/suits_lefthand.dmi differ diff --git a/icons/mob/inhands/clothing/suits_righthand.dmi b/icons/mob/inhands/clothing/suits_righthand.dmi index 5ba0c51ac1a..3061bd969e9 100644 Binary files a/icons/mob/inhands/clothing/suits_righthand.dmi and b/icons/mob/inhands/clothing/suits_righthand.dmi differ diff --git a/icons/obj/clothing/head/costume.dmi b/icons/obj/clothing/head/costume.dmi index 7ece76ca5a7..11c107f2cde 100644 Binary files a/icons/obj/clothing/head/costume.dmi and b/icons/obj/clothing/head/costume.dmi differ diff --git a/icons/obj/clothing/under/costume.dmi b/icons/obj/clothing/under/costume.dmi index b05808ec5c2..a2e57153238 100644 Binary files a/icons/obj/clothing/under/costume.dmi and b/icons/obj/clothing/under/costume.dmi differ