diff --git a/code/game/machinery/vendors/wardrobe_vendors.dm b/code/game/machinery/vendors/wardrobe_vendors.dm index 554e3c26b44..0ac9ebf5783 100644 --- a/code/game/machinery/vendors/wardrobe_vendors.dm +++ b/code/game/machinery/vendors/wardrobe_vendors.dm @@ -183,6 +183,7 @@ /obj/item/clothing/head/surgery/purple = 3, /obj/item/clothing/head/nursehat = 3, /obj/item/clothing/head/headmirror = 3, + /obj/item/clothing/head/cowboyhat/med = 4, /obj/item/clothing/suit/hooded/wintercoat/medical = 3, /obj/item/clothing/suit/storage/fr_jacket = 3, /obj/item/clothing/suit/storage/labcoat = 3, @@ -217,6 +218,7 @@ /obj/item/clothing/head/surgery/purple = 20, /obj/item/clothing/head/nursehat = 20, /obj/item/clothing/head/headmirror = 20, + /obj/item/clothing/head/cowboyhat/med = 50, /obj/item/clothing/suit/hooded/wintercoat/medical = 75, /obj/item/clothing/suit/storage/fr_jacket = 75, /obj/item/clothing/suit/storage/labcoat = 75, @@ -403,6 +405,7 @@ /obj/item/clothing/suit/jacket/bomber/sci = 3, /obj/item/clothing/head/beret/sci = 3, /obj/item/clothing/head/beret/sci_alt = 3, + /obj/item/clothing/head/cowboyhat/research = 4, /obj/item/clothing/accessory/armband/science = 6, /obj/item/clothing/shoes/laceup = 3, /obj/item/clothing/shoes/white = 3, @@ -426,6 +429,7 @@ /obj/item/clothing/suit/jacket/bomber/sci = 75, /obj/item/clothing/head/beret/sci = 20, /obj/item/clothing/head/beret/sci_alt = 20, + /obj/item/clothing/head/cowboyhat/research = 50, /obj/item/clothing/accessory/armband/science = 20, /obj/item/clothing/shoes/laceup = 30, /obj/item/clothing/shoes/white = 20, @@ -525,6 +529,7 @@ /obj/item/clothing/head/hardhat = 2, /obj/item/clothing/head/hardhat/orange = 2, /obj/item/clothing/head/hardhat/dblue = 2, + /obj/item/clothing/head/cowboyhat/engie = 4, /obj/item/clothing/accessory/armband/engine = 6, /obj/item/clothing/shoes/laceup = 3, /obj/item/clothing/shoes/workboots = 3, @@ -551,6 +556,7 @@ /obj/item/clothing/head/hardhat = 20, /obj/item/clothing/head/hardhat/orange = 30, /obj/item/clothing/head/hardhat/dblue = 30, + /obj/item/clothing/head/cowboyhat/engie = 50, /obj/item/clothing/accessory/armband/engine = 20, /obj/item/clothing/shoes/laceup = 30, /obj/item/clothing/shoes/workboots = 20, @@ -589,6 +595,7 @@ /obj/item/clothing/head/hardhat/red = 2, /obj/item/clothing/head/hardhat/orange = 2, /obj/item/clothing/head/hardhat/dblue = 2, + /obj/item/clothing/head/cowboyhat/engie = 4, /obj/item/clothing/gloves/color/black = 3, /obj/item/clothing/accessory/armband/engine = 3, /obj/item/clothing/shoes/laceup = 3, @@ -615,6 +622,7 @@ /obj/item/clothing/head/hardhat/red = 30, /obj/item/clothing/head/hardhat/orange = 30, /obj/item/clothing/head/hardhat/dblue = 30, + /obj/item/clothing/head/cowboyhat/engie = 50, /obj/item/clothing/gloves/color/black = 20, /obj/item/clothing/accessory/armband/engine = 20, /obj/item/clothing/shoes/laceup = 30, @@ -651,6 +659,7 @@ /obj/item/clothing/head/soft/cargo = 3, /obj/item/clothing/head/beret/cargo = 3, /obj/item/clothing/head/hardhat/orange = 2, + /obj/item/clothing/head/cowboyhat/supply = 4, /obj/item/clothing/gloves/fingerless = 6, /obj/item/clothing/accessory/armband/cargo = 6, /obj/item/clothing/shoes/black = 3, @@ -671,6 +680,7 @@ /obj/item/clothing/head/soft/cargo = 20, /obj/item/clothing/head/beret/cargo = 20, /obj/item/clothing/head/hardhat/orange = 30, + /obj/item/clothing/head/cowboyhat/supply = 50, /obj/item/clothing/gloves/fingerless = 20, /obj/item/clothing/accessory/armband/cargo = 20, /obj/item/clothing/shoes/black = 20, diff --git a/code/game/objects/items/storage/garment.dm b/code/game/objects/items/storage/garment.dm index f047c20b9e4..e2c5daecc82 100644 --- a/code/game/objects/items/storage/garment.dm +++ b/code/game/objects/items/storage/garment.dm @@ -30,6 +30,7 @@ /obj/item/storage/bag/garment/head_of_personnel/populate_contents() new /obj/item/clothing/head/hop(src) new /obj/item/clothing/head/beret/hop(src) + new /obj/item/clothing/head/cowboyhat/command(src) new /obj/item/clothing/neck/cloak/head_of_personnel(src) new /obj/item/clothing/neck/cloak/hop_mantle(src) new /obj/item/clothing/suit/armor/vest(src) @@ -81,6 +82,7 @@ /obj/item/storage/bag/garment/research_director/populate_contents() new /obj/item/clothing/head/rd (src) new /obj/item/clothing/head/beret/rd(src) + new /obj/item/clothing/head/cowboyhat/research(src) new /obj/item/clothing/neck/cloak/research_director(src) new /obj/item/clothing/under/rank/rnd/rd(src) new /obj/item/clothing/under/rank/rnd/rd/skirt(src) @@ -109,6 +111,7 @@ new /obj/item/clothing/head/surgery/blue(src) new /obj/item/clothing/head/surgery/green(src) new /obj/item/clothing/head/surgery/purple(src) + new /obj/item/clothing/head/cowboyhat/med(src) new /obj/item/clothing/neck/cloak/chief_medical_officer(src) new /obj/item/clothing/under/rank/medical/cmo(src) new /obj/item/clothing/under/rank/medical/cmo/skirt(src) @@ -132,6 +135,7 @@ new /obj/item/clothing/head/hardhat/white(src) new /obj/item/clothing/head/beret/ce(src) new /obj/item/clothing/head/beret/eng(src) + new /obj/item/clothing/head/cowboyhat/engie(src) new /obj/item/clothing/neck/cloak/chief_engineer(src) new /obj/item/clothing/under/rank/engineering/chief_engineer(src) new /obj/item/clothing/under/rank/engineering/chief_engineer/skirt(src) @@ -151,6 +155,7 @@ /obj/item/storage/bag/garment/nanotrasen_representative/populate_contents() new /obj/item/clothing/head/ntrep(src) + new /obj/item/clothing/head/cowboyhat/command(src) new /obj/item/clothing/under/rank/procedure/representative(src) new /obj/item/clothing/under/rank/procedure/representative/skirt(src) new /obj/item/clothing/under/rank/procedure/representative/formal(src) @@ -170,6 +175,7 @@ /obj/item/storage/bag/garment/magistrate/populate_contents() new /obj/item/clothing/head/justice_wig(src) new /obj/item/clothing/head/powdered_wig(src) + new /obj/item/clothing/head/cowboyhat/command(src) new /obj/item/clothing/under/rank/procedure/magistrate(src) new /obj/item/clothing/under/rank/procedure/magistrate/skirt(src) new /obj/item/clothing/under/rank/procedure/magistrate/formal(src) @@ -187,6 +193,7 @@ /obj/item/storage/bag/garment/blueshield/populate_contents() new /obj/item/clothing/head/beret/centcom/officer(src) new /obj/item/clothing/head/beret/centcom/officer/navy(src) + new /obj/item/clothing/head/cowboyhat/command(src) new /obj/item/clothing/under/rank/procedure/blueshield(src) new /obj/item/clothing/under/rank/procedure/blueshield/skirt(src) new /obj/item/clothing/under/rank/procedure/blueshield/formal(src) @@ -218,6 +225,7 @@ new /obj/item/clothing/shoes/brown(src) new /obj/item/clothing/head/qm(src) new /obj/item/clothing/head/beret/qm(src) + new /obj/item/clothing/head/cowboyhat/supply(src) new /obj/item/clothing/neck/cloak/quartermaster(src) new /obj/item/clothing/head/hardhat/orange(src) new /obj/item/clothing/suit/qmcoat(src) diff --git a/code/game/objects/structures/dresser.dm b/code/game/objects/structures/dresser.dm index 12e227828d9..4fd21789e9d 100644 --- a/code/game/objects/structures/dresser.dm +++ b/code/game/objects/structures/dresser.dm @@ -187,6 +187,7 @@ new /obj/item/clothing/head/beret/captain(src) new /obj/item/clothing/head/beret/captain/white(src) new /obj/item/clothing/head/crown/fancy(src) + new /obj/item/clothing/head/cowboyhat/command(src) new /obj/item/clothing/neck/cloak/captain(src) new /obj/item/clothing/suit/armor/vest/capcarapace(src) new /obj/item/clothing/suit/armor/vest/capcarapace/jacket(src) diff --git a/code/modules/client/preference/loadout/loadout_hat.dm b/code/modules/client/preference/loadout/loadout_hat.dm index 268f827a89b..521956f4976 100644 --- a/code/modules/client/preference/loadout/loadout_hat.dm +++ b/code/modules/client/preference/loadout/loadout_hat.dm @@ -182,6 +182,31 @@ path = /obj/item/clothing/head/cowboyhat/hydro allowed_roles = list("Botanist") +/datum/gear/hat/cowboyhat/engie + display_name = "Cowboy hat, engineering" + path = /obj/item/clothing/head/cowboyhat/engie + allowed_roles = list("Station Engineer", "Atmospheric Technician", "Chief Engineer") + +/datum/gear/hat/cowboyhat/research + display_name = "Cowboy hat, research" + path = /obj/item/clothing/head/cowboyhat/research + allowed_roles = list("Research Director", "Scientist", "Xenobiologist", "Roboticist", "Geneticist") + +/datum/gear/hat/cowboyhat/med + display_name = "Cowboy hat, medical" + path = /obj/item/clothing/head/cowboyhat/med + allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Paramedic", "Chemist", "Virologist", "Psychologist", "Coroner") + +/datum/gear/hat/cowboyhat/supply + display_name = "Cowboy hat, supply" + path = /obj/item/clothing/head/cowboyhat/supply + allowed_roles = list("Quartermaster", "Cargo Technician", "Shaft Miner", "Explorer", "Smith") + +/datum/gear/hat/cowboyhat/command + display_name = "Cowboy hat, command" + path = /obj/item/clothing/head/cowboyhat/command + allowed_roles = list("Captain", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer", "Quartermaster", "Nanotrasen Representative", "Magistrate", "Blueshield Officer", "Nanotrasen Career Trainer") + /datum/gear/hat/beret_purple display_name = "Beret, purple" path = /obj/item/clothing/head/beret/purple_normal diff --git a/code/modules/clothing/head/misc_hats.dm b/code/modules/clothing/head/misc_hats.dm index 0ad4d336cec..b90cede3efa 100644 --- a/code/modules/clothing/head/misc_hats.dm +++ b/code/modules/clothing/head/misc_hats.dm @@ -204,9 +204,11 @@ sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/head.dmi', "Drask" = 'icons/mob/clothing/species/drask/head.dmi', - "Grey" = 'icons/mob/clothing/species/grey/head.dmi' + "Grey" = 'icons/mob/clothing/species/grey/head.dmi', + "Kidan" = 'icons/mob/clothing/species/kidan/head.dmi' ) + /obj/item/clothing/head/cowboyhat/Initialize(mapload) . = ..() AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1) @@ -241,6 +243,31 @@ desc = "For the Farmer in us all." icon_state = "cowboyhat_botany" +/obj/item/clothing/head/cowboyhat/engie + name = "engineering cowboy hat" + desc = "The Supermatter is just another bull to lasso." + icon_state = "cowboyhat_engie" + +/obj/item/clothing/head/cowboyhat/research + name = "research cowboy hat" + desc = "Bluespace is kind of a new frontier if you think about it." + icon_state = "cowboyhat_sci" + +/obj/item/clothing/head/cowboyhat/med + name = "medical cowboy hat" + desc = "Every gunslinger needs a medic after he gets hit." + icon_state = "cowboyhat_med" + +/obj/item/clothing/head/cowboyhat/supply + name = "supply cowboy hat" + desc = "Can't have gunslingers without someone to bring them guns." + icon_state = "cowboyhat_supply" + +/obj/item/clothing/head/cowboyhat/command + name = "command cowboy hat" + desc = "You're the real sheriff 'round these parts." + icon_state = "cowboyhat_command" + /obj/item/clothing/head/fedora name = "fedora" desc = "A great hat ruined by being within fifty yards of you." diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index 2c05ac3edaf..a959bf06733 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 21fca8a299b..afa56c5e6b7 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/grey/head.dmi b/icons/mob/clothing/species/grey/head.dmi index be567786b72..89c99343ecf 100644 Binary files a/icons/mob/clothing/species/grey/head.dmi and b/icons/mob/clothing/species/grey/head.dmi differ diff --git a/icons/mob/clothing/species/kidan/head.dmi b/icons/mob/clothing/species/kidan/head.dmi index f05e0f2ce07..6e99f871aed 100644 Binary files a/icons/mob/clothing/species/kidan/head.dmi and b/icons/mob/clothing/species/kidan/head.dmi differ diff --git a/icons/mob/clothing/species/vox/head.dmi b/icons/mob/clothing/species/vox/head.dmi index 00e3d808793..0680c279d0a 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 c1247c78c55..ebc2e68e7af 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ