diff --git a/code/game/objects/random/clothing.dm b/code/game/objects/random/clothing.dm index 6dce3bab2f5..6069bba39f4 100644 --- a/code/game/objects/random/clothing.dm +++ b/code/game/objects/random/clothing.dm @@ -232,6 +232,7 @@ icon_state = "beret" problist = list( /obj/item/clothing/head/beret/colorable/random = 5, + /obj/item/clothing/head/beret/peaked/colourable/random = 5, /obj/item/clothing/head/beret/engineering = 3, /obj/item/clothing/head/beret/atmos = 3, /obj/item/clothing/head/beret/medical = 3, diff --git a/code/modules/client/preference_setup/loadout/items/head.dm b/code/modules/client/preference_setup/loadout/items/head.dm index af2555838f6..1cc0ef80a2a 100644 --- a/code/modules/client/preference_setup/loadout/items/head.dm +++ b/code/modules/client/preference_setup/loadout/items/head.dm @@ -102,6 +102,11 @@ path = /obj/item/clothing/head/beret/colorable flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION +/datum/gear/head/peaked_beret_colour + display_name = "beret, peaked (colourable)" + path = /obj/item/clothing/head/beret/peaked/colourable + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + /datum/gear/head/sidecap display_name = "side cap" path = /obj/item/clothing/head/sidecap diff --git a/code/modules/clothing/head/berets.dm b/code/modules/clothing/head/berets.dm index ea8b993de6a..a7981a3851e 100644 --- a/code/modules/clothing/head/berets.dm +++ b/code/modules/clothing/head/berets.dm @@ -16,6 +16,16 @@ . = ..() color = get_random_colour(TRUE) +/obj/item/clothing/head/beret/peaked/colourable + name = "peaked beret" + desc = "A peaked beret." + icon_state = "beret_peaked_colourable" + item_state = "beret_peaked_colourable" + +/obj/item/clothing/head/beret/peaked/colourable/random/Initialize() + . = ..() + color = get_random_colour(TRUE) + /obj/item/clothing/head/beret/red // Antag red. name = "red beret" desc = "It's a beret in a menacing crimson red." diff --git a/html/changelogs/SleepyGemmy-peaked_beret.yml b/html/changelogs/SleepyGemmy-peaked_beret.yml new file mode 100644 index 00000000000..497cb67725d --- /dev/null +++ b/html/changelogs/SleepyGemmy-peaked_beret.yml @@ -0,0 +1,6 @@ +author: SleepyGemmy + +delete-after: True + +changes: + - rscadd: "Added a colourable peaked beret to the loadout." diff --git a/icons/obj/clothing/hats/berets.dmi b/icons/obj/clothing/hats/berets.dmi index 5edc6e2874c..71ef3960cc4 100644 Binary files a/icons/obj/clothing/hats/berets.dmi and b/icons/obj/clothing/hats/berets.dmi differ