Skip to content

Commit

Permalink
More Suits resprites (Bonus: Chef/Bartender updates!) (tgstation#77558)
Browse files Browse the repository at this point in the history
## About The Pull Request
Finally, my ultimate goal:
All Lawyer suits are now under suits.dmi. Having some suits in suits.dmi
and some in civilian.dmi was just really really weird and confusing.

Also updated some more Service stuff, specifically the Chef and
Bartender. Their uniform is the generic Service Buttondown, and their
other gear has been updated. The Bartender, notably, now has a new item,
the bowtie!

Full changelog:
- Adds Bowtie (and yes, it's in relevant vendors)
- Adds a greyscale Formal Jacket (the lawyer jackets but greyscaled)
- Removes `/obj/item/clothing/under/rank/civilian/chef` and
`/obj/item/clothing/under/rank/civilian/bartender`; replaces them with
`/obj/item/clothing/under/costume/buttondown/slacks/service`
- **Moves all Lawyer suit sprites to the suits.dmi**
- Converted `/obj/item/clothing/under/rank/civilian/lawyer/bluesuit` to
use the same GAGS configs as the buttondown (path unchanged)
- Resprited all Lawyer suits (except galaxy ones)
- Resprited the Lawyer jackets to match (including a currently unused
GAGS-palette one)
- Resprited the Chef Apron-Jacket and Hat
- Resprited the Botanist Overalls (and made them Greyscale)
- Updated the shirt on the Cook Jorts to be more up-to-date instead of
being new pants on a super crusty old shirt sprite.
- Puts stuff into vendors

## Why It's Good For The Game
Sprote updates yahoo!

Chef/Bartender showed their age, and essentially had the same uniform.
Now they look much more at home.

![image](https://github.com/tgstation/tgstation/assets/76465278/c4c317c3-e62a-41d3-87fe-bb38c2a46552)
GAGS Suit jacket yippee!

![image](https://github.com/tgstation/tgstation/assets/76465278/a1eaf9a9-58c9-44ef-b967-fdc62311afbd)
This jacket was put into to the Bartender's vendor for the sake of
allowing them their own gimmicks, such as this:

![image](https://github.com/tgstation/tgstation/assets/76465278/eb42e93b-9442-4cd4-891f-091a74aaccbf)
New greyscale overalls wahooo! Since they're greyscaled they're also in
the clothesmate for anybody who really wants them.

![image](https://github.com/tgstation/tgstation/assets/76465278/c8aea289-d2d9-467d-949a-82563bccb2d3)
The Lawyer suits just used an entirely different type of shading and it
made them stick out weird... I'm not quite sure on reshaping their
jackets but figured it's better to start with this and update them if
requested.

![image](https://github.com/tgstation/tgstation/assets/76465278/9a74c3a3-a2b8-48d6-89f9-77d1e0fdd86a)

As for moving Lawyer suits to suits.dmi... I just don't like them being
split up. It makes it annoying to prevent duplicates or keep them all
updated.
## Changelog
:cl:
add: Added the Bowtie! Bartenders start with one on, but they can also
be found in the Bardrobe, Autodrobe, and Clothesmate. No need to tie it
either, it's just a clip-on.
add: Added a Greyscale "Formal Jacket" of the style that most suits use,
for crew who want to make their own using the buttondown shirt.
del: Removed the generic Cook/Bartender uniforms and changed them to use
the Service buttondown w/ slacks.
image: updated the majority of Lawyer suit sprites, along with the
Cook's Apron-Jacket and Hat, and updated/greyscaled Botany's Overalls!
Also the Overalls are available in the clothesmate, and the Cook Jorts'
shirt is less crusty.
/:cl:
  • Loading branch information
OrionTheFox authored Aug 15, 2023
1 parent 496bde0 commit 4771891
Show file tree
Hide file tree
Showing 29 changed files with 131 additions and 78 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -423,6 +423,24 @@
name = "Oversized Jacket (Worn)"
icon_file = 'icons/mob/clothing/suits/jacket.dmi'

/datum/greyscale_config/jacket_lawyer
name = "Formal Suit Jacket"
icon_file = 'icons/obj/clothing/suits/jacket.dmi'
json_config = 'code/datums/greyscale/json_configs/jacket_lawyer.json'

/datum/greyscale_config/jacket_lawyer/worn
name = "Formal Suit Jacket (Worn)"
icon_file = 'icons/mob/clothing/suits/jacket.dmi'

/datum/greyscale_config/overalls
name = "Overalls"
icon_file = 'icons/obj/clothing/suits/utility.dmi'
json_config = 'code/datums/greyscale/json_configs/overalls.json'

/datum/greyscale_config/overalls/worn
name = "Overalls (Worn)"
icon_file = 'icons/mob/clothing/suits/utility.dmi'

//
// SHOES
//
Expand Down
18 changes: 18 additions & 0 deletions code/datums/greyscale/json_configs/jacket_lawyer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"jacket_lawyer": [
{
"type": "icon_state",
"icon_state": "suitjacket",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
],
"jacket_lawyer_t": [
{
"type": "icon_state",
"icon_state": "suitjacket_t",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
]
}
10 changes: 10 additions & 0 deletions code/datums/greyscale/json_configs/overalls.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"overalls": [
{
"type": "icon_state",
"icon_state": "overalls",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
]
}
9 changes: 9 additions & 0 deletions code/datums/greyscale/json_configs/ties.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,14 @@
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
],
"bowtie_greyscale": [
{
"type": "icon_state",
"icon_state": "bowtie_greyscale",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
]

}
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
/obj/item/storage/box/mousetraps = 2,
/obj/item/circuitboard/machine/dish_drive = 1,
/obj/item/clothing/suit/toggle/chef = 1,
/obj/item/clothing/under/rank/civilian/chef = 1,
/obj/item/clothing/under/costume/buttondown/slacks/service = 1,
/obj/item/clothing/head/utility/chefhat = 1,
/obj/item/reagent_containers/cup/rag = 1)
generate_items_inside(items_inside,src)
Expand Down
13 changes: 13 additions & 0 deletions code/modules/clothing/neck/_neck.dm
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,19 @@
if(GET_ATOM_BLOOD_DNA_LENGTH(src))
. += mutable_appearance('icons/effects/blood.dmi', "maskblood")

/obj/item/clothing/neck/bowtie
name = "bow tie"
desc = "A small neosilk bowtie."
icon = 'icons/obj/clothing/neck.dmi'
icon_state = "bowtie_greyscale"
inhand_icon_state = "" //no inhands
w_class = WEIGHT_CLASS_SMALL
custom_price = PAYCHECK_CREW
greyscale_config = /datum/greyscale_config/ties
greyscale_config_worn = /datum/greyscale_config/ties/worn
greyscale_colors = "#151516ff"
flags_1 = IS_PLAYER_COLORABLE_1

/obj/item/clothing/neck/tie
name = "slick tie"
desc = "A neosilk tie."
Expand Down
15 changes: 0 additions & 15 deletions code/modules/clothing/suits/costume.dm
Original file line number Diff line number Diff line change
Expand Up @@ -84,21 +84,6 @@
body_parts_covered = CHEST|GROIN|LEGS|ARMS
allowed = list(/obj/item/storage/fancy/cigarettes, /obj/item/stack/spacecash)

/obj/item/clothing/suit/apron/overalls
name = "coveralls"
desc = "A set of denim overalls."
icon_state = "overalls"
inhand_icon_state = "overalls"
body_parts_covered = CHEST|GROIN|LEGS
species_exception = list(/datum/species/golem)

/obj/item/clothing/suit/apron/purple_bartender
name = "purple bartender apron"
desc = "A fancy purple apron for a stylish person."
icon_state = "purplebartenderapron"
inhand_icon_state = null
body_parts_covered = CHEST|GROIN

/obj/item/clothing/suit/syndicatefake
name = "black and red space suit replica"
icon_state = "syndicate-black-red"
Expand Down
33 changes: 26 additions & 7 deletions code/modules/clothing/suits/jobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,18 @@
inhand_icon_state = null
body_parts_covered = CHEST|GROIN|LEGS

/obj/item/clothing/suit/apron/overalls
name = "coveralls"
desc = "A set of overalls, good for protecting thinner clothes from the elements."
icon_state = "overalls"
inhand_icon_state = ""
body_parts_covered = CHEST|GROIN|LEGS
species_exception = list(/datum/species/golem)
greyscale_config = /datum/greyscale_config/overalls
greyscale_config_worn = /datum/greyscale_config/overalls/worn
greyscale_colors = "#313c6e"
flags_1 = IS_PLAYER_COLORABLE_1

//Captain
/obj/item/clothing/suit/jacket/capjacket
name = "captain's parade jacket"
Expand Down Expand Up @@ -173,8 +185,8 @@

//Lawyer
/obj/item/clothing/suit/toggle/lawyer
name = "blue suit jacket"
desc = "A snappy dress jacket."
name = "blue formal suit jacket"
desc = "A professional suit jacket."
icon_state = "suitjacket_blue"
icon = 'icons/obj/clothing/suits/jacket.dmi'
worn_icon = 'icons/mob/clothing/suits/jacket.dmi'
Expand All @@ -184,17 +196,24 @@
species_exception = list(/datum/species/golem)

/obj/item/clothing/suit/toggle/lawyer/purple
name = "purple suit jacket"
desc = "A foppish dress jacket."
name = "purple formal suit jacket"
icon_state = "suitjacket_purp"
inhand_icon_state = null

/obj/item/clothing/suit/toggle/lawyer/black
name = "black suit jacket"
desc = "A professional suit jacket."
name = "black formal suit jacket"
icon_state = "suitjacket_black"
inhand_icon_state = "ro_suit"

/obj/item/clothing/suit/toggle/lawyer/greyscale
name = "formal suit jacket"
icon_state = "jacket_lawyer"
inhand_icon_state = ""
greyscale_config = /datum/greyscale_config/jacket_lawyer
greyscale_config_worn = /datum/greyscale_config/jacket_lawyer/worn
greyscale_colors = "#ffffff"
flags_1 = IS_PLAYER_COLORABLE_1

//Mime
/obj/item/clothing/suit/toggle/suspenders
name = "suspenders"
Expand Down Expand Up @@ -295,14 +314,14 @@
cold_protection = CHEST|ARMS
heat_protection = CHEST|ARMS

//Robotocist
/datum/armor/jacket_curator
melee = 25
bullet = 10
laser = 25
energy = 35
acid = 45

//Robotocist
/obj/item/clothing/suit/hooded/techpriest
name = "techpriest robes"
desc = "For those who REALLY love their toasters."
Expand Down
59 changes: 15 additions & 44 deletions code/modules/clothing/under/jobs/civilian/civilian.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,12 @@
icon = 'icons/obj/clothing/under/civilian.dmi'
worn_icon = 'icons/mob/clothing/under/civilian.dmi'

/obj/item/clothing/under/rank/civilian/bartender
desc = "It looks like it could use some more flair."
name = "bartender's uniform"
icon_state = "barman"
inhand_icon_state = "bar_suit"
alt_covers_chest = TRUE

/obj/item/clothing/under/rank/civilian/bartender/purple
desc = "It looks like it has lots of flair!"
name = "purple bartender's uniform"
icon_state = "purplebartender"
can_adjust = FALSE

/obj/item/clothing/under/rank/civilian/bartender/skirt
name = "bartender's skirt"
desc = "It looks like it could use some more flair."
icon_state = "barman_skirt"
inhand_icon_state = "bar_suit"
body_parts_covered = CHEST|GROIN|ARMS
dying_key = DYE_REGISTRY_JUMPSKIRT
female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON

/obj/item/clothing/under/rank/civilian/chaplain
desc = "It's a black jumpsuit, often worn by religious folk."
name = "chaplain's jumpsuit"
Expand All @@ -44,22 +27,6 @@
female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON

/obj/item/clothing/under/rank/civilian/chef
name = "cook's suit"
desc = "A suit which is given only to the most <b>hardcore</b> cooks in space."
icon_state = "chef"
inhand_icon_state = "chef"
alt_covers_chest = TRUE

/obj/item/clothing/under/rank/civilian/chef/skirt
name = "cook's skirt"
desc = "A skirt which is given only to the most <b>hardcore</b> cooks in space."
icon_state = "chef_skirt"
body_parts_covered = CHEST|GROIN|ARMS
dying_key = DYE_REGISTRY_JUMPSKIRT
female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON

/obj/item/clothing/under/rank/civilian/head_of_personnel
desc = "A slick uniform worn by those to earn the position of \"Head of Personnel\"."
name = "head of personnel's uniform"
Expand Down Expand Up @@ -142,8 +109,10 @@
can_adjust = FALSE

/obj/item/clothing/under/rank/civilian/lawyer
desc = "Slick threads."
name = "Lawyer suit"
desc = "Slick threads."
icon = 'icons/obj/clothing/under/suits.dmi'
worn_icon = 'icons/mob/clothing/under/suits.dmi'
can_adjust = FALSE

/obj/item/clothing/under/rank/civilian/lawyer/dye_item(dye_color, dye_key_override)
Expand Down Expand Up @@ -173,8 +142,6 @@
desc = "A tacky suit perfect for a CRIMINAL lawyer!"
icon_state = "good_suit"
inhand_icon_state = "good_suit"
icon = 'icons/obj/clothing/under/suits.dmi'
worn_icon = 'icons/mob/clothing/under/suits.dmi'

/obj/item/clothing/under/rank/civilian/lawyer/beige/skirt
name = "good lawyer's suitskirt"
Expand Down Expand Up @@ -212,18 +179,21 @@
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON

/obj/item/clothing/under/rank/civilian/lawyer/bluesuit
name = "blue suit"
desc = "A classy suit."
icon_state = "bluesuit"
inhand_icon_state = "b_suit"
name = "blue buttondown suit"
icon = 'icons/obj/clothing/under/shorts_pants_shirts.dmi'
worn_icon = 'icons/mob/clothing/under/shorts_pants_shirts.dmi'
icon_state = "buttondown_slacks"
greyscale_config = /datum/greyscale_config/buttondown_slacks
greyscale_config_worn = /datum/greyscale_config/buttondown_slacks/worn
greyscale_colors = "#EEEEEE#CBDBFC#17171B#2B65A8"
can_adjust = TRUE
alt_covers_chest = TRUE

/obj/item/clothing/under/rank/civilian/lawyer/bluesuit/skirt
name = "blue suitskirt"
desc = "A classy suitskirt."
icon_state = "bluesuit_skirt"
inhand_icon_state = "b_suit"
name = "blue buttondown 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
dying_key = DYE_REGISTRY_JUMPSKIRT
female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
Expand All @@ -247,6 +217,7 @@
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON

/obj/item/clothing/under/rank/civilian/lawyer/galaxy
icon = 'icons/obj/clothing/under/lawyer_galaxy.dmi'
worn_icon = 'icons/mob/clothing/under/lawyer_galaxy.dmi'
can_adjust = FALSE
name = "blue galaxy suit"
Expand Down
3 changes: 2 additions & 1 deletion code/modules/jobs/job_types/bartender.dm
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@
jobtype = /datum/job/bartender

id_trim = /datum/id_trim/job/bartender
uniform = /obj/item/clothing/under/rank/civilian/bartender
neck = /obj/item/clothing/neck/bowtie
uniform = /obj/item/clothing/under/costume/buttondown/slacks/service
suit = /obj/item/clothing/suit/armor/vest
backpack_contents = list(
/obj/item/storage/box/beanbag = 1,
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/cook.dm
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
jobtype = /datum/job/cook

id_trim = /datum/id_trim/job/cook/chef
uniform = /obj/item/clothing/under/rank/civilian/chef
uniform = /obj/item/clothing/under/costume/buttondown/slacks/service
suit = /obj/item/clothing/suit/toggle/chef
backpack_contents = list(
/obj/item/choice_beacon/ingredient = 1,
Expand Down
3 changes: 2 additions & 1 deletion code/modules/mob_spawn/ghost_roles/mining_roles.dm
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,8 @@
name = "Space Bartender"
id = /obj/item/card/id/advanced
id_trim = /datum/id_trim/space_bartender
uniform = /obj/item/clothing/under/rank/civilian/bartender
neck = /obj/item/clothing/neck/bowtie
uniform = /obj/item/clothing/under/costume/buttondown/slacks/service
suit = /obj/item/clothing/suit/armor/vest
back = /obj/item/storage/backpack
glasses = /obj/item/clothing/glasses/sunglasses/reagent
Expand Down
3 changes: 2 additions & 1 deletion code/modules/mob_spawn/ghost_roles/unused_roles.dm
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,8 @@

/datum/outfit/cryobartender
name = "Cryogenic Bartender"
uniform = /obj/item/clothing/under/rank/civilian/bartender
neck = /obj/item/clothing/neck/bowtie
uniform = /obj/item/clothing/under/costume/buttondown/slacks/service
suit = /obj/item/clothing/suit/armor/vest
back = /obj/item/storage/backpack
glasses = /obj/item/clothing/glasses/sunglasses/reagent
Expand Down
1 change: 1 addition & 0 deletions code/modules/vending/autodrobe.dm
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@
"products" = list(
/obj/item/clothing/under/costume/buttondown/slacks/service = 1,
/obj/item/clothing/under/costume/buttondown/skirt/service = 1,
/obj/item/clothing/neck/bowtie = 2,
/obj/item/clothing/accessory/waistcoat = 1,
/obj/item/clothing/under/suit/waiter = 1,
/obj/item/clothing/suit/apron = 1,
Expand Down
4 changes: 3 additions & 1 deletion code/modules/vending/clothesmate.dm
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
/obj/item/clothing/neck/large_scarf/blue = 6,
/obj/item/clothing/neck/infinity_scarf = 6,
/obj/item/clothing/neck/tie = 6,
/obj/item/clothing/neck/bowtie = 6,
/obj/item/clothing/head/rasta = 3,
/obj/item/clothing/head/chaplain/kippah = 3,
/obj/item/clothing/head/chaplain/taqiyah/red = 3,
Expand Down Expand Up @@ -81,7 +82,6 @@
/obj/item/clothing/under/dress/striped = 1,
/obj/item/clothing/under/dress/sailor = 1,
/obj/item/clothing/under/dress/redeveninggown = 1,
/obj/item/clothing/suit/apron/purple_bartender = 2,
/obj/item/clothing/under/misc/pj/blue = 2,
/obj/item/clothing/under/misc/pj/red = 2,
),
Expand All @@ -94,6 +94,7 @@
/obj/item/clothing/suit/toggle/jacket/sweater = 4,
/obj/item/clothing/suit/jacket/oversized = 4,
/obj/item/clothing/suit/jacket/fancy = 4,
/obj/item/clothing/suit/toggle/lawyer/greyscale = 4,
/obj/item/clothing/suit/hooded/wintercoat/custom = 2,
/obj/item/clothing/suit/hooded/wintercoat = 2,
/obj/item/clothing/under/suit/navy = 1,
Expand All @@ -116,6 +117,7 @@
/obj/item/clothing/under/rank/civilian/head_of_personnel/suit/skirt = 2,
/obj/item/clothing/under/rank/civilian/bartender/purple = 2,
/obj/item/clothing/suit/jacket/miljacket = 1,
/obj/item/clothing/suit/apron/overalls = 2,
),
),

Expand Down
Loading

0 comments on commit 4771891

Please sign in to comment.