Maid Uniform Resprited and GAGsified (#91885)
## About The Pull Request Resprites the maid uniform and maid headband using GAGs. Combines maid neckpiece, gloves, and corset into the main outfit. Removes standalone maid neckpiece, gloves, and corset. Adds maid uniform and headband inhands. stock option in black custom colors as example  ## Why It's Good For The Game Updates the sprite to be more inline with our current clothes. Makes the sprite in-game player customizable. ## Changelog 🆑 image: resprites the maid uniform and headband using GAGs del: removes standalone maid neckpiece, gloves, and corset /🆑 --------- Co-authored-by: tattle <66640614+dragomagol@users.noreply.github.com>
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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'
|
||||
|
||||
@@ -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]
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -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,
|
||||
|
||||
@@ -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."
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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."
|
||||
|
||||
@@ -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."
|
||||
|
||||
@@ -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."
|
||||
|
||||
@@ -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,
|
||||
))
|
||||
|
||||
|
Before Width: | Height: | Size: 3.7 KiB After Width: | Height: | Size: 3.9 KiB |
|
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 2.5 KiB |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 57 KiB After Width: | Height: | Size: 56 KiB |
|
Before Width: | Height: | Size: 115 KiB After Width: | Height: | Size: 118 KiB |
|
Before Width: | Height: | Size: 66 KiB After Width: | Height: | Size: 64 KiB |
|
Before Width: | Height: | Size: 25 KiB After Width: | Height: | Size: 25 KiB |
|
Before Width: | Height: | Size: 25 KiB After Width: | Height: | Size: 25 KiB |
|
Before Width: | Height: | Size: 50 KiB After Width: | Height: | Size: 49 KiB |
|
Before Width: | Height: | Size: 50 KiB After Width: | Height: | Size: 48 KiB |
|
Before Width: | Height: | Size: 33 KiB After Width: | Height: | Size: 33 KiB |
|
Before Width: | Height: | Size: 27 KiB After Width: | Height: | Size: 26 KiB |