[MIRROR] Adds rolling up sleeves to the greyscale buttondown, adds greyscale suitskirt, minor buttondown resprite [MDB IGNORE] (#22952)
* Adds rolling up sleeves to the greyscale buttondown, adds greyscale suitskirt, minor buttondown resprite (#77404) ## About The Pull Request I noticed some recent PRs were replacing some suits with the buttondown + slacks, which isn't a terrible idea, but these changes also removed the suitskirt variants of these, as well as the buttondown not supporting rolling up its sleeves and more subjectively, I _really_ don't like the horizontal line on the buttondown, makes you look fat, don't like it so I decided to remedy these issues myself <details> <summary> Screenshots </summary> Service suitskirt  Rolled up sleeves  Rolled up sleeves sidesprite  </details> The skirt itself is a slightly modified version of the skirt from the greyscale skirtleneck I had to put it in the shorts_pants_shirts.dmi files for greyscale config reasons, not sure if everything is named correctly or necessarily in the right place here ## Why It's Good For The Game Re-adding the removed suitskirts is more objectively a good thing, the resprite is more subjective but honestly I was mostly motivated to make this by my hatred for how the buttondown looked before so lol I also noticed a minor bug that was implemented when the old black suit was replaced with a variant of the slacks ## Changelog 🆑 add: Added greyscale suitskirt, available in clothesmates add: You can now roll up the sleeves of greyscale buttondown shirts qol: Re-added previously removed black suitskirt and the RD's tan suitskirt, as pre-colored variants of the above fix: Fixed only one buttondown with slacks being available in clothesmates image: Slightly adjusted greyscale buttondown sprite, you look less fat now! /🆑 * Adds rolling up sleeves to the greyscale buttondown, adds greyscale suitskirt, minor buttondown resprite * Adds the new clothing to loadouts * Modular icons * Removing some bloat from a previous pr while we are at it --------- Co-authored-by: siliconOpossum <138069572+siliconOpossum@users.noreply.github.com> Co-authored-by: Pinta <68373373+softcerv@users.noreply.github.com> Co-authored-by: Giz <13398309+vinylspiders@users.noreply.github.com>
@@ -344,6 +344,17 @@ SKYRAT EDIT END */
|
||||
icon_file = 'icons/mob/clothing/under/shorts_pants_shirts.dmi'
|
||||
json_config = 'code/datums/greyscale/json_configs/buttondown_shorts_worn.json' //Ditto
|
||||
|
||||
/datum/greyscale_config/buttondown_skirt
|
||||
name = "Buttondown with Skirt"
|
||||
icon_file = 'icons/obj/clothing/under/shorts_pants_shirts.dmi'
|
||||
json_config = 'code/datums/greyscale/json_configs/buttondown_skirt.json'
|
||||
|
||||
/datum/greyscale_config/buttondown_skirt/worn
|
||||
name = "Buttondown with Skirt (Worn)"
|
||||
icon_file = 'icons/mob/clothing/under/shorts_pants_shirts.dmi'
|
||||
json_config = 'code/datums/greyscale/json_configs/buttondown_skirt_worn.json'
|
||||
|
||||
|
||||
//
|
||||
// SUITS
|
||||
//
|
||||
|
||||
@@ -24,5 +24,31 @@
|
||||
"blend_mode": "overlay",
|
||||
"color_ids": [ 4 ]
|
||||
}
|
||||
],
|
||||
"buttondown_shorts_d": [
|
||||
{
|
||||
"type": "icon_state",
|
||||
"icon_state": "buttondown_d",
|
||||
"blend_mode": "overlay",
|
||||
"color_ids": [ 1 ]
|
||||
},
|
||||
{
|
||||
"type": "icon_state",
|
||||
"icon_state": "buckle",
|
||||
"blend_mode": "overlay",
|
||||
"color_ids": [ 2 ]
|
||||
},
|
||||
{
|
||||
"type": "icon_state",
|
||||
"icon_state": "belt",
|
||||
"blend_mode": "overlay",
|
||||
"color_ids": [ 3 ]
|
||||
},
|
||||
{
|
||||
"type": "icon_state",
|
||||
"icon_state": "shorts",
|
||||
"blend_mode": "overlay",
|
||||
"color_ids": [ 4 ]
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
{
|
||||
"buttondown_skirt": [
|
||||
{
|
||||
"type": "icon_state",
|
||||
"icon_state": "buttondown",
|
||||
"blend_mode": "overlay",
|
||||
"color_ids": [ 1 ]
|
||||
},
|
||||
{
|
||||
"type": "icon_state",
|
||||
"icon_state": "buttondown_obj_buckle",
|
||||
"blend_mode": "overlay",
|
||||
"color_ids": [ 2 ]
|
||||
},
|
||||
{
|
||||
"type": "icon_state",
|
||||
"icon_state": "buttondown_obj_belt",
|
||||
"blend_mode": "overlay",
|
||||
"color_ids": [ 3 ]
|
||||
},
|
||||
{
|
||||
"type": "icon_state",
|
||||
"icon_state": "buttondown_obj_skirt",
|
||||
"blend_mode": "overlay",
|
||||
"color_ids": [ 4 ]
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,54 @@
|
||||
{
|
||||
"buttondown_skirt": [
|
||||
{
|
||||
"type": "icon_state",
|
||||
"icon_state": "buttondown",
|
||||
"blend_mode": "overlay",
|
||||
"color_ids": [ 1 ]
|
||||
},
|
||||
{
|
||||
"type": "icon_state",
|
||||
"icon_state": "buckle",
|
||||
"blend_mode": "overlay",
|
||||
"color_ids": [ 2 ]
|
||||
},
|
||||
{
|
||||
"type": "icon_state",
|
||||
"icon_state": "belt",
|
||||
"blend_mode": "overlay",
|
||||
"color_ids": [ 3 ]
|
||||
},
|
||||
{
|
||||
"type": "icon_state",
|
||||
"icon_state": "skirt",
|
||||
"blend_mode": "overlay",
|
||||
"color_ids": [ 4 ]
|
||||
}
|
||||
],
|
||||
"buttondown_skirt_d": [
|
||||
{
|
||||
"type": "icon_state",
|
||||
"icon_state": "buttondown_d",
|
||||
"blend_mode": "overlay",
|
||||
"color_ids": [ 1 ]
|
||||
},
|
||||
{
|
||||
"type": "icon_state",
|
||||
"icon_state": "buckle",
|
||||
"blend_mode": "overlay",
|
||||
"color_ids": [ 2 ]
|
||||
},
|
||||
{
|
||||
"type": "icon_state",
|
||||
"icon_state": "belt",
|
||||
"blend_mode": "overlay",
|
||||
"color_ids": [ 3 ]
|
||||
},
|
||||
{
|
||||
"type": "icon_state",
|
||||
"icon_state": "skirt",
|
||||
"blend_mode": "overlay",
|
||||
"color_ids": [ 4 ]
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -24,5 +24,31 @@
|
||||
"blend_mode": "overlay",
|
||||
"color_ids": [ 4 ]
|
||||
}
|
||||
],
|
||||
"buttondown_slacks_d": [
|
||||
{
|
||||
"type": "icon_state",
|
||||
"icon_state": "buttondown_d",
|
||||
"blend_mode": "overlay",
|
||||
"color_ids": [ 1 ]
|
||||
},
|
||||
{
|
||||
"type": "icon_state",
|
||||
"icon_state": "buckle",
|
||||
"blend_mode": "overlay",
|
||||
"color_ids": [ 2 ]
|
||||
},
|
||||
{
|
||||
"type": "icon_state",
|
||||
"icon_state": "belt",
|
||||
"blend_mode": "overlay",
|
||||
"color_ids": [ 3 ]
|
||||
},
|
||||
{
|
||||
"type": "icon_state",
|
||||
"icon_state": "slacks",
|
||||
"blend_mode": "overlay",
|
||||
"color_ids": [ 4 ]
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
@@ -109,6 +109,7 @@
|
||||
new /obj/item/clothing/under/rank/rnd/research_director(src)
|
||||
new /obj/item/clothing/under/rank/rnd/research_director/skirt(src)
|
||||
new /obj/item/clothing/under/rank/rnd/research_director/alt(src)
|
||||
new /obj/item/clothing/under/rank/rnd/research_director/alt/skirt(src)
|
||||
new /obj/item/clothing/under/rank/rnd/research_director/turtleneck(src)
|
||||
new /obj/item/clothing/under/rank/rnd/research_director/turtleneck/skirt(src)
|
||||
new /obj/item/clothing/suit/toggle/labcoat/skyrat/rd(src) //SKYRAT EDIT ADDITION
|
||||
|
||||
@@ -56,6 +56,7 @@
|
||||
/obj/structure/closet/secure_closet/psychology/PopulateContents()
|
||||
..()
|
||||
new /obj/item/clothing/under/costume/buttondown/slacks/service(src)
|
||||
new /obj/item/clothing/under/costume/buttondown/skirt/service(src)
|
||||
new /obj/item/clothing/neck/tie/black(src)
|
||||
new /obj/item/clothing/shoes/laceup(src)
|
||||
new /obj/item/storage/backpack/medic(src)
|
||||
|
||||
@@ -265,7 +265,8 @@
|
||||
icon = 'icons/obj/clothing/under/shorts_pants_shirts.dmi'
|
||||
worn_icon = 'icons/mob/clothing/under/shorts_pants_shirts.dmi'
|
||||
species_exception = list(/datum/species/golem)
|
||||
can_adjust = FALSE
|
||||
can_adjust = TRUE
|
||||
alt_covers_chest = TRUE
|
||||
|
||||
/obj/item/clothing/under/costume/buttondown/slacks
|
||||
name = "buttondown shirt with slacks"
|
||||
@@ -290,6 +291,21 @@
|
||||
greyscale_colors = "#EEEEEE#EE8E2E#222227#D8D39C"
|
||||
flags_1 = IS_PLAYER_COLORABLE_1
|
||||
|
||||
/obj/item/clothing/under/costume/buttondown/skirt
|
||||
name = "buttondown shirt with skirt"
|
||||
desc = "A fancy buttondown shirt with skirt."
|
||||
icon_state = "buttondown_skirt"
|
||||
greyscale_config = /datum/greyscale_config/buttondown_skirt
|
||||
greyscale_config_worn = /datum/greyscale_config/buttondown_skirt/worn
|
||||
greyscale_colors = "#EEEEEE#EE8E2E#222227#D8D39C"
|
||||
body_parts_covered = CHEST|GROIN|ARMS
|
||||
flags_1 = IS_PLAYER_COLORABLE_1
|
||||
female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
|
||||
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
|
||||
|
||||
/obj/item/clothing/under/costume/buttondown/skirt/service //preset one to be a formal white shirt and black skirt
|
||||
greyscale_colors = "#EEEEEE#CBDBFC#17171B#222227"
|
||||
|
||||
/obj/item/clothing/under/costume/jackbros
|
||||
name = "jack bros outfit"
|
||||
desc = "For when it's time to hee some hos."
|
||||
|
||||
@@ -42,6 +42,17 @@
|
||||
greyscale_config = /datum/greyscale_config/buttondown_slacks
|
||||
greyscale_config_worn = /datum/greyscale_config/buttondown_slacks/worn
|
||||
greyscale_colors = "#ffeeb6#c2d3da#402912#615233"
|
||||
can_adjust = TRUE
|
||||
alt_covers_chest = TRUE
|
||||
|
||||
/obj/item/clothing/under/rank/rnd/research_director/alt/skirt
|
||||
name = "research director's tan suitskirt"
|
||||
icon_state = "buttondown_skirt"
|
||||
greyscale_config = /datum/greyscale_config/buttondown_skirt
|
||||
greyscale_config_worn = /datum/greyscale_config/buttondown_skirt/worn
|
||||
body_parts_covered = CHEST|GROIN|ARMS
|
||||
female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
|
||||
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
|
||||
|
||||
/obj/item/clothing/under/rank/rnd/research_director/turtleneck
|
||||
desc = "A Nanotrasen-purple turtleneck and black jeans, for a director with a superior sense of style."
|
||||
|
||||
@@ -160,6 +160,7 @@
|
||||
"icon" = "kitchen-set",
|
||||
"products" = list(
|
||||
/obj/item/clothing/under/costume/buttondown/slacks/service = 1,
|
||||
/obj/item/clothing/under/costume/buttondown/skirt/service = 1,
|
||||
/obj/item/clothing/accessory/waistcoat = 1,
|
||||
/obj/item/clothing/under/suit/waiter = 1,
|
||||
/obj/item/clothing/suit/apron = 1,
|
||||
|
||||
@@ -69,6 +69,7 @@
|
||||
/obj/item/clothing/under/shorts/jeanshorts = 5,
|
||||
/obj/item/clothing/under/costume/buttondown/slacks = 4,
|
||||
/obj/item/clothing/under/costume/buttondown/shorts = 4,
|
||||
/obj/item/clothing/under/costume/buttondown/skirt = 4,
|
||||
/obj/item/clothing/under/dress/sundress = 2,
|
||||
/obj/item/clothing/under/dress/tango = 2,
|
||||
/obj/item/clothing/under/dress/skirt/plaid = 4,
|
||||
@@ -100,7 +101,8 @@
|
||||
/obj/item/clothing/under/suit/burgundy = 1,
|
||||
/obj/item/clothing/under/suit/charcoal = 1,
|
||||
/obj/item/clothing/under/suit/white = 1,
|
||||
/obj/item/clothing/under/costume/buttondown/slacks/service = 1,
|
||||
/obj/item/clothing/under/costume/buttondown/slacks/service = 4,
|
||||
/obj/item/clothing/under/costume/buttondown/skirt/service = 4,
|
||||
/obj/item/clothing/suit/jacket/bomber = 2,
|
||||
/obj/item/clothing/suit/jacket/puffer/vest = 2,
|
||||
/obj/item/clothing/suit/jacket/puffer = 2,
|
||||
|
||||
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.4 KiB |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 4.2 KiB After Width: | Height: | Size: 4.4 KiB |
|
Before Width: | Height: | Size: 4.4 KiB After Width: | Height: | Size: 4.6 KiB |
|
Before Width: | Height: | Size: 40 KiB After Width: | Height: | Size: 34 KiB |
|
Before Width: | Height: | Size: 43 KiB After Width: | Height: | Size: 38 KiB |
@@ -239,6 +239,10 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/
|
||||
name = "Recolorable Buttondown Shirt with Shorts"
|
||||
item_path = /obj/item/clothing/under/costume/buttondown/shorts
|
||||
|
||||
/datum/loadout_item/under/miscellaneous/buttondown_skirt
|
||||
name = "Recolorable Buttondown Shirt with Skirt"
|
||||
item_path = /obj/item/clothing/under/costume/buttondown/skirt
|
||||
|
||||
/datum/loadout_item/under/miscellaneous/vicvest
|
||||
name = "Recolorable Buttondown Shirt with Double-Breasted Vest"
|
||||
item_path = /obj/item/clothing/under/pants/skyrat/vicvest
|
||||
|
||||