diff --git a/code/datums/underwear/undershirts.dm b/code/datums/underwear/undershirts.dm index 33886f997d..2f0de005ca 100644 --- a/code/datums/underwear/undershirts.dm +++ b/code/datums/underwear/undershirts.dm @@ -8,6 +8,11 @@ icon_state = "undershirt" has_color = TRUE +/datum/category_item/underwear/undershirt/shirt_long + name = "Longsleeve Shirt" + icon_state = "undershirt_long" + has_color = TRUE + /datum/category_item/underwear/undershirt/tank_top name = "Tank top" icon_state = "tanktop" diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index 4ad804dccd..039da50f65 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -224,3 +224,27 @@ /datum/gear/head/turban/New() ..() gear_tweaks = list(gear_tweak_free_color_choice) + +/datum/gear/head/beanie + display_name = "beanie" + path = /obj/item/clothing/head/beanie + +/datum/gear/head/beanie/New() + ..() + gear_tweaks = list(gear_tweak_free_color_choice) + +/datum/gear/head/loose_beanie + display_name = "loose beanie" + path = /obj/item/clothing/head/beanie_loose + +/datum/gear/head/loose_beanie/New() + ..() + gear_tweaks = list(gear_tweak_free_color_choice) + +/datum/gear/head/beretg + display_name = "beret" + path = /obj/item/clothing/head/beretg + +/datum/gear/head/beretg/New() + ..() + gear_tweaks = list(gear_tweak_free_color_choice) diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 3a2ad098ad..5403fe4ffb 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -282,3 +282,21 @@ item_state_slots = list(slot_r_hand_str = "beret_white", slot_l_hand_str = "beret_white") body_parts_covered = 0 flags_inv = BLOCKHAIR + +/obj/item/clothing/head/beanie + name = "beanie" + desc = "A head-hugging brimless winter cap. This one is tight." + icon_state = "beanie" + body_parts_covered = 0 + +/obj/item/clothing/head/beanie_loose + name = "loose beanie" + desc = "A head-hugging brimless winter cap. This one is loose." + icon_state = "beanie_hang" + body_parts_covered = 0 + +/obj/item/clothing/head/beretg + name = "beret" + desc = "A beret, an artists favorite headwear." + icon_state = "beret_g" + body_parts_covered = 0 \ No newline at end of file diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 5a343aa2ae..b9e90df4b1 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/human.dmi b/icons/mob/human.dmi index 4f14b81e3e..b8275ce7bf 100644 Binary files a/icons/mob/human.dmi and b/icons/mob/human.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 6d13ab616c..3fffa24252 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ