diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm index 8fb4bf2f230..7ed51b25170 100644 --- a/code/modules/vending/autodrobe.dm +++ b/code/modules/vending/autodrobe.dm @@ -156,8 +156,8 @@ /obj/item/clothing/suit/dutchjacketsr = 1, /obj/item/clothing/mask/gas/polyclown = 1, /obj/item/clothing/mask/gas/clownbald = 1, - /obj/item/clothing/head/cowboyhat/sherrif = 1, - /obj/item/clothing/head/cowboyhat/sherrif/alt = 1, + /obj/item/clothing/head/cowboyhat/sheriff = 1, + /obj/item/clothing/head/cowboyhat/sheriff/alt = 1, /obj/item/clothing/head/cowboyhat/deputy = 1, /obj/item/clothing/under/costume/loincloth/sensor = 1, /obj/item/clothing/under/costume/loincloth/cloth/sensor = 1) //SKYRAT EDIT ADDITION END diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm index 1f821f886af..0a7df8d438b 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -159,8 +159,8 @@ /obj/item/clothing/head/hijab = 3, /obj/item/clothing/head/turb = 3, /obj/item/clothing/head/keffiyeh = 3, - /obj/item/clothing/head/cowboyhat/sherrif = 3, - /obj/item/clothing/head/cowboyhat/sherrif/alt = 3, + /obj/item/clothing/head/cowboyhat/sheriff = 3, + /obj/item/clothing/head/cowboyhat/sheriff/alt = 3, /obj/item/clothing/head/cowboyhat/deputy = 3, /obj/item/clothing/shoes/sports = 3, /obj/item/clothing/shoes/wraps/poly = 3, diff --git a/modular_skyrat/modules/customization/modules/client/loadout/head.dm b/modular_skyrat/modules/customization/modules/client/loadout/head.dm index 09b12a03f0b..15e39bb9b94 100644 --- a/modular_skyrat/modules/customization/modules/client/loadout/head.dm +++ b/modular_skyrat/modules/customization/modules/client/loadout/head.dm @@ -160,11 +160,11 @@ /datum/loadout_item/head/cowboyhat/winter name = "Winter Cowboy Hat" - path = /obj/item/clothing/head/cowboyhat/sherrif + path = /obj/item/clothing/head/cowboyhat/sheriff -/datum/loadout_item/head/cowboyhat/sherrif - name = "Sherrif Hat" - path = /obj/item/clothing/head/cowboyhat/sherrif/alt +/datum/loadout_item/head/cowboyhat/sheriff + name = "Sheriff Hat" + path = /obj/item/clothing/head/cowboyhat/sheriff/alt /datum/loadout_item/head/cowboyhat/deputy name = "Deputy Hat" diff --git a/modular_skyrat/modules/customization/modules/client/loadout/neck.dm b/modular_skyrat/modules/customization/modules/client/loadout/neck.dm index 715cd228568..593e3066f03 100644 --- a/modular_skyrat/modules/customization/modules/client/loadout/neck.dm +++ b/modular_skyrat/modules/customization/modules/client/loadout/neck.dm @@ -39,9 +39,9 @@ name = "Holocollar" path = /obj/item/clothing/neck/human_petcollar/locked/holocollar -/datum/loadout_item/neck/poncxhocowbot +/datum/loadout_item/neck/ponchocowboy name = "Green cowboy poncho" - path =/obj/item/clothing/toggle/cowboylea + path = /obj/item/clothing/toggle/cowboylea /datum/loadout_item/neck/crosscollar name = "Cross collar" @@ -151,4 +151,3 @@ path = /obj/item/clothing/neck/tie/disco restricted_roles = list("Detective") restricted_desc = "Superstar Detectives" - diff --git a/modular_skyrat/modules/customization/modules/clothing/head/head.dm b/modular_skyrat/modules/customization/modules/clothing/head/head.dm index aa3ab698b94..19dd4a0dba5 100644 --- a/modular_skyrat/modules/customization/modules/clothing/head/head.dm +++ b/modular_skyrat/modules/customization/modules/clothing/head/head.dm @@ -112,7 +112,7 @@ /obj/item/clothing/head/cowboyhat/widesec name = "wide brimmed security cowboy hat" - desc = "A bandit turned Sheriff, his enforcement is brutal but effective, if out of fear or respect, not many bodies hang high. A peaceful land, a quiet people." + desc = "A bandit turned sheriff, his enforcement is brutal but effective - whether out of fear or respect is unclear, though not many bodies hang high. A peaceful land, a quiet people." icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi' worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi' icon_state = "cowboy_black_sec" @@ -399,7 +399,7 @@ icon_state = "enhead" mutant_variants = NONE -/obj/item/clothing/head/cowboyhat/sherrif +/obj/item/clothing/head/cowboyhat/sheriff name = "winter cowboy hat" icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi' worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi' @@ -410,7 +410,7 @@ min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT flags_inv = HIDEHAIR -/obj/item/clothing/head/cowboyhat/sherrif/alt +/obj/item/clothing/head/cowboyhat/sheriff/alt name = "sheriff hat" icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi' worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi' diff --git a/modular_skyrat/modules/customization/modules/clothing/under/security.dm b/modular_skyrat/modules/customization/modules/clothing/under/security.dm index b0b9abcf080..d1a8b4517bb 100644 --- a/modular_skyrat/modules/customization/modules/clothing/under/security.dm +++ b/modular_skyrat/modules/customization/modules/clothing/under/security.dm @@ -56,7 +56,7 @@ /obj/item/clothing/under/rank/security/detective/cowboy name = "blond cowboy uniform" - desc = "A blue shirt with some cool Cowboy socks. You dig." + desc = "A blue shirt with some cool cowboy socks. You dig." icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' icon_state = "cowboy_uniform" @@ -68,7 +68,7 @@ /obj/item/clothing/suit/cowboyvest name = "blonde cowboy vest" - desc = "A white cream vest lined with...fur, of all things, for desert weather. There's a small Deer head logo sewn in to the vest." + desc = "A white cream vest lined with... fur, of all things, for desert weather. There's a small deer head logo sewn into the vest." icon = 'modular_skyrat/master_files/icons/obj/clothing/suits.dmi' worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/suit.dmi' icon_state = "cowboy_vest" @@ -79,7 +79,7 @@ /obj/item/clothing/suit/det_suit/cowboyvest name = "blonde cowboy vest" - desc = "A white cream vest lined with...fur, of all things, for desert weather. There's a small Deer head logo sewn in to the vest." + desc = "A white cream vest lined with... fur, of all things, for desert weather. There's a small deer head logo sewn into the vest." icon = 'modular_skyrat/master_files/icons/obj/clothing/suits.dmi' worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/suit.dmi' icon_state = "cowboy_vest"