diff --git a/code/modules/client/preference_setup/loadout/items/head.dm b/code/modules/client/preference_setup/loadout/items/head.dm index 25de3e831e0..9e44ca1f07a 100644 --- a/code/modules/client/preference_setup/loadout/items/head.dm +++ b/code/modules/client/preference_setup/loadout/items/head.dm @@ -64,7 +64,6 @@ softcaps["softcap, operations"] = /obj/item/clothing/head/softcap/cargo softcaps["softcap, mining"] = /obj/item/clothing/head/softcap/miner softcaps["softcap, janitor"] = /obj/item/clothing/head/softcap/custodian - softcaps["softcap, tcfl"] = /obj/item/clothing/head/softcap/tcfl gear_tweaks += new /datum/gear_tweak/path(softcaps) @@ -244,7 +243,12 @@ hats_colourable["hat, sun hat with band"] = /obj/item/clothing/head/wide_hat/alt hats_colourable["hat, wide pointed"] = /obj/item/clothing/head/wide_hat/pointed hats_colourable["hat, wide pointed with band"] = /obj/item/clothing/head/wide_hat/pointed/alt + hats_colourable["hat, slouch"] = /obj/item/clothing/head/slouch + hats_colourable["hat, sun visor"] = /obj/item/clothing/head/sun_visor + hats_colourable["hat, newsboy"] = /obj/item/clothing/head/newsboy + hats_colourable["hat, legionnaire"] = /obj/item/clothing/head/legionnaire hats_colourable["hat, boonie"] = /obj/item/clothing/head/bucket/boonie + gear_tweaks += new /datum/gear_tweak/path(hats_colourable) /datum/gear/head/hijab @@ -326,6 +330,11 @@ path = /obj/item/clothing/head/beanie flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION +/datum/gear/head/tight_beanie + display_name = "tight beanie" + path = /obj/item/clothing/head/tight_beanie + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + /datum/gear/head/beanie_alt display_name = "winter beanie" path = /obj/item/clothing/head/beanie/winter @@ -385,6 +394,7 @@ var/list/tcfl = list() tcfl["tcfl beret, dress"] = /obj/item/clothing/head/beret/legion tcfl["tcfl beret, field"] = /obj/item/clothing/head/beret/legion/field + tcfl["tcfl softcap"] = /obj/item/clothing/head/softcap/tcfl gear_tweaks += new /datum/gear_tweak/path(tcfl) /datum/gear/head/padded_cap @@ -485,6 +495,10 @@ path = /obj/item/clothing/head/ushanka/nyakas flags = GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION +/datum/gear/head/artistberet + display_name = "artist beret" + path = /obj/item/clothing/head/beret/artist/colourable + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION /* Block Hair Adjustment */ diff --git a/code/modules/clothing/head/berets.dm b/code/modules/clothing/head/berets.dm index a7981a3851e..3fe6561a044 100644 --- a/code/modules/clothing/head/berets.dm +++ b/code/modules/clothing/head/berets.dm @@ -26,6 +26,12 @@ . = ..() color = get_random_colour(TRUE) +/obj/item/clothing/head/beret/artist/colourable + name = "artist beret" + desc = "A beret fit for an artist." + icon_state = "artist_colorable" + item_state = "artist_colorable" + /obj/item/clothing/head/beret/red // Antag red. name = "red beret" desc = "It's a beret in a menacing crimson red." diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 9b83190dbf4..f88ac06314a 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -494,6 +494,33 @@ item_state = "leader_headband" contained_sprite = TRUE +//all by budg +/obj/item/clothing/head/slouch + name = "slouch hat" + desc = "A wide brimmed hat folded to form a slouch." + icon_state = "slouch" + +/obj/item/clothing/head/tight_beanie + name = "tight beanie" + desc = "A rather tight beanie, blocks hair." + icon_state = "tight_beanie" + flags_inv = BLOCKHEADHAIR + cold_protection = HEAD + +/obj/item/clothing/head/sun_visor + name = "sun visor" + desc = "A stylish visor intended for blocking out harsh sunlight." + icon_state = "sun_visor" + +/obj/item/clothing/head/newsboy + name = "newsboy cap" + desc = "A fashionable peaked cap!" + icon_state = "newsboy" + +/obj/item/clothing/head/legionnaire + name = "legionnaire cap" + desc = "A hate made to protect your neck from sunlight, not affiliated with the TCAF." + icon_state = "legionnaire" //sol stuff /obj/item/clothing/head/sol diff --git a/html/changelogs/budg-19490.yml b/html/changelogs/budg-19490.yml new file mode 100644 index 00000000000..de90b126bb1 --- /dev/null +++ b/html/changelogs/budg-19490.yml @@ -0,0 +1,59 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: budg + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - imageadd: "six new hats found in loadout" + - qol: "moved tcfl softcap to more appropriate loadout section" diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index e0851dd4d45..f0c80f33b05 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 0aac6cb8709..f45d22e2a33 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/hats/berets.dmi b/icons/obj/clothing/hats/berets.dmi index 71ef3960cc4..a3e1a03e2cd 100644 Binary files a/icons/obj/clothing/hats/berets.dmi and b/icons/obj/clothing/hats/berets.dmi differ