diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm index 4dec1f925d0..8fb4bf2f230 100644 --- a/code/modules/vending/autodrobe.dm +++ b/code/modules/vending/autodrobe.dm @@ -156,6 +156,9 @@ /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/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 5ba6f5beb0c..1f821f886af 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -159,6 +159,9 @@ /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/deputy = 3, /obj/item/clothing/shoes/sports = 3, /obj/item/clothing/shoes/wraps/poly = 3, /obj/item/clothing/shoes/jungleboots = 3, diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index bb7e4cde6f8..53870eb1c3f 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -559,7 +559,9 @@ /obj/item/clothing/under/misc/kimunder = 2, /obj/item/clothing/shoes/kimshoes = 2, /obj/item/clothing/glasses/kim = 2, - /obj/item/clothing/gloves/kim = 2, //SKYRAT EDIT ADD END + /obj/item/clothing/gloves/kim = 2, + /obj/item/clothing/under/rank/security/detective/cowboy = 2, + /obj/item/clothing/suit/det_suit/cowboyvest = 2, //SKYRAT EDIT ADD END /obj/item/clothing/gloves/color/black = 2, /obj/item/clothing/gloves/color/latex = 2, /obj/item/reagent_containers/food/drinks/flask/det = 2, diff --git a/modular_skyrat/master_files/icons/mob/clothing/belt.dmi b/modular_skyrat/master_files/icons/mob/clothing/belt.dmi index 75f8d260ebe..366b198287b 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/belt.dmi and b/modular_skyrat/master_files/icons/mob/clothing/belt.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/head.dmi b/modular_skyrat/master_files/icons/mob/clothing/head.dmi index ca2815c9485..229de03eb8b 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/head.dmi and b/modular_skyrat/master_files/icons/mob/clothing/head.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/neck.dmi b/modular_skyrat/master_files/icons/mob/clothing/neck.dmi index 6fbe9400701..806a70b5460 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/neck.dmi and b/modular_skyrat/master_files/icons/mob/clothing/neck.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/suit.dmi b/modular_skyrat/master_files/icons/mob/clothing/suit.dmi index fe3063ae305..4b486750a8b 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/suit.dmi and b/modular_skyrat/master_files/icons/mob/clothing/suit.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/uniform.dmi b/modular_skyrat/master_files/icons/mob/clothing/uniform.dmi index da65bf7d305..0b250a90b3c 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/uniform.dmi and b/modular_skyrat/master_files/icons/mob/clothing/uniform.dmi differ diff --git a/modular_skyrat/master_files/icons/obj/clothing/belts.dmi b/modular_skyrat/master_files/icons/obj/clothing/belts.dmi index c140897ef67..30bfbdd581a 100644 Binary files a/modular_skyrat/master_files/icons/obj/clothing/belts.dmi and b/modular_skyrat/master_files/icons/obj/clothing/belts.dmi differ diff --git a/modular_skyrat/master_files/icons/obj/clothing/hats.dmi b/modular_skyrat/master_files/icons/obj/clothing/hats.dmi index 918342657f4..26d6ea0aeea 100644 Binary files a/modular_skyrat/master_files/icons/obj/clothing/hats.dmi and b/modular_skyrat/master_files/icons/obj/clothing/hats.dmi differ diff --git a/modular_skyrat/master_files/icons/obj/clothing/neck.dmi b/modular_skyrat/master_files/icons/obj/clothing/neck.dmi index fdd9e5fcf45..e33ab8fa603 100644 Binary files a/modular_skyrat/master_files/icons/obj/clothing/neck.dmi and b/modular_skyrat/master_files/icons/obj/clothing/neck.dmi differ diff --git a/modular_skyrat/master_files/icons/obj/clothing/suits.dmi b/modular_skyrat/master_files/icons/obj/clothing/suits.dmi index 3ca3e7dd98c..d21a620c8d9 100644 Binary files a/modular_skyrat/master_files/icons/obj/clothing/suits.dmi and b/modular_skyrat/master_files/icons/obj/clothing/suits.dmi differ diff --git a/modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi b/modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi index 33c516e54e2..b774a7e3f73 100644 Binary files a/modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi and b/modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi differ diff --git a/modular_skyrat/modules/customization/modules/client/loadout/donator/suit.dm b/modular_skyrat/modules/customization/modules/client/loadout/donator/suit.dm index f2b33e98b57..d61848c2bda 100644 --- a/modular_skyrat/modules/customization/modules/client/loadout/donator/suit.dm +++ b/modular_skyrat/modules/customization/modules/client/loadout/donator/suit.dm @@ -17,3 +17,7 @@ /datum/loadout_item/suit/donator/public/british_officer name = "Modern Winter Coat" path = /obj/item/clothing/suit/modern_winter + +/datum/loadout_item/suit/donator/public/blondie + name = "Cowboy Vest" + path = /obj/item/clothing/suit/cowboyvest diff --git a/modular_skyrat/modules/customization/modules/client/loadout/donator/uniform.dm b/modular_skyrat/modules/customization/modules/client/loadout/donator/uniform.dm index bfb06d21d64..d43a59d1889 100644 --- a/modular_skyrat/modules/customization/modules/client/loadout/donator/uniform.dm +++ b/modular_skyrat/modules/customization/modules/client/loadout/donator/uniform.dm @@ -10,3 +10,7 @@ /datum/loadout_item/uniform/donator/public/fashionableskirt name = "Fashionable Skirt" path = /obj/item/clothing/under/rank/civilian/skirt + +/datum/loadout_item/uniform/donator/public/blondie + name = "Blonde Cowboy Uniform" + path = /obj/item/clothing/under/rank/security/detective/cowboy/armorless diff --git a/modular_skyrat/modules/customization/modules/client/loadout/head.dm b/modular_skyrat/modules/customization/modules/client/loadout/head.dm index 62160b9b8f8..09b12a03f0b 100644 --- a/modular_skyrat/modules/customization/modules/client/loadout/head.dm +++ b/modular_skyrat/modules/customization/modules/client/loadout/head.dm @@ -158,6 +158,18 @@ name = "Cowboy Hat, Pink" path = /obj/item/clothing/head/cowboyhat/pink +/datum/loadout_item/head/cowboyhat/winter + name = "Winter Cowboy Hat" + path = /obj/item/clothing/head/cowboyhat/sherrif + +/datum/loadout_item/head/cowboyhat/sherrif + name = "Sherrif Hat" + path = /obj/item/clothing/head/cowboyhat/sherrif/alt + +/datum/loadout_item/head/cowboyhat/deputy + name = "Deputy Hat" + path = /obj/item/clothing/head/cowboyhat/deputy + //trek fancy Hats! /datum/loadout_item/head/trek/trekcap name = "Federation Officer's Cap (White)" diff --git a/modular_skyrat/modules/customization/modules/client/loadout/neck.dm b/modular_skyrat/modules/customization/modules/client/loadout/neck.dm index b9bf1c59aad..715cd228568 100644 --- a/modular_skyrat/modules/customization/modules/client/loadout/neck.dm +++ b/modular_skyrat/modules/customization/modules/client/loadout/neck.dm @@ -39,6 +39,10 @@ name = "Holocollar" path = /obj/item/clothing/neck/human_petcollar/locked/holocollar +/datum/loadout_item/neck/poncxhocowbot + name = "Green cowboy poncho" + path =/obj/item/clothing/toggle/cowboylea + /datum/loadout_item/neck/crosscollar name = "Cross collar" path = /obj/item/clothing/neck/human_petcollar/locked/cross diff --git a/modular_skyrat/modules/customization/modules/clothing/head/head.dm b/modular_skyrat/modules/customization/modules/clothing/head/head.dm index dbc4f79bc61..aa3ab698b94 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 Sherriff, 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, if out of fear or respect, 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" @@ -362,6 +362,7 @@ icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi' worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi' icon_state = "impcap_red" + /obj/item/clothing/head/imperialhelmet name = "blast helmet" desc = "A sharp helmet with some goggles on the top" @@ -397,3 +398,30 @@ worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi' icon_state = "enhead" mutant_variants = NONE + +/obj/item/clothing/head/cowboyhat/sherrif + 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' + icon_state = "sheriff_hat" + mutant_variants = NONE + desc = "A dark hat from the cold wastes of the Frosthill mountains. So it was done, all according to the law. There's a small set of antlers embroidered on the inside." + cold_protection = HEAD + min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT + flags_inv = HIDEHAIR + +/obj/item/clothing/head/cowboyhat/sherrif/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' + icon_state = "sheriff_hat_alt" + mutant_variants = NONE + desc = "A dark brown hat with a smell of whiskey. There's a small set of antlers embroidered on the inside." + +/obj/item/clothing/head/cowboyhat/deputy + name = "deputy hat" + icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi' + worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi' + icon_state = "deputy_hat" + mutant_variants = NONE + desc = "A light brown hat with a smell of iron. There's a small set of antlers embroidered on the inside." diff --git a/modular_skyrat/modules/customization/modules/clothing/neck/_neck.dm b/modular_skyrat/modules/customization/modules/clothing/neck/_neck.dm index 16ab9a45757..96e6e8e7cdb 100644 --- a/modular_skyrat/modules/customization/modules/clothing/neck/_neck.dm +++ b/modular_skyrat/modules/customization/modules/clothing/neck/_neck.dm @@ -4,4 +4,3 @@ worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/neck.dmi' icon_state = "eldritch_tie" desc = "The necktie is adorned with a garish pattern. It's disturbingly vivid. Somehow you feel as if it would be wrong to ever take it off. It's your friend now. You will betray it if you change it for some boring scarf." - diff --git a/modular_skyrat/modules/customization/modules/clothing/neck/cloaks.dm b/modular_skyrat/modules/customization/modules/clothing/neck/cloaks.dm index f6d5fc033b7..fa84de2685c 100644 --- a/modular_skyrat/modules/customization/modules/clothing/neck/cloaks.dm +++ b/modular_skyrat/modules/customization/modules/clothing/neck/cloaks.dm @@ -12,3 +12,18 @@ /obj/item/clothing/neck/cloak/qm/syndie name = "deck officer's cloak" desc = "A cloak that represents the eternal Cargoslavia. There's little Mosin Nagant emblems woven into the fabric." + +/obj/item/clothing/neck/cowboylea + name = "green cowboy poncho" + desc = "A sand covered cloak, there seems to be a small deer head with antlers embroidered inside." + body_parts_covered = NECK + slot_flags = ITEM_SLOT_NECK + icon = 'modular_skyrat/master_files/icons/obj/clothing/neck.dmi' + worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/neck.dmi' + icon_state = "cowboy_poncho" + mutant_variants = NONE + heat_protection = CHEST + +/obj/item/clothing/toggle/cowboylea/ComponentInitialize() + . = ..() + AddComponent(/datum/component/toggle_clothes, "cowboy_poncho_t") diff --git a/modular_skyrat/modules/customization/modules/clothing/storage/belts.dm b/modular_skyrat/modules/customization/modules/clothing/storage/belts.dm index 4d2cbb50e84..e1bae34dc12 100644 --- a/modular_skyrat/modules/customization/modules/clothing/storage/belts.dm +++ b/modular_skyrat/modules/customization/modules/clothing/storage/belts.dm @@ -126,3 +126,12 @@ STR.max_items = 6 STR.rustle_sound = TRUE STR.max_w_class = WEIGHT_CLASS_SMALL //Rather than have a huge whitelist, the belt can simply hold anything a pocket can hold - Can easily be changed if it somehow becomes an issue + +/obj/item/storage/belt/holster/cowboy + icon = 'modular_skyrat/master_files/icons/obj/clothing/belts.dmi' + worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/belt.dmi' + name = "cowboy belt" + desc = "Yee haw! The holster on the side of the hip is leather stamped with swirling lines, all leading back to a deer's antlers." + icon_state = "cowboy_belt" + worn_icon_state = "cowboy_belt" + inhand_icon_state = "utility" diff --git a/modular_skyrat/modules/customization/modules/clothing/toggle_base.dm b/modular_skyrat/modules/customization/modules/clothing/toggle_base.dm new file mode 100644 index 00000000000..717e97a5d53 --- /dev/null +++ b/modular_skyrat/modules/customization/modules/clothing/toggle_base.dm @@ -0,0 +1,25 @@ +/datum/component/toggle_clothes + var/toggled = FALSE + var/toggled_icon_state + +/datum/component/toggle_clothes/Initialize(toggled_icon_state) + if(!isclothing(parent)) + return COMPONENT_INCOMPATIBLE + + if(!toggled_icon_state) + return COMPONENT_INCOMPATIBLE + + src.toggled_icon_state = toggled_icon_state + + RegisterSignal(parent, COMSIG_CLICK_ALT, .proc/toggle_clothes) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) + +/datum/component/toggle_clothes/proc/toggle_clothes(obj/item/clothing/source, mob/living/clicker) + SIGNAL_HANDLER + + toggled = !toggled + source.icon_state = (toggled ? toggled_icon_state : initial(source.icon_state)) + +/datum/component/toggle_clothes/proc/on_examine(obj/item/clothing/source, mob/living/clicker) + SIGNAL_HANDLER + to_chat(clicker, "This item is toggleable! Alt Click to toggle!") diff --git a/modular_skyrat/modules/customization/modules/clothing/under/security.dm b/modular_skyrat/modules/customization/modules/clothing/under/security.dm index 13a70b22980..b0b9abcf080 100644 --- a/modular_skyrat/modules/customization/modules/clothing/under/security.dm +++ b/modular_skyrat/modules/customization/modules/clothing/under/security.dm @@ -54,6 +54,41 @@ mutant_variants = NONE heat_protection = CHEST|ARMS +/obj/item/clothing/under/rank/security/detective/cowboy + name = "blond cowboy uniform" + 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" + mutant_variants = NONE + can_adjust = FALSE + +/obj/item/clothing/under/rank/security/detective/cowboy/armorless + armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 0, ACID = 0) + +/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." + 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" + body_parts_covered = CHEST|ARMS + cold_protection = CHEST|ARMS + mutant_variants = NONE + heat_protection = CHEST|ARMS + +/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." + 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" + body_parts_covered = CHEST|ARMS + cold_protection = CHEST|ARMS + mutant_variants = NONE + heat_protection = CHEST|ARMS + + // SEC GENERAL // PRISONER diff --git a/tgstation.dme b/tgstation.dme index 3f0bffc776d..858506c15ed 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4008,6 +4008,7 @@ #include "modular_skyrat\modules\customization\modules\client\loadout\donator\uniform.dm" #include "modular_skyrat\modules\customization\modules\client\loadout\donator\personal\donator_personal.dm" #include "modular_skyrat\modules\customization\modules\clothing\clothing.dm" +#include "modular_skyrat\modules\customization\modules\clothing\toggle_base.dm" #include "modular_skyrat\modules\customization\modules\clothing\ears\ears.dm" #include "modular_skyrat\modules\customization\modules\clothing\glasses\glasses.dm" #include "modular_skyrat\modules\customization\modules\clothing\glasses\hud.dm"