diff --git a/code/game/machinery/vendors/wardrobe_vendors.dm b/code/game/machinery/vendors/wardrobe_vendors.dm index fc72f1c7215..f792109e3bd 100644 --- a/code/game/machinery/vendors/wardrobe_vendors.dm +++ b/code/game/machinery/vendors/wardrobe_vendors.dm @@ -580,6 +580,7 @@ /obj/item/clothing/suit/chef/classic = 2, /obj/item/clothing/head/chefhat = 2, /obj/item/clothing/head/soft/mime = 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, @@ -595,6 +596,7 @@ /obj/item/clothing/suit/chef/classic = 50, /obj/item/clothing/head/chefhat = 50, /obj/item/clothing/head/soft/mime = 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, @@ -618,6 +620,7 @@ /obj/item/clothing/under/misc/sl_suit = 2, /obj/item/clothing/head/that = 2, /obj/item/clothing/head/soft/black = 2, + /obj/item/clothing/head/beret/black = 2, /obj/item/clothing/suit/blacktrenchcoat = 2, /obj/item/clothing/shoes/laceup = 2, /obj/item/clothing/shoes/black = 2, @@ -631,6 +634,7 @@ /obj/item/clothing/under/misc/sl_suit = 50, /obj/item/clothing/head/that = 20, /obj/item/clothing/head/soft/black = 20, + /obj/item/clothing/head/beret/black = 20, /obj/item/clothing/suit/blacktrenchcoat = 75, /obj/item/clothing/shoes/laceup = 30, /obj/item/clothing/shoes/black = 20, diff --git a/code/game/objects/structures/crates_lockers/closets/secure/miscjobs.dm b/code/game/objects/structures/crates_lockers/closets/secure/miscjobs.dm index c4f81f18415..bfaf642d5a7 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/miscjobs.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/miscjobs.dm @@ -28,6 +28,8 @@ /obj/structure/closet/secure_closet/mime/populate_contents() new /obj/item/clothing/head/beret(src) + new /obj/item/clothing/head/beret/black(src) + new /obj/item/clothing/head/beret/white(src) new /obj/item/clothing/mask/gas/mime(src) new /obj/item/radio/headset/headset_service(src) new /obj/item/clothing/under/rank/civilian/mime(src) diff --git a/code/modules/client/preference/loadout/loadout_hat.dm b/code/modules/client/preference/loadout/loadout_hat.dm index 065211b583e..4db77a19b2f 100644 --- a/code/modules/client/preference/loadout/loadout_hat.dm +++ b/code/modules/client/preference/loadout/loadout_hat.dm @@ -146,6 +146,10 @@ display_name = "Beret, black" path = /obj/item/clothing/head/beret/black +/datum/gear/hat/beret_white + display_name = "Beret, white" + path = /obj/item/clothing/head/beret/white + /datum/gear/hat/beret_blue display_name = "Beret, blue" path = /obj/item/clothing/head/beret/blue diff --git a/code/modules/clothing/head/misc_hats.dm b/code/modules/clothing/head/misc_hats.dm index d74cf055589..c4bf3681635 100644 --- a/code/modules/clothing/head/misc_hats.dm +++ b/code/modules/clothing/head/misc_hats.dm @@ -33,6 +33,9 @@ /obj/item/clothing/head/beret/black icon_state = "beret_black" +/obj/item/clothing/head/beret/white + icon_state = "beret_white" + /obj/item/clothing/head/beret/purple_normal icon_state = "beret_purple_normal" diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index f0d4119cd32..20e9e40df95 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/clothing/species/drask/head.dmi b/icons/mob/clothing/species/drask/head.dmi index 43d79a0ecab..52d01919f9b 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/vox/head.dmi b/icons/mob/clothing/species/vox/head.dmi index d3b27c52a9f..41a97fb9a55 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/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index aa98071bfa5..15145640d3d 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ