diff --git a/code/game/objects/random/clothing.dm b/code/game/objects/random/clothing.dm index 10c907f88fc..0bb60e0b80f 100644 --- a/code/game/objects/random/clothing.dm +++ b/code/game/objects/random/clothing.dm @@ -225,7 +225,6 @@ 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/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 49a313d33ff..0dcb92f3744 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -368,6 +368,7 @@ ..() new /obj/item/clothing/under/rank/bridge_crew(src) new /obj/item/clothing/head/caphat/bridge_crew(src) + new /obj/item/clothing/head/caphat/bridge_crew/alt(src) new /obj/item/clothing/glasses/sunglasses(src) new /obj/item/clothing/accessory/holster/waist(src) new /obj/item/gun/energy/disruptorpistol/miniature(src) diff --git a/code/modules/background/citizenship/human.dm b/code/modules/background/citizenship/human.dm index 4dd3a2c6d91..65cbe6b3f5e 100644 --- a/code/modules/background/citizenship/human.dm +++ b/code/modules/background/citizenship/human.dm @@ -427,6 +427,10 @@ /obj/outfit/job/representative/consular/dominia name = "Empire of Dominia Consular Officer" + head = /obj/item/clothing/head/dominia + suit = /obj/item/clothing/suit/storage/dominia/consular/coat + uniform = /obj/item/clothing/under/dominia/consular + backpack_contents = list( /obj/item/storage/box/dominia_honor = 1 ) diff --git a/code/modules/client/preference_setup/loadout/items/factions.dm b/code/modules/client/preference_setup/loadout/items/factions.dm index 3c0df70738c..5072a2eb204 100644 --- a/code/modules/client/preference_setup/loadout/items/factions.dm +++ b/code/modules/client/preference_setup/loadout/items/factions.dm @@ -144,8 +144,8 @@ zavodskoi_headwear["zavodskoi cap, alt"] = /obj/item/clothing/head/softcap/zavod/alt zavodskoi_headwear["zavodskoi woolen hat"] = /obj/item/clothing/head/wool/zavod zavodskoi_headwear["zavodskoi woolen hat, alt"] = /obj/item/clothing/head/wool/zavod/alt - zavodskoi_headwear["zavodskoi pilotka cap"] = /obj/item/clothing/head/sidecap/zavod - zavodskoi_headwear["zavodskoi pilotka cap, alt"] = /obj/item/clothing/head/sidecap/zavod/alt + zavodskoi_headwear["zavodskoi side cap"] = /obj/item/clothing/head/sidecap/zavod + zavodskoi_headwear["zavodskoi side cap, alt"] = /obj/item/clothing/head/sidecap/zavod/alt gear_tweaks += new /datum/gear_tweak/path(zavodskoi_headwear) /datum/gear/faction/zavod_sec_uniforms @@ -363,7 +363,7 @@ pmcg_headwear["EPMC softcap"] = /obj/item/clothing/head/softcap/pmc/epmc pmcg_headwear["PMCG woolen hat"] = /obj/item/clothing/head/wool/pmc pmcg_headwear["EPMC woolen hat"] = /obj/item/clothing/head/wool/pmc/alt - pmcg_headwear["PMCG garrison cap"] = /obj/item/clothing/head/sidecap/pmcg + pmcg_headwear["PMCG side cap"] = /obj/item/clothing/head/sidecap/pmcg pmcg_headwear["Grupo Amapola utility cover"] = /obj/item/clothing/head/grupo_amapola/ute gear_tweaks += new /datum/gear_tweak/path(pmcg_headwear) @@ -847,8 +847,10 @@ GLOBAL_DATUM_INIT(gear_tweak_modsuit_configuration, /datum/gear_tweak/modsuit_co ..() var/list/scc_headwear = list() scc_headwear["beret, SCC"] = /obj/item/clothing/head/beret/scc - scc_headwear["SCC woolen hat"] = /obj/item/clothing/head/wool/scc - scc_headwear["SCC woolen hat, alt"] = /obj/item/clothing/head/wool/scc/alt + scc_headwear["woolen hat, SCC"] = /obj/item/clothing/head/wool/scc + scc_headwear["woolen hat, SCC, alt"] = /obj/item/clothing/head/wool/scc/alt + scc_headwear["bridge crew hat, SCC"] = /obj/item/clothing/head/caphat/bridge_crew + scc_headwear["bridge crew hat, SCC, alt"] = /obj/item/clothing/head/caphat/bridge_crew/alt gear_tweaks += new /datum/gear_tweak/path(scc_headwear) /datum/gear/faction/scc_notepad diff --git a/code/modules/client/preference_setup/loadout/items/head.dm b/code/modules/client/preference_setup/loadout/items/head.dm index 7d85ba01efa..938b7aebb01 100644 --- a/code/modules/client/preference_setup/loadout/items/head.dm +++ b/code/modules/client/preference_setup/loadout/items/head.dm @@ -1,18 +1,11 @@ -/datum/gear/head - display_name = "green boonie hat" - path = /obj/item/clothing/head/bucket/boonie/green - slot = slot_head +ABSTRACT_TYPE(/datum/gear/head) sort_category = "Hats and Headwear" + slot = slot_head /datum/gear/head/New() ..() gear_tweaks += list(GLOB.gear_tweak_hair_block) -/datum/gear/head/boonie_blue - display_name = "blue boonie hat" - description = "A floppy boonie hat with an attached string. This one is blue." - path = /obj/item/clothing/head/bucket/boonie/blue - /datum/gear/head/bandana display_name = "bandana selection" description = "A selection of bandanas. Comes in departmental colors." @@ -37,11 +30,6 @@ gear_tweaks += new /datum/gear_tweak/path(bandanas) -/datum/gear/head/bandana_color - display_name = "bandana (colorable)" - path = /obj/item/clothing/head/bandana/colorable - flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION - /datum/gear/head/softcap display_name = "softcap selection" description = "A selection of softcaps. Comes in departmental colors." @@ -67,11 +55,6 @@ gear_tweaks += new /datum/gear_tweak/path(softcaps) -/datum/gear/head/softcap_color - display_name = "softcap (colorable)" - path = /obj/item/clothing/head/softcap/colorable - flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION - /datum/gear/head/beret display_name = "beret selection" description = "A selection of berets. Comes in departmental colors." @@ -96,37 +79,6 @@ gear_tweaks += new /datum/gear_tweak/path(berets) -/datum/gear/head/beret_color - display_name = "beret (colorable)" - 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 - flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION - -/datum/gear/head/warden - display_name = "headwear, security (warden)" - description = "A selection of warden headwear." - path = /obj/item/clothing/head - allowed_roles = list("Head of Security" , "Warden", "Security Personnel") - -/datum/gear/head/warden/New() - ..() - var/list/wardenhead = list() - wardenhead["warden hat, zavod"] = /obj/item/clothing/head/warden/zavod - wardenhead["warden hat, zavod alt"] = /obj/item/clothing/head/warden/zavod/alt - wardenhead["warden hat, idris"] = /obj/item/clothing/head/warden/idris - wardenhead["warden hat, pmc"] = /obj/item/clothing/head/warden/pmc - wardenhead["warden beret"] = /obj/item/clothing/head/beret/security/warden - gear_tweaks += new /datum/gear_tweak/path(wardenhead) - /datum/gear/head/hos display_name = "headwear, security (head of security)" description = "A selection of head of security headwear." @@ -205,104 +157,6 @@ hair_accessories_colourable["hair pin, magnet"] = /obj/item/clothing/head/pin/magnetic gear_tweaks += new /datum/gear_tweak/path(hair_accessories_colourable) -/datum/gear/head/hats - display_name = "hat selection" - description = "A selection of hats." - path = /obj/item/clothing/head/boaterhat - -/datum/gear/head/hats/New() - ..() - var/list/hats = list() - hats["hat, boatsman"] = /obj/item/clothing/head/boaterhat - hats["hat, bowler"] = /obj/item/clothing/head/bowler - hats["hat, fez"] = /obj/item/clothing/head/fez - hats["hat, feather trilby"] = /obj/item/clothing/head/feathertrilby - hats["hat, beaver"] = /obj/item/clothing/head/beaverhat - hats["hat, sombrero"] = /obj/item/clothing/head/sombrero - hats["hat, flatcap"] = /obj/item/clothing/head/flatcap - gear_tweaks += new /datum/gear_tweak/path(hats) - -/datum/gear/head/hats_colourable - display_name = "hat selection (colourable)" - description = "A selection of hats." - path = /obj/item/clothing/head/flatcap/colourable - flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION | GEAR_HAS_ACCENT_COLOR_SELECTION - -/datum/gear/head/hats_colourable/New() - ..() - var/list/hats_colourable = list() - hats_colourable["hat, flatcap"] = /obj/item/clothing/head/flatcap/colourable - hats_colourable["hat, bucket"] = /obj/item/clothing/head/bucket - hats_colourable["hat, feather trilby"] = /obj/item/clothing/head/feathertrilby/colourable - hats_colourable["hat, woolen"] = /obj/item/clothing/head/wool - hats_colourable["hat, fedora"] = /obj/item/clothing/head/fedora - hats_colourable["hat, top hat"] = /obj/item/clothing/head/top_hat - hats_colourable["hat, cowboy"] = /obj/item/clothing/head/cowboy - hats_colourable["hat, cowboy wide"] = /obj/item/clothing/head/cowboy/wide - hats_colourable["hat, wide sun hat"] = /obj/item/clothing/head/wide_hat - 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 - hats_colourable["hat, camo boonie"] = /obj/item/clothing/head/bucket/boonie/camo - - gear_tweaks += new /datum/gear_tweak/path(hats_colourable) - -/datum/gear/head/hijab - display_name = "hijab selection" - path = /obj/item/clothing/head/hijab - -/datum/gear/head/hijab/New() - ..() - var/list/hijab = list() - hijab["white hijab"] = /obj/item/clothing/head/hijab - hijab["grey hijab"] = /obj/item/clothing/head/hijab/grey - hijab["red hijab"] = /obj/item/clothing/head/hijab/red - hijab["brown hijab"] = /obj/item/clothing/head/hijab/brown - hijab["green hijab"] = /obj/item/clothing/head/hijab/green - hijab["blue hijab"] = /obj/item/clothing/head/hijab/blue - hijab["black hijab"] = /obj/item/clothing/head/hijab/black - - gear_tweaks += new /datum/gear_tweak/path(hijab) - -/datum/gear/head/hijab_colorable - display_name = "colorable hijab" - path = /obj/item/clothing/head/hijab - flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION - -/datum/gear/head/plain_hood - display_name = "colorable hood" - path = /obj/item/clothing/head/plain_hood - flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION - -/datum/gear/head/turban - display_name = "turban selection" - path = /obj/item/clothing/head/turban - -/datum/gear/head/turban/New() - ..() - var/list/turbans = list() - turbans["black turban"] = /obj/item/clothing/head/turban - turbans["blue turban"] = /obj/item/clothing/head/turban/blue - turbans["green turban"] = /obj/item/clothing/head/turban/green - turbans["grey turban"] = /obj/item/clothing/head/turban/grey - turbans["orange turban"] = /obj/item/clothing/head/turban/orange - turbans["purple turban"] = /obj/item/clothing/head/turban/purple - turbans["red turban"] = /obj/item/clothing/head/turban/red - turbans["white turban"] = /obj/item/clothing/head/turban/white - turbans["yellow turban"] = /obj/item/clothing/head/turban/yellow - - gear_tweaks += new /datum/gear_tweak/path(turbans) - -/datum/gear/head/turban_colourable - display_name = "turban (colourable)" - path = /obj/item/clothing/head/turban/white - flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION - /datum/gear/head/surgical display_name = "surgical cap selection" path = /obj/item/clothing/head/surgery/pmc @@ -319,57 +173,6 @@ surgical["surgical cap, idris green"] = /obj/item/clothing/head/surgery/idris gear_tweaks += new /datum/gear_tweak/path(surgical) -/datum/gear/head/headbando - display_name = "basic headband" - path = /obj/item/clothing/head/headbando - flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION - -/datum/gear/head/beanie - display_name = "beanie" - 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 - flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION | GEAR_HAS_ACCENT_COLOR_SELECTION - -/datum/gear/head/submariner_beanie - display_name = "submariner beanie" - path = /obj/item/clothing/head/beanie/submariner - flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION - -/datum/gear/head/nonla - display_name = "non la hat" - path = /obj/item/clothing/head/nonla - origin_restriction = list(/singleton/origin_item/origin/earth, /singleton/origin_item/origin/new_hai_phong) - -/datum/gear/head/konyang - display_name = "gat" - path = /obj/item/clothing/head/konyang - -/datum/gear/head/hachimaki - display_name = "konyanger hachimaki" - path = /obj/item/clothing/head/hachimaki - flags = GEAR_HAS_DESC_SELECTION - -/datum/gear/head/bearpelt - display_name = "bear pelt hat" - path = /obj/item/clothing/head/bearpelt - description = "A fuzzy pelt to wear on your head." - flags = GEAR_HAS_DESC_SELECTION - -/datum/gear/head/gentlecap - display_name = "gentlemans cap" - path = /obj/item/clothing/head/wizard/cap - description = "A checkered gray flat cap woven together with the rarest of threads." - flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION - /datum/gear/head/iac display_name = "IAC headgear selection" description = "A selection of hats worn by Interstellar Aid Corps volunteers." @@ -403,109 +206,6 @@ tcaf["tcfl softcap"] = /obj/item/clothing/head/softcap/tcfl gear_tweaks += new /datum/gear_tweak/path(tcaf) -/datum/gear/head/padded_cap - display_name = "padded cap" - path = /obj/item/clothing/head/padded - flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION - -/datum/gear/head/himeo - display_name = "himean cap" - path = /obj/item/clothing/head/softcap/himeo - flags = GEAR_HAS_DESC_SELECTION - origin_restriction = list(/singleton/origin_item/origin/himeo, /singleton/origin_item/origin/ipc_himeo, /singleton/origin_item/origin/free_council) - -/datum/gear/head/vysoka - display_name = "vysokan fur cap selection" - description = "A fur hat from Vysoka made of authentic ohdker fur." - path = /obj/item/clothing/head/vysoka - flags = GEAR_HAS_DESC_SELECTION - origin_restriction = list(/singleton/origin_item/origin/vysoka, /singleton/origin_item/origin/ipc_vysoka) - -/datum/gear/head/vysoka/New() - ..() - var/list/vysoka = list() - vysoka["fur cap"] = /obj/item/clothing/head/vysoka - vysoka["fur cap, purple"] = /obj/item/clothing/head/vysoka/purple - vysoka["fur cap, blue"] = /obj/item/clothing/head/vysoka/blue - vysoka["fur cap, red"] = /obj/item/clothing/head/vysoka/red - gear_tweaks += new /datum/gear_tweak/path(vysoka) - -/datum/gear/head/joku - display_name = "vysokan joku cap" - description = "A warm-looking expensive cap made from fine, dyed dalakyhr fur." - path = /obj/item/clothing/head/vysoka/joku - flags = GEAR_HAS_DESC_SELECTION - origin_restriction = list(/singleton/origin_item/origin/vysoka, /singleton/origin_item/origin/ipc_vysoka) - -/datum/gear/head/joku/New() - ..() - var/list/joku = list() - joku["fancy cap"] = /obj/item/clothing/head/vysoka/joku - joku["fancy cap, purple"] = /obj/item/clothing/head/vysoka/joku/purple - joku["fancy cap, blue"] = /obj/item/clothing/head/vysoka/joku/blue - joku["fancy cap, red"] = /obj/item/clothing/head/vysoka/joku/red - gear_tweaks += new /datum/gear_tweak/path(joku) - -/datum/gear/head/dainshu - display_name = "vysokan dainshu feather" - description = "The feather of a Vysokan dainshu, a domesticated flying beast." - path = /obj/item/clothing/head/pin/dainshu - flags = GEAR_HAS_DESC_SELECTION - origin_restriction = list(/singleton/origin_item/origin/vysoka, /singleton/origin_item/origin/ipc_vysoka) - -/datum/gear/head/bridge_crew_cap_alt - display_name = "san colettish bridge crew cap" - path = /obj/item/clothing/head/caphat/bridge_crew/alt - allowed_roles = list("Bridge Crew", "Captain", "Executive Officer") - -/datum/gear/head/gadpathur - display_name = "gadpathurian headgear selection" - description = "A selection of headgear from Gadpathur." - path = /obj/item/clothing/head/gadpathur - flags = GEAR_HAS_DESC_SELECTION - origin_restriction = list(/singleton/origin_item/origin/gadpathur) - -/datum/gear/head/ushanka - display_name = "ushanka (colorable)" - path = /obj/item/clothing/head/ushanka - flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION - -/datum/gear/head/gadpathur/New() - ..() - var/list/gadpathur = list() - gadpathur["gadpathurian sidecap"] = /obj/item/clothing/head/gadpathur - gadpathur["gadpathurian beret"] = /obj/item/clothing/head/beret/gadpathur - gadpathur["gadpathurian engineer beret"] = /obj/item/clothing/head/beret/gadpathur/engineer - gadpathur["gadpathurian medical beret"] = /obj/item/clothing/head/beret/gadpathur/medical - gadpathur["gadpathurian turban"] = /obj/item/clothing/head/turban/gadpathur - gadpathur["gadpathurian patrol cap"] = /obj/item/clothing/head/ushanka/gadpathur - gear_tweaks += new /datum/gear_tweak/path(gadpathur) - -/datum/gear/head/dominia - display_name = "fisanduhian ushanka" - path = /obj/item/clothing/head/ushanka/dominia - flags = GEAR_HAS_DESC_SELECTION - -/datum/gear/head/dominia_consular - display_name = "dominian consular cap" - path = /obj/item/clothing/head/dominia - allowed_roles = list("Consular Officer") - -/datum/gear/head/hairnet - display_name = "hairnet" - path = /obj/item/clothing/head/hairnet - flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION - -/datum/gear/head/nyakas - display_name = "visegradi nyakas" - 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 - /datum/gear/head/peakedcap display_name = "corporate peaked cap selection" description = "A selection of corporate-colored peaked caps. Note that the cap should align with your character's chosen faction." @@ -527,6 +227,104 @@ caps["peaked cap, Private Military Contracting Group, no logo"] = /obj/item/clothing/head/peaked_cap/pmcg/no_logo gear_tweaks += new /datum/gear_tweak/path(caps) +/datum/gear/head/warden + display_name = "headwear, security (warden)" + description = "A selection of warden headwear." + path = /obj/item/clothing/head + allowed_roles = list("Head of Security" , "Warden", "Security Personnel") + +/datum/gear/head/warden/New() + ..() + var/list/wardenhead = list() + wardenhead["warden hat, Zavodskoi Interstellar"] = /obj/item/clothing/head/warden/zavod + wardenhead["warden hat, Zavodskoi Interstellar, alt"] = /obj/item/clothing/head/warden/zavod/alt + wardenhead["warden hat, Idris Incorporated"] = /obj/item/clothing/head/warden/idris + wardenhead["warden hat, Private Military Contracting Group"] = /obj/item/clothing/head/warden/pmc + wardenhead["warden beret"] = /obj/item/clothing/head/beret/security/warden + gear_tweaks += new /datum/gear_tweak/path(wardenhead) + +/datum/gear/head/hats + display_name = "hat selection" + description = "A selection of hats." + path = /obj/item/clothing/head/boaterhat + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION + +/datum/gear/head/hats/New() + ..() + var/list/hats = list() + hats["hat, boatsman"] = /obj/item/clothing/head/boaterhat + hats["hat, bowler"] = /obj/item/clothing/head/bowler + hats["hat, fez"] = /obj/item/clothing/head/fez + hats["hat, beaver"] = /obj/item/clothing/head/beaverhat + hats["hat, sombrero"] = /obj/item/clothing/head/sombrero + hats["hat, bear pelt"] = /obj/item/clothing/head/bearpelt + gear_tweaks += new /datum/gear_tweak/path(hats) + +/datum/gear/head/hats_colourable + display_name = "hat selection (colourable)" + description = "A selection of colorable hats." + path = /obj/item/clothing/head/flatcap + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION | GEAR_HAS_ACCENT_COLOR_SELECTION + +/datum/gear/head/hats_colourable/New() + ..() + var/list/hats_colourable = list() + hats_colourable["hat, flatcap"] = /obj/item/clothing/head/flatcap + hats_colourable["hat, feather trilby"] = /obj/item/clothing/head/feathertrilby + hats_colourable["hat, woolen"] = /obj/item/clothing/head/wool + hats_colourable["hat, fedora"] = /obj/item/clothing/head/fedora + hats_colourable["hat, top hat"] = /obj/item/clothing/head/top_hat + hats_colourable["hat, cowboy"] = /obj/item/clothing/head/cowboy + hats_colourable["hat, cowboy wide"] = /obj/item/clothing/head/cowboy/wide + hats_colourable["hat, sun hat"] = /obj/item/clothing/head/wide_hat + 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, headband"] = /obj/item/clothing/head/headbando + hats_colourable["hat, bandana"] = /obj/item/clothing/head/bandana/colorable + hats_colourable["hat, softcap"] = /obj/item/clothing/head/softcap/colorable + hats_colourable["hat, softcap with accent"] = /obj/item/clothing/head/softcap/colorable/accent + hats_colourable["hat, newsboy"] = /obj/item/clothing/head/softcap/newsboy + hats_colourable["hat, visegradi nyakas"] = /obj/item/clothing/head/ushanka/cap + hats_colourable["hat, beret"] = /obj/item/clothing/head/beret/colorable + hats_colourable["hat, peaked beret"] = /obj/item/clothing/head/beret/peaked/colorable + hats_colourable["hat, side cap"] = /obj/item/clothing/head/sidecap + hats_colourable["hat, hijab"] = /obj/item/clothing/head/hijab + hats_colourable["hat, hood"] = /obj/item/clothing/head/plain_hood + hats_colourable["hat, turban"] = /obj/item/clothing/head/turban + hats_colourable["hat, tanker cap"] = /obj/item/clothing/head/tanker + hats_colourable["hat, ushanka"] = /obj/item/clothing/head/ushanka + hats_colourable["hat, hairnet"] = /obj/item/clothing/head/hairnet + gear_tweaks += new /datum/gear_tweak/path(hats_colourable) + +/datum/gear/head/beanie + display_name = "beanie selection" + description = "A selection of beanies." + path = /obj/item/clothing/head/beanie + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION | GEAR_HAS_ACCENT_COLOR_SELECTION + +/datum/gear/head/beanie/New() + ..() + var/list/hats = list() + hats["beanie"] = /obj/item/clothing/head/beanie + hats["beanie, ear flap"] = /obj/item/clothing/head/beanie/earflap + hats["beanie, submariner"] = /obj/item/clothing/head/beanie/submariner + gear_tweaks += new /datum/gear_tweak/path(hats) + +/datum/gear/head/bucket_hat + display_name = "bucket hat selection" + description = "A selection of bucket hats." + path = /obj/item/clothing/head/bucket + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION | GEAR_HAS_ACCENT_COLOR_SELECTION + +/datum/gear/head/bucket_hat/New() + ..() + var/list/hats = list() + hats["hat, bucket"] = /obj/item/clothing/head/bucket + hats["hat, boonie"] = /obj/item/clothing/head/bucket/boonie + hats["hat, camo boonie"] = /obj/item/clothing/head/bucket/boonie/camo + gear_tweaks += new /datum/gear_tweak/path(hats) + /* Block Hair Adjustment */ @@ -552,4 +350,3 @@ GLOBAL_DATUM_INIT(gear_tweak_hair_block, /datum/gear_tweak/hair_block, new()) H.flags_inv |= BLOCKHEADHAIR if("No") H.flags_inv &= ~BLOCKHEADHAIR - diff --git a/code/modules/client/preference_setup/loadout/items/suit.dm b/code/modules/client/preference_setup/loadout/items/suit.dm index 84a766738a0..f75dbcbd718 100644 --- a/code/modules/client/preference_setup/loadout/items/suit.dm +++ b/code/modules/client/preference_setup/loadout/items/suit.dm @@ -382,21 +382,6 @@ coat["dominian great coat, black"] = /obj/item/clothing/suit/storage/dominia/black gear_tweaks += new /datum/gear_tweak/path(coat) -/datum/gear/suit/dominia_consular - display_name = "dominian consular officer coat selection" - description = "A selection of coats belonging to the Diplomatic Service." - path = /obj/item/clothing/suit/storage/dominia/consular - allowed_roles = list("Consular Officer") - flags = GEAR_HAS_DESC_SELECTION - culture_restriction = list(/singleton/origin_item/culture/dominia, /singleton/origin_item/culture/dominian_unathi) - -/datum/gear/suit/dominia_consular/New() - ..() - var/list/coat = list() - coat["dominian consular's greatcoat"] = /obj/item/clothing/suit/storage/dominia/consular - coat["dominian consular's coat"] = /obj/item/clothing/suit/storage/dominia/consular/coat - gear_tweaks += new /datum/gear_tweak/path(coat) - /datum/gear/suit/fisanduhian_bomber display_name = "fisanduhian bomber jacket selection" description = "A selection of Fisanduhian jackets." diff --git a/code/modules/client/preference_setup/loadout/items/uniform.dm b/code/modules/client/preference_setup/loadout/items/uniform.dm index 5600925403a..85e99eb4bca 100644 --- a/code/modules/client/preference_setup/loadout/items/uniform.dm +++ b/code/modules/client/preference_setup/loadout/items/uniform.dm @@ -185,20 +185,6 @@ suit["[D.name]"] = D.type gear_tweaks += new /datum/gear_tweak/path(suit) -/datum/gear/uniform/dominia_consular - display_name = "dominian consular clothing selection" - description = "A selection of Dominian clothing belonging to the Diplomatic Service." - path = /obj/item/clothing/under/dominia/consular - allowed_roles = list("Consular Officer") - culture_restriction = list(/singleton/origin_item/culture/dominia, /singleton/origin_item/culture/dominian_unathi) - -/datum/gear/uniform/dominia_consular/New() - ..() - var/list/consular = list() - consular["dominian consular officer's uniform, masculine"] = /obj/item/clothing/under/dominia/consular - consular["dominian consular officer's uniform, feminine"] = /obj/item/clothing/under/dominia/consular/dress - gear_tweaks += new /datum/gear_tweak/path(consular) - /datum/gear/uniform/fisanduhian_sweater display_name = "fisanduhian sweater" path = /obj/item/clothing/under/dominia/sweater diff --git a/code/modules/client/preference_setup/loadout/items/xeno/human.dm b/code/modules/client/preference_setup/loadout/items/xeno/human.dm index bfc436c31c1..4f8dfe73473 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/human.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/human.dm @@ -99,3 +99,81 @@ sort_category = "Xenowear - Human" flags = GEAR_HAS_DESC_SELECTION origin_restriction = list(/singleton/origin_item/origin/coa_spacer) + +/datum/gear/head/human/conical + display_name = "non la conical hat" + sort_category = "Xenowear - Human" + path = /obj/item/clothing/head/nonla + origin_restriction = list(/singleton/origin_item/origin/konyang, /singleton/origin_item/origin/ipc_konyang, /singleton/origin_item/origin/new_hai_phong) + +/datum/gear/head/human/konyanger + display_name = "konyanger hat selection" + sort_category = "Xenowear - Human" + path = /obj/item/clothing/head/konyang + origin_restriction = list(/singleton/origin_item/origin/konyang, /singleton/origin_item/origin/ipc_konyang) + +/datum/gear/head/human/konyanger/New() + ..() + var/list/hats = list() + hats["hat, gat"] = /obj/item/clothing/head/konyang + hats["hat, konyanger hachimaki"] = /obj/item/clothing/head/hachimaki + +/datum/gear/head/human/himeo + display_name = "himean cap" + sort_category = "Xenowear - Human" + path = /obj/item/clothing/head/softcap/himeo + origin_restriction = list(/singleton/origin_item/origin/himeo, /singleton/origin_item/origin/ipc_himeo, /singleton/origin_item/origin/free_council) + +/datum/gear/head/human/fisanduhian_ushanka + display_name = "fisanduhian ushanka" + sort_category = "Xenowear - Human" + path = /obj/item/clothing/head/ushanka/dominia + culture_restriction = list(/singleton/origin_item/culture/dominia, /singleton/origin_item/culture/dominian_unathi) + +/datum/gear/head/vysoka + display_name = "vysokan hat selection" + description = "A selection of vysokan hats." + path = /obj/item/clothing/head/vysoka + flags = GEAR_HAS_DESC_SELECTION + origin_restriction = list(/singleton/origin_item/origin/vysoka, /singleton/origin_item/origin/ipc_vysoka) + sort_category = "Xenowear - Human" + +/datum/gear/head/vysoka/New() + ..() + var/list/vysoka = list() + vysoka["fur cap"] = /obj/item/clothing/head/vysoka + vysoka["fur cap, purple"] = /obj/item/clothing/head/vysoka/purple + vysoka["fur cap, blue"] = /obj/item/clothing/head/vysoka/blue + vysoka["fur cap, red"] = /obj/item/clothing/head/vysoka/red + vysoka["joku cap"] = /obj/item/clothing/head/vysoka/joku + vysoka["joku cap, purple"] = /obj/item/clothing/head/vysoka/joku/purple + vysoka["joku cap, blue"] = /obj/item/clothing/head/vysoka/joku/blue + vysoka["joku cap, red"] = /obj/item/clothing/head/vysoka/joku/red + vysoka["hair pin, dainshu feather"] = /obj/item/clothing/head/pin/dainshu + gear_tweaks += new /datum/gear_tweak/path(vysoka) + +/datum/gear/head/gadpathur + display_name = "gadpathurian headgear selection" + description = "A selection of headgear from Gadpathur." + path = /obj/item/clothing/head/gadpathur + flags = GEAR_HAS_DESC_SELECTION + origin_restriction = list(/singleton/origin_item/origin/gadpathur) + sort_category = "Xenowear - Human" + +/datum/gear/head/gadpathur/New() + ..() + var/list/gadpathur = list() + gadpathur["gadpathurian side cap"] = /obj/item/clothing/head/gadpathur + gadpathur["gadpathurian beret"] = /obj/item/clothing/head/beret/gadpathur + gadpathur["gadpathurian engineer beret"] = /obj/item/clothing/head/beret/gadpathur/engineer + gadpathur["gadpathurian medical beret"] = /obj/item/clothing/head/beret/gadpathur/medical + gadpathur["gadpathurian turban"] = /obj/item/clothing/head/turban/gadpathur + gadpathur["gadpathurian patrol cap"] = /obj/item/clothing/head/ushanka/gadpathur + gear_tweaks += new /datum/gear_tweak/path(gadpathur) + +/datum/gear/uniform/dominia_consular + display_name = "dominian consular dress" + description = "A Dominian dress belonging to the Diplomatic Service." + path = /obj/item/clothing/under/dominia/consular/dress + allowed_roles = list("Consular Officer") + diff --git a/code/modules/clothing/factions/newhaiphong.dm b/code/modules/clothing/factions/newhaiphong.dm index 973cb5d12cf..54c48047b94 100644 --- a/code/modules/clothing/factions/newhaiphong.dm +++ b/code/modules/clothing/factions/newhaiphong.dm @@ -17,8 +17,8 @@ item_state = "aodaicrop" /obj/item/clothing/head/nonla - name = "non la" - desc = "A conical straw hat enjoyed particularly by residents of New Hai Phong, to protect the head from sweltering suns and heavy rains." + name = "non la conical hat" + desc = "A conical straw hat, also known as a non la, enjoyed particularly by residents of New Hai Phong, to protect the head from sweltering suns and heavy rains." icon = 'icons/clothing/under/uniforms/newhaiphong.dmi' icon_state = "nonla" item_state = "nonla" diff --git a/code/modules/clothing/head/berets.dm b/code/modules/clothing/head/berets.dm index 12e8d1f2179..7a2a6625c75 100644 --- a/code/modules/clothing/head/berets.dm +++ b/code/modules/clothing/head/berets.dm @@ -16,22 +16,16 @@ . = ..() color = get_random_colour(TRUE) -/obj/item/clothing/head/beret/peaked/colourable +/obj/item/clothing/head/beret/peaked/colorable 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() +/obj/item/clothing/head/beret/peaked/colorable/random/Initialize() . = ..() 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/jobs.dm b/code/modules/clothing/head/jobs.dm index a8e266bcc0a..a35e0698a74 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -202,11 +202,11 @@ /obj/item/clothing/head/sidecap/zavod name = "zavodskoi pilotka cap" desc = "A simple cap, often worn by pilots. This one is in Zavodskoi colors." - icon_state = "zavodskoi_pilotka" - item_state = "zavodskoi_pilotka" + icon_state = "zavodskoi_side_cap" + item_state = "zavodskoi_side_cap" /obj/item/clothing/head/sidecap/pmcg - name = "pmcg garrison cap" + name = "pmcg side cap" desc = "A simple cap, often worn by pilots. This one is in PMCG colors." icon_state = "pmcg_side_cap" item_state = "pmcg_side_cap" @@ -218,7 +218,7 @@ item_state = "heph_side_cap" /obj/item/clothing/head/sidecap/zavod/alt - name = "black zavodskoi pilotka cap" + name = "black zavodskoi side cap" desc = "A simple cap, often worn by pilots. This one is in Zavodskoi colors." - icon_state = "zavodskoi_pilotka_alt" - item_state = "zavodskoi_pilotka_alt" + icon_state = "zavodskoi_side_cap_alt" + item_state = "zavodskoi_side_cap_alt" diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index ebc75494134..4c35e5f527d 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -186,14 +186,14 @@ name = "flat cap" desc = "A working man's hat." icon = 'icons/obj/item/clothing/head/flat_cap.dmi' - icon_state = "flat_cap" - item_state = "flat_cap" + icon_state = "flat_cap_brown" + item_state = "flat_cap_brown" contained_sprite = TRUE siemens_coefficient = 0.9 /obj/item/clothing/head/flatcap/colourable - icon_state = "flat_cap_greyscale" - item_state = "flat_cap_greyscale" + icon_state = "flat_cap" + item_state = "flat_cap" /obj/item/clothing/head/pirate name = "pirate hat" @@ -235,12 +235,6 @@ contained_sprite = TRUE desc = "A sharp, stylish hat with a feather." -/obj/item/clothing/head/feathertrilby/colourable - icon_state = "feather_trilby_grayscale" - item_state = "feather_trilby_grayscale" - build_from_parts = TRUE - worn_overlay = "feather" - /obj/item/clothing/head/fez name = "fez" desc = "You should wear a fez. Fezzes are cool." @@ -303,8 +297,8 @@ name = "hijab" desc = "Encompassing cloth headwear worn by some human cultures and religions." icon = 'icons/obj/clothing/hijabs.dmi' - icon_state = "hijab_white" - item_state = "hijab_white" + icon_state = "hijab" + item_state = "hijab" flags_inv = BLOCKHAIR body_parts_covered = 0 contained_sprite = 1 @@ -313,35 +307,32 @@ /obj/item/clothing/head/hijab/get_ear_examine_text(var/mob/user, var/ear_text = "left") return "on [user.get_pronoun("his")] head" -/obj/item/clothing/head/hijab/grey - name = "grey hijab" - icon_state = "hijab_grey" - item_state = "hijab_grey" - /obj/item/clothing/head/hijab/red - name = "red hijab" - icon_state = "hijab_red" - item_state = "hijab_red" + color = COLOR_RED -/obj/item/clothing/head/hijab/brown - name = "brown hijab" - icon_state = "hijab_brown" - item_state = "hijab_brown" +/obj/item/clothing/head/hijab/orange + color = COLOR_ORANGE + +/obj/item/clothing/head/hijab/yellow + color = COLOR_YELLOW /obj/item/clothing/head/hijab/green - name = "green hijab" - icon_state = "hijab_green" - item_state = "hijab_green" + color = COLOR_GREEN /obj/item/clothing/head/hijab/blue - name = "blue hijab" - icon_state = "hijab_blue" - item_state = "hijab_blue" + color = COLOR_BLUE + +/obj/item/clothing/head/hijab/purple + color = COLOR_PURPLE + +/obj/item/clothing/head/hijab/brown + color = COLOR_BROWN + +/obj/item/clothing/head/hijab/grey + color = COLOR_GRAY50 /obj/item/clothing/head/hijab/black - name = "black hijab" - icon_state = "hijab_black" - item_state = "hijab_black" + color = COLOR_GRAY20 /obj/item/clothing/head/sombrero name = "sombrero" @@ -362,47 +353,38 @@ /obj/item/clothing/head/turban name = "turban" desc = "A sturdy cloth, worn around the head." - icon = 'icons/obj/clothing/hijabs.dmi' - icon_state = "turban_black" - item_state = "turban_black" + icon = 'icons/obj/item/clothing/head/turban.dmi' + icon_state = "turban" + item_state = "turban" flags_inv = BLOCKHEADHAIR - contained_sprite = 1 - -/obj/item/clothing/head/turban/blue - icon_state = "turban_blue" - item_state = "turban_blue" - -/obj/item/clothing/head/turban/brown - icon_state = "turban_brown" - item_state = "turban_brown" - -/obj/item/clothing/head/turban/green - icon_state = "turban_green" - item_state = "turban_green" - -/obj/item/clothing/head/turban/grey - icon_state = "turban_grey" - item_state = "turban_grey" - -/obj/item/clothing/head/turban/orange - icon_state = "turban_orange" - item_state = "turban_orange" - -/obj/item/clothing/head/turban/purple - icon_state = "turban_purple" - item_state = "turban_purple" + contained_sprite = TRUE /obj/item/clothing/head/turban/red - icon_state = "turban_red" - item_state = "turban_red" + color = COLOR_RED -/obj/item/clothing/head/turban/white - icon_state = "turban_white" - item_state = "turban_white" +/obj/item/clothing/head/turban/orange + color = COLOR_ORANGE /obj/item/clothing/head/turban/yellow - icon_state = "turban_yellow" - item_state = "turban_yellow" + color = COLOR_YELLOW + +/obj/item/clothing/head/turban/green + color = COLOR_GREEN + +/obj/item/clothing/head/turban/blue + color = COLOR_BLUE + +/obj/item/clothing/head/turban/purple + color = COLOR_PURPLE + +/obj/item/clothing/head/turban/brown + color = COLOR_BROWN + +/obj/item/clothing/head/turban/grey + color = COLOR_GRAY50 + +/obj/item/clothing/head/turban/black + color = COLOR_GRAY20 //praise verkister /obj/item/clothing/head/headbando @@ -460,8 +442,8 @@ cold_protection = HEAD min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE -/obj/item/clothing/head/padded - name = "padded cap" +/obj/item/clothing/head/tanker + name = "tanker cap" desc = "A padded skullcap for those prone to bumping their heads against hard surfaces." icon_state = "tank" flags_inv = BLOCKHEADHAIR @@ -494,33 +476,6 @@ 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/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm index bea9e31a5b1..e312386f39e 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/code/modules/clothing/head/soft_caps.dm @@ -37,6 +37,9 @@ . = ..() color = get_random_colour(TRUE) +/obj/item/clothing/head/softcap/colorable/accent + has_accents = TRUE + /obj/item/clothing/head/softcap/rainbow name = "rainbow cap" desc = "It's a peaked cap in a bright rainbow of colors." @@ -198,3 +201,9 @@ desc = "A company-issue Orion Express cap. For overworked employees that value corporate pride over protection." icon_state = "orion" item_state = "orion" + +/obj/item/clothing/head/softcap/newsboy + name = "newsboy cap" + desc = "A fashionable peaked cap!" + icon_state = "newsboy" + item_state = "newsboy" diff --git a/code/modules/clothing/head/wide_hats.dm b/code/modules/clothing/head/wide_hats.dm index 0f51afce479..9d924c4440f 100644 --- a/code/modules/clothing/head/wide_hats.dm +++ b/code/modules/clothing/head/wide_hats.dm @@ -58,14 +58,6 @@ item_state = "camo_boonie" has_accents = TRUE -/obj/item/clothing/head/bucket/boonie/green - icon_state = "green_boonie" - item_state = "green_boonie" - -/obj/item/clothing/head/bucket/boonie/blue - icon_state = "blue_boonie" - item_state = "blue_boonie" - /obj/item/clothing/head/fedora name = "fedora" icon_state = "fedora" diff --git a/code/modules/clothing/head/winter_hats.dm b/code/modules/clothing/head/winter_hats.dm index d4e57b8a509..6ab6258d13b 100644 --- a/code/modules/clothing/head/winter_hats.dm +++ b/code/modules/clothing/head/winter_hats.dm @@ -10,14 +10,14 @@ flags_inv = HIDEEARS var/earsup = 0 -/obj/item/clothing/head/ushanka/nyakas +/obj/item/clothing/head/ushanka/cap name = "visegradi nyakas" desc = "A type of flap hat that is extremely popular on Visegrad. It is designed to keep one's head and neck dry, and the flap can be pinned to the sides of the hat when not needed." contained_sprite = TRUE build_from_parts = FALSE - icon = 'icons/obj/item/clothing/head/nyakas.dmi' - icon_state = "nyakas" - item_state = "nyakas" + icon = 'icons/obj/item/clothing/head/earflap_cap.dmi' + icon_state = "earflap" + item_state = "earflap" /obj/item/clothing/head/ushanka/attack_self(mob/user as mob) src.earsup = !src.earsup @@ -50,15 +50,25 @@ . = ..() color = get_random_colour(lower = 150) -/obj/item/clothing/head/beanie/winter - name = "winter beanie" +/obj/item/clothing/head/beanie/earflap + name = "ear flap beanie" desc = "A head-hugging brimless winter cap. This one has flaps that cover the ears." - icon_state = "winterbeanie" - item_state = "winterbeanie" + icon_state = "beanie_earflap" + item_state = "beanie_earflap" has_accents = TRUE +/obj/item/clothing/head/beanie/earflap/random/Initialize() + . = ..() + color = get_random_colour(lower = 150) + accent_color = color + /obj/item/clothing/head/beanie/submariner name = "submariner's beanie" desc = "A design of tightly fitting beanie particularly popular among the dock workers of Europa. Favored among anyone who prides a warm head." - icon_state = "dock_beanie" - item_state = "dock_beanie" + icon_state = "beaner_submariner" + item_state = "beaner_submariner" + +/obj/item/clothing/head/beanie/submariner/random/Initialize() + . = ..() + color = get_random_colour(lower = 150) + diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/clothing/suits/wiz_robe.dm index 65914b72f61..35b883506e9 100644 --- a/code/modules/clothing/suits/wiz_robe.dm +++ b/code/modules/clothing/suits/wiz_robe.dm @@ -39,15 +39,6 @@ slot_r_hand_str = "helmet" ) -/obj/item/clothing/head/wizard/cap - name = "gentlemans cap" - desc = "A checkered gray flat cap woven together with the rarest of threads." - icon_state = "gentcap" - item_state_slots = list( - slot_l_hand_str = "det_hat", - slot_r_hand_str = "det_hat" - ) - /obj/item/clothing/suit/wizrobe name = "wizard robe" desc = "A magnificant, gem-lined robe that seems to radiate power." diff --git a/html/changelogs/Wezzy_Head Loadout Debloat.yml b/html/changelogs/Wezzy_Head Loadout Debloat.yml new file mode 100644 index 00000000000..d1356b75c1b --- /dev/null +++ b/html/changelogs/Wezzy_Head Loadout Debloat.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: Wowzewow (Wezzy) + +# 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: + - qol: "Moved Dominian Consular outfit items from the loadout to be jobspawn items to be in line with the other consulars." + - rscadd: "Tidies up the hats section of the loadout and removes unused hats." diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index a80b653a3ce..36d3b13bbc1 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 f45d22e2a33..31344d2e1b0 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 a5d13209b27..9825b801278 100644 Binary files a/icons/obj/clothing/hats/berets.dmi and b/icons/obj/clothing/hats/berets.dmi differ diff --git a/icons/obj/clothing/hats/soft_caps.dmi b/icons/obj/clothing/hats/soft_caps.dmi index 1df30b696d1..1e385ade074 100644 Binary files a/icons/obj/clothing/hats/soft_caps.dmi and b/icons/obj/clothing/hats/soft_caps.dmi differ diff --git a/icons/obj/clothing/hijabs.dmi b/icons/obj/clothing/hijabs.dmi index d1e15a54638..19a10e6d6d2 100644 Binary files a/icons/obj/clothing/hijabs.dmi and b/icons/obj/clothing/hijabs.dmi differ diff --git a/icons/obj/item/clothing/head/beanie.dmi b/icons/obj/item/clothing/head/beanie.dmi index f423fc69e58..e2aefb4543a 100644 Binary files a/icons/obj/item/clothing/head/beanie.dmi and b/icons/obj/item/clothing/head/beanie.dmi differ diff --git a/icons/obj/item/clothing/head/bucket_hat.dmi b/icons/obj/item/clothing/head/bucket_hat.dmi index c96fb27aaf9..ec8a617afd7 100644 Binary files a/icons/obj/item/clothing/head/bucket_hat.dmi and b/icons/obj/item/clothing/head/bucket_hat.dmi differ diff --git a/icons/obj/item/clothing/head/nyakas.dmi b/icons/obj/item/clothing/head/earflap_cap.dmi similarity index 87% rename from icons/obj/item/clothing/head/nyakas.dmi rename to icons/obj/item/clothing/head/earflap_cap.dmi index 9f4de4abac4..1583e640548 100644 Binary files a/icons/obj/item/clothing/head/nyakas.dmi and b/icons/obj/item/clothing/head/earflap_cap.dmi differ diff --git a/icons/obj/item/clothing/head/feather_trilby.dmi b/icons/obj/item/clothing/head/feather_trilby.dmi index 6a06a03a539..56e6bd2c85b 100644 Binary files a/icons/obj/item/clothing/head/feather_trilby.dmi and b/icons/obj/item/clothing/head/feather_trilby.dmi differ diff --git a/icons/obj/item/clothing/head/flat_cap.dmi b/icons/obj/item/clothing/head/flat_cap.dmi index cd3f5cc7007..fcdb6be6eda 100644 Binary files a/icons/obj/item/clothing/head/flat_cap.dmi and b/icons/obj/item/clothing/head/flat_cap.dmi differ diff --git a/icons/obj/item/clothing/head/sidecap.dmi b/icons/obj/item/clothing/head/sidecap.dmi index 0b8b4c1bca8..cf23074ac4c 100644 Binary files a/icons/obj/item/clothing/head/sidecap.dmi and b/icons/obj/item/clothing/head/sidecap.dmi differ diff --git a/icons/obj/item/clothing/head/turban.dmi b/icons/obj/item/clothing/head/turban.dmi new file mode 100644 index 00000000000..77e7a276a2d Binary files /dev/null and b/icons/obj/item/clothing/head/turban.dmi differ diff --git a/maps/away/scenarios/nuclear_silo/nuclear_silo_outfits.dm b/maps/away/scenarios/nuclear_silo/nuclear_silo_outfits.dm index 45560fe6504..a2abc629e21 100644 --- a/maps/away/scenarios/nuclear_silo/nuclear_silo_outfits.dm +++ b/maps/away/scenarios/nuclear_silo/nuclear_silo_outfits.dm @@ -43,10 +43,9 @@ ) head = list( /obj/item/clothing/head/beanie/random, - /obj/item/clothing/head/beanie/submariner, - /obj/item/clothing/head/beanie/winter, + /obj/item/clothing/head/beanie/submariner/random, + /obj/item/clothing/head/beanie/earflap/random, /obj/item/clothing/head/flatcap, - /obj/item/clothing/head/newsboy, /obj/item/clothing/head/softcap, /obj/item/clothing/head/wool, ) diff --git a/maps/away/ships/konyang/ipc_refugee/ipc_refugee_ship.dmm b/maps/away/ships/konyang/ipc_refugee/ipc_refugee_ship.dmm index bbfc85bd995..323339dbe32 100644 --- a/maps/away/ships/konyang/ipc_refugee/ipc_refugee_ship.dmm +++ b/maps/away/ships/konyang/ipc_refugee/ipc_refugee_ship.dmm @@ -2809,7 +2809,7 @@ icon_state = "0-2" }, /obj/structure/closet, -/obj/item/clothing/head/padded{ +/obj/item/clothing/head/tanker{ color = "#BCA77E" }, /obj/item/clothing/head/beanie{ @@ -2933,7 +2933,7 @@ req_one_access = null }, /obj/structure/closet, -/obj/item/clothing/head/padded{ +/obj/item/clothing/head/tanker{ color = "#BCA77E" }, /obj/item/clothing/head/beanie{ @@ -3133,7 +3133,7 @@ }, /obj/structure/closet/cabinet, /obj/effect/decal/cleanable/dirt, -/obj/item/clothing/head/padded{ +/obj/item/clothing/head/tanker{ color = "#BCA77E" }, /obj/item/clothing/head/beanie{ diff --git a/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler_ghostroles.dm b/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler_ghostroles.dm index fa315cc941a..a1d5bf95b19 100644 --- a/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler_ghostroles.dm +++ b/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler_ghostroles.dm @@ -90,4 +90,4 @@ name = "Tajaran Smuggler Captain" uniform = /obj/item/clothing/under/syndicate - head = /obj/item/clothing/head/padded + head = /obj/item/clothing/head/tanker diff --git a/maps/event/halloween/halloween.dmm b/maps/event/halloween/halloween.dmm index bdc96ba4779..78de022b447 100644 --- a/maps/event/halloween/halloween.dmm +++ b/maps/event/halloween/halloween.dmm @@ -3796,10 +3796,6 @@ /obj/item/clothing/suit/storage/target_costume, /obj/item/clothing/suit/storage/target_costume, /obj/item/clothing/suit/storage/target_costume, -/obj/item/clothing/head/feathertrilby{ - pixel_x = 6; - pixel_y = 12 - }, /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 }, diff --git a/maps/random_ruins/exoplanets/biesel/biesel_crash.dmm b/maps/random_ruins/exoplanets/biesel/biesel_crash.dmm index c1ea8acdbbf..4d94df947f9 100644 --- a/maps/random_ruins/exoplanets/biesel/biesel_crash.dmm +++ b/maps/random_ruins/exoplanets/biesel/biesel_crash.dmm @@ -463,7 +463,7 @@ /area/template_noop) "nf" = ( /obj/structure/closet, -/obj/item/clothing/head/padded{ +/obj/item/clothing/head/tanker{ color = "#BCA77E" }, /obj/item/clothing/head/beanie{