diff --git a/code/game/jobs/job/support.dm b/code/game/jobs/job/support.dm index 507e130a59a..b73c8b76ebb 100644 --- a/code/game/jobs/job/support.dm +++ b/code/game/jobs/job/support.dm @@ -335,6 +335,7 @@ belt = /obj/item/storage/belt/chef head = /obj/item/clothing/head/chefhat l_ear = /obj/item/radio/headset/headset_service + neck = /obj/item/clothing/neck/neckerchief/red id = /obj/item/card/id/chef pda = /obj/item/pda/chef backpack_contents = list( diff --git a/code/game/machinery/vendors/wardrobe_vendors.dm b/code/game/machinery/vendors/wardrobe_vendors.dm index a8ccbba9889..c01509bb714 100644 --- a/code/game/machinery/vendors/wardrobe_vendors.dm +++ b/code/game/machinery/vendors/wardrobe_vendors.dm @@ -764,15 +764,28 @@ products = list(/obj/item/clothing/under/rank/civilian/chef = 2, /obj/item/clothing/under/misc/waiter = 2, /obj/item/clothing/suit/chef = 2, + /obj/item/clothing/suit/chef/bw = 2, + /obj/item/clothing/suit/chef/red = 2, + /obj/item/clothing/suit/chef/darkgreen = 2, /obj/item/clothing/suit/chef/classic = 2, /obj/item/clothing/suit/hooded/wintercoat/chef = 2, /obj/item/storage/belt/chef = 2, + /obj/item/storage/belt/chef/black = 2, + /obj/item/storage/belt/chef/red = 2, + /obj/item/storage/belt/chef/green = 2, /obj/item/clothing/head/chefhat = 2, + /obj/item/clothing/head/chefhat/bw = 2, + /obj/item/clothing/head/chefhat/black = 2, + /obj/item/clothing/head/chefhat/red = 2, /obj/item/clothing/head/soft/white = 2, /obj/item/clothing/head/beret/white = 2, /obj/item/clothing/shoes/laceup = 2, /obj/item/clothing/shoes/white = 2, /obj/item/clothing/shoes/black = 2, + /obj/item/clothing/neck/neckerchief = 2, + /obj/item/clothing/neck/neckerchief/black = 2, + /obj/item/clothing/neck/neckerchief/red = 2, + /obj/item/clothing/neck/neckerchief/green = 2, /obj/item/clothing/accessory/waistcoat = 2, /obj/item/clothing/accessory/armband/service = 3, /obj/item/reagent_containers/glass/rag = 3, @@ -780,7 +793,9 @@ /obj/item/storage/box/crewvend = 1, /obj/item/storage/box/autochef = 1, /obj/item/clothing/head/helmet/space/plasmaman/chef = 2, + /obj/item/clothing/head/helmet/space/plasmaman/chef/bw = 2, /obj/item/clothing/under/plasmaman/chef = 2, + /obj/item/clothing/under/plasmaman/chef/bw = 2, /obj/item/cartridge/chef = 2) contraband = list(/obj/item/toy/figure/crew/chef = 1) @@ -788,15 +803,28 @@ prices = list(/obj/item/clothing/under/rank/civilian/chef = 50, /obj/item/clothing/under/misc/waiter = 50, /obj/item/clothing/suit/chef = 50, + /obj/item/clothing/suit/chef/bw = 50, + /obj/item/clothing/suit/chef/red = 50, + /obj/item/clothing/suit/chef/darkgreen = 50, /obj/item/clothing/suit/chef/classic = 50, /obj/item/clothing/suit/hooded/wintercoat/chef = 75, /obj/item/storage/belt/chef = 50, + /obj/item/storage/belt/chef/black = 50, + /obj/item/storage/belt/chef/red = 50, + /obj/item/storage/belt/chef/green = 50, /obj/item/clothing/head/chefhat = 50, + /obj/item/clothing/head/chefhat/bw = 50, + /obj/item/clothing/head/chefhat/black = 50, + /obj/item/clothing/head/chefhat/red = 50, /obj/item/clothing/head/soft/white = 30, /obj/item/clothing/head/beret/white = 20, /obj/item/clothing/shoes/laceup = 30, /obj/item/clothing/shoes/white = 20, /obj/item/clothing/shoes/black = 20, + /obj/item/clothing/neck/neckerchief = 20, + /obj/item/clothing/neck/neckerchief/black = 20, + /obj/item/clothing/neck/neckerchief/red = 20, + /obj/item/clothing/neck/neckerchief/green = 20, /obj/item/clothing/accessory/waistcoat = 20, /obj/item/clothing/accessory/armband/service = 20, /obj/item/reagent_containers/glass/rag = 5, @@ -804,7 +832,9 @@ /obj/item/storage/box/crewvend = 100, /obj/item/storage/box/autochef = 100, /obj/item/clothing/head/helmet/space/plasmaman/chef = 60, + /obj/item/clothing/head/helmet/space/plasmaman/chef/bw = 60, /obj/item/clothing/under/plasmaman/chef = 60, + /obj/item/clothing/under/plasmaman/chef/bw = 60, /obj/item/cartridge/chef = 50) refill_canister = /obj/item/vending_refill/chefdrobe diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index a128c2da32a..3f42e9b4174 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -1050,7 +1050,7 @@ /obj/item/storage/belt/chef name = "culinary tool apron" desc = "An apron with various pockets for holding all your cooking tools and equipment." - icon_state = "chefbelt" + icon_state = "apron_white" storage_slots = 10 max_w_class = WEIGHT_CLASS_NORMAL max_combined_w_class = 25 @@ -1073,6 +1073,21 @@ /obj/item/reagent_containers/condiment, /obj/item/reagent_containers/glass/beaker) sprite_sheets = list( + "Drask" = 'icons/mob/clothing/species/drask/belt.dmi', + "Grey" = 'icons/mob/clothing/species/grey/belt.dmi', "Kidan" = 'icons/mob/clothing/species/kidan/belt.dmi', "Vox" = 'icons/mob/clothing/species/vox/belt.dmi' ) + +/obj/item/storage/belt/chef/black + icon_state = "apron_black" + +/obj/item/storage/belt/chef/red + icon_state = "chefbelt" + sprite_sheets = list( + "Kidan" = 'icons/mob/clothing/species/kidan/belt.dmi', + "Vox" = 'icons/mob/clothing/species/vox/belt.dmi' + ) + +/obj/item/storage/belt/chef/green + icon_state = "apron_green" diff --git a/code/modules/client/preference/loadout/loadout_hat.dm b/code/modules/client/preference/loadout/loadout_hat.dm index d9b33fe0ae5..7991e7c7ff9 100644 --- a/code/modules/client/preference/loadout/loadout_hat.dm +++ b/code/modules/client/preference/loadout/loadout_hat.dm @@ -364,3 +364,23 @@ /datum/gear/hat/wizard display_name = "Wizard hat" path = /obj/item/clothing/head/wizard/fake + +/datum/gear/hat/chef + main_typepath = /datum/gear/hat/chef + allowed_roles = list("Chef") + +/datum/gear/hat/chef/white + display_name = "Chef hat, white" + path = /obj/item/clothing/head/chefhat + +/datum/gear/hat/chef/bw + display_name = "Chef hat, black and white" + path = /obj/item/clothing/head/chefhat/bw + +/datum/gear/hat/chef/black + display_name = "Chef hat, black" + path = /obj/item/clothing/head/chefhat/black + +/datum/gear/hat/chef/red + display_name = "Chef hat, red" + path = /obj/item/clothing/head/chefhat/red diff --git a/code/modules/client/preference/loadout/loadout_neck.dm b/code/modules/client/preference/loadout/loadout_neck.dm index bee51f12906..2702f38a0f6 100644 --- a/code/modules/client/preference/loadout/loadout_neck.dm +++ b/code/modules/client/preference/loadout/loadout_neck.dm @@ -209,3 +209,23 @@ display_name = "Chaplain, tallit" path = /obj/item/clothing/neck/cloak/tallit allowed_roles = list("Chaplain") + +/datum/gear/neck/neckerchief + main_typepath = /datum/gear/neck/neckerchief + allowed_roles = list("Bartender", "Chef") + +/datum/gear/neck/neckerchief/white + display_name = "Neckerchief, white" + path = /obj/item/clothing/neck/neckerchief + +/datum/gear/neck/neckerchief/black + display_name = "Neckerchief, black" + path = /obj/item/clothing/neck/neckerchief/black + +/datum/gear/neck/neckerchief/red + display_name = "Neckerchief, red" + path = /obj/item/clothing/neck/neckerchief/red + +/datum/gear/neck/neckerchief/green + display_name = "Neckerchief, green" + path = /obj/item/clothing/neck/neckerchief/green diff --git a/code/modules/client/preference/loadout/loadout_suit.dm b/code/modules/client/preference/loadout/loadout_suit.dm index 01e9ea33864..aa0e2992db8 100644 --- a/code/modules/client/preference/loadout/loadout_suit.dm +++ b/code/modules/client/preference/loadout/loadout_suit.dm @@ -366,3 +366,24 @@ display_name = "Chaplain, hasidic coat" path = /obj/item/clothing/suit/hasidic_coat allowed_roles = list("Chaplain") + +//Chef +/datum/gear/suit/job/chef + main_typepath = /datum/gear/suit/job/chef + allowed_roles = list("Chef") + +/datum/gear/suit/job/chef/white + display_name = "Chef's coat" + path = /obj/item/clothing/suit/chef + +/datum/gear/suit/job/chef/bw + display_name = "Chef's black-piped coat" + path = /obj/item/clothing/suit/chef/bw + +/datum/gear/suit/job/chef/red + display_name = "Chef's red-piped coat" + path = /obj/item/clothing/suit/chef/red + +/datum/gear/suit/job/chef/darkgreen + display_name = "Chef's dark coat" + path = /obj/item/clothing/suit/chef/darkgreen diff --git a/code/modules/clothing/head/job_hats.dm b/code/modules/clothing/head/job_hats.dm index 642fc0ba3eb..e9a25923058 100644 --- a/code/modules/clothing/head/job_hats.dm +++ b/code/modules/clothing/head/job_hats.dm @@ -2,7 +2,7 @@ // Chef /obj/item/clothing/head/chefhat name = "chef's hat" - desc = "The commander in chef's head wear." + desc = "The commander in chef's headwear." icon_state = "chef" inhand_icon_state = "chefhat" strip_delay = 10 @@ -15,6 +15,18 @@ "Vox" = 'icons/mob/clothing/species/vox/head.dmi' ) +/obj/item/clothing/head/chefhat/red + name = "chef's red hat" + icon_state = "chef_red" + +/obj/item/clothing/head/chefhat/black + name = "chef's black hat" + icon_state = "chef_black" + +/obj/item/clothing/head/chefhat/bw + name = "chef's black and white hat" + icon_state = "chef_bw" + /obj/item/clothing/head/chefhat/Initialize(mapload) . = ..() AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) diff --git a/code/modules/clothing/neck/neck.dm b/code/modules/clothing/neck/neck.dm index 4e0d88ce46e..3b643824283 100644 --- a/code/modules/clothing/neck/neck.dm +++ b/code/modules/clothing/neck/neck.dm @@ -88,3 +88,25 @@ lung_sound = "gurgling" color = "warning" to_chat(user, "You hear [lung_sound].") + +/obj/item/clothing/neck/neckerchief + name = "white neckerchief" + desc = "A neatly tied neckerchief for the service professional." + icon_state = "neckerchief_white" + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/neck.dmi', + "Grey" = 'icons/mob/clothing/species/grey/neck.dmi', + "Kidan" = 'icons/mob/clothing/species/kidan/neck.dmi' + ) + +/obj/item/clothing/neck/neckerchief/black + name = "black neckerchief" + icon_state = "neckerchief_black" + +/obj/item/clothing/neck/neckerchief/green + name = "green neckerchief" + icon_state = "neckerchief_green" + +/obj/item/clothing/neck/neckerchief/red + name = "red neckerchief" + icon_state = "neckerchief_red" diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm index 66682382de2..eb53dad6895 100644 --- a/code/modules/clothing/spacesuits/plasmamen.dm +++ b/code/modules/clothing/spacesuits/plasmamen.dm @@ -210,6 +210,9 @@ desc = "An envirohelm designed for plasmamen chefs." icon_state = "chef_envirohelm" +/obj/item/clothing/head/helmet/space/plasmaman/chef/bw + icon_state = "chef_envirohelm_bw" + /obj/item/clothing/head/helmet/space/plasmaman/librarian name = "librarian plasma envirosuit helmet" desc = "A slight modification on a traditional voidsuit helmet, this helmet was Nanotrasen's first solution to the *logistical problems* that come with employing plasmamen. Despite their limitations, these helmets still see use by historian and old-styled plasmamen alike." diff --git a/code/modules/clothing/suits/job_suits.dm b/code/modules/clothing/suits/job_suits.dm index 3eb99d98418..00400d94623 100644 --- a/code/modules/clothing/suits/job_suits.dm +++ b/code/modules/clothing/suits/job_suits.dm @@ -150,7 +150,7 @@ //Chef /obj/item/clothing/suit/chef name = "chef's coat" - desc = "A coat used by a high class chef." + desc = "A pristine, white chef's coat." icon_state = "chef" inhand_icon_state = "chef" gas_transfer_coefficient = 0.90 @@ -164,6 +164,21 @@ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi', ) +/obj/item/clothing/suit/chef/red + name = "chef's red-piped coat" + desc = "A white chef's coat with red piping as an accent." + icon_state = "chef_red" + +/obj/item/clothing/suit/chef/bw + name = "chef's black-piped coat" + desc = "A white chef's coat with black piping as an accent." + icon_state = "chef_bw" + +/obj/item/clothing/suit/chef/darkgreen + name = "chef's dark coat" + desc = "A black chef's coat with green piping as an accent." + icon_state = "chef_darkgreen" + //Chef /obj/item/clothing/suit/chef/classic name = "classic chef's apron" diff --git a/code/modules/clothing/under/jobs/plasmamen/civilian_service.dm b/code/modules/clothing/under/jobs/plasmamen/civilian_service.dm index 5cf11a2ec09..f9c33828081 100644 --- a/code/modules/clothing/under/jobs/plasmamen/civilian_service.dm +++ b/code/modules/clothing/under/jobs/plasmamen/civilian_service.dm @@ -23,6 +23,9 @@ desc = "A white plasmaman envirosuit designed for culinary practices. One might question why a member of a species that doesn't need to eat would become a chef." icon_state = "chef_envirosuit" +/obj/item/clothing/under/plasmaman/chef/bw + icon_state = "chef_envirosuit_bw" + /obj/item/clothing/under/plasmaman/enviroslacks name = "enviroslacks" desc = "The pet project of a particularly posh plasmaman, this custom suit was quickly appropriated by Nanotrasen for its detectives, internal affairs agents, and bartenders alike." diff --git a/icons/mob/clothing/belt.dmi b/icons/mob/clothing/belt.dmi index 4504e4775f1..5f1695debd6 100644 Binary files a/icons/mob/clothing/belt.dmi and b/icons/mob/clothing/belt.dmi differ diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index fd1a0222878..b622a977ed4 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/clothing/neck.dmi b/icons/mob/clothing/neck.dmi index 779d391e811..a973077eb03 100644 Binary files a/icons/mob/clothing/neck.dmi and b/icons/mob/clothing/neck.dmi differ diff --git a/icons/mob/clothing/species/drask/belt.dmi b/icons/mob/clothing/species/drask/belt.dmi new file mode 100644 index 00000000000..37619f8cbdd Binary files /dev/null and b/icons/mob/clothing/species/drask/belt.dmi differ diff --git a/icons/mob/clothing/species/drask/head.dmi b/icons/mob/clothing/species/drask/head.dmi index 1224f0d88d1..61b8783dcff 100644 Binary files a/icons/mob/clothing/species/drask/head.dmi and b/icons/mob/clothing/species/drask/head.dmi differ diff --git a/icons/mob/clothing/species/drask/suit.dmi b/icons/mob/clothing/species/drask/suit.dmi index e46d9d24daf..61ba4743ac4 100644 Binary files a/icons/mob/clothing/species/drask/suit.dmi and b/icons/mob/clothing/species/drask/suit.dmi differ diff --git a/icons/mob/clothing/species/grey/belt.dmi b/icons/mob/clothing/species/grey/belt.dmi new file mode 100644 index 00000000000..5946c230f57 Binary files /dev/null and b/icons/mob/clothing/species/grey/belt.dmi differ diff --git a/icons/mob/clothing/species/grey/head.dmi b/icons/mob/clothing/species/grey/head.dmi index dce34e2285b..b353c80aedc 100644 Binary files a/icons/mob/clothing/species/grey/head.dmi and b/icons/mob/clothing/species/grey/head.dmi differ diff --git a/icons/mob/clothing/species/grey/neck.dmi b/icons/mob/clothing/species/grey/neck.dmi index 225a1d1e0d3..a67ea9e6a2e 100644 Binary files a/icons/mob/clothing/species/grey/neck.dmi and b/icons/mob/clothing/species/grey/neck.dmi differ diff --git a/icons/mob/clothing/species/grey/suit.dmi b/icons/mob/clothing/species/grey/suit.dmi index 2c4bf30898c..70a62c6b3be 100644 Binary files a/icons/mob/clothing/species/grey/suit.dmi and b/icons/mob/clothing/species/grey/suit.dmi differ diff --git a/icons/mob/clothing/species/kidan/belt.dmi b/icons/mob/clothing/species/kidan/belt.dmi index 6f094a14a46..3c614aa7852 100644 Binary files a/icons/mob/clothing/species/kidan/belt.dmi and b/icons/mob/clothing/species/kidan/belt.dmi differ diff --git a/icons/mob/clothing/species/kidan/head.dmi b/icons/mob/clothing/species/kidan/head.dmi index 18a30be21e0..2d3d1008140 100644 Binary files a/icons/mob/clothing/species/kidan/head.dmi and b/icons/mob/clothing/species/kidan/head.dmi differ diff --git a/icons/mob/clothing/species/kidan/neck.dmi b/icons/mob/clothing/species/kidan/neck.dmi index 44dc0d1fe77..6c50521dfe6 100644 Binary files a/icons/mob/clothing/species/kidan/neck.dmi and b/icons/mob/clothing/species/kidan/neck.dmi differ diff --git a/icons/mob/clothing/species/kidan/suit.dmi b/icons/mob/clothing/species/kidan/suit.dmi index 7a9f37b4cbb..973e2f224c6 100644 Binary files a/icons/mob/clothing/species/kidan/suit.dmi and b/icons/mob/clothing/species/kidan/suit.dmi differ diff --git a/icons/mob/clothing/species/plasmaman/helmet.dmi b/icons/mob/clothing/species/plasmaman/helmet.dmi index c0d4d966385..b27f71fa047 100644 Binary files a/icons/mob/clothing/species/plasmaman/helmet.dmi and b/icons/mob/clothing/species/plasmaman/helmet.dmi differ diff --git a/icons/mob/clothing/species/plasmaman/uniform.dmi b/icons/mob/clothing/species/plasmaman/uniform.dmi index 309276f1f23..782cacd4d1c 100644 Binary files a/icons/mob/clothing/species/plasmaman/uniform.dmi and b/icons/mob/clothing/species/plasmaman/uniform.dmi differ diff --git a/icons/mob/clothing/species/vox/belt.dmi b/icons/mob/clothing/species/vox/belt.dmi index d7a051b5c20..9b7b249f1ec 100644 Binary files a/icons/mob/clothing/species/vox/belt.dmi and b/icons/mob/clothing/species/vox/belt.dmi differ diff --git a/icons/mob/clothing/species/vox/head.dmi b/icons/mob/clothing/species/vox/head.dmi index 831c4300dad..0b76ab0b4bd 100644 Binary files a/icons/mob/clothing/species/vox/head.dmi and b/icons/mob/clothing/species/vox/head.dmi differ diff --git a/icons/mob/clothing/species/vox/neck.dmi b/icons/mob/clothing/species/vox/neck.dmi index 0f69b98d914..822fa81128e 100644 Binary files a/icons/mob/clothing/species/vox/neck.dmi and b/icons/mob/clothing/species/vox/neck.dmi differ diff --git a/icons/mob/clothing/species/vox/suit.dmi b/icons/mob/clothing/species/vox/suit.dmi index 505a25ae562..e6519dce694 100644 Binary files a/icons/mob/clothing/species/vox/suit.dmi and b/icons/mob/clothing/species/vox/suit.dmi differ diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi index 89c02e9f3c1..3d04d2a9a48 100644 Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ diff --git a/icons/mob/inhands/clothing_lefthand.dmi b/icons/mob/inhands/clothing_lefthand.dmi index 7cbde07aba5..9f4e737b4ac 100644 Binary files a/icons/mob/inhands/clothing_lefthand.dmi and b/icons/mob/inhands/clothing_lefthand.dmi differ diff --git a/icons/mob/inhands/clothing_righthand.dmi b/icons/mob/inhands/clothing_righthand.dmi index 6b8b40ad61c..a750ecb680b 100644 Binary files a/icons/mob/inhands/clothing_righthand.dmi and b/icons/mob/inhands/clothing_righthand.dmi differ diff --git a/icons/obj/clothing/belts.dmi b/icons/obj/clothing/belts.dmi index 7ccbc5106ad..54a8d53e7ff 100644 Binary files a/icons/obj/clothing/belts.dmi and b/icons/obj/clothing/belts.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 59c25c14f1f..0c13f21fca3 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/neck.dmi b/icons/obj/clothing/neck.dmi index 3ccb3ef445f..7b1269bab61 100644 Binary files a/icons/obj/clothing/neck.dmi and b/icons/obj/clothing/neck.dmi differ diff --git a/icons/obj/clothing/species/plasmaman/hats.dmi b/icons/obj/clothing/species/plasmaman/hats.dmi index d0ad73e09d1..c9f1841e2b7 100644 Binary files a/icons/obj/clothing/species/plasmaman/hats.dmi and b/icons/obj/clothing/species/plasmaman/hats.dmi differ diff --git a/icons/obj/clothing/species/plasmaman/uniform.dmi b/icons/obj/clothing/species/plasmaman/uniform.dmi index eea30da1304..4df60aa6035 100644 Binary files a/icons/obj/clothing/species/plasmaman/uniform.dmi and b/icons/obj/clothing/species/plasmaman/uniform.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index e757fd09ab9..ad6aec2baa8 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ