[semi-modular][ready]YEE HAW! More cowboy clothes! (#6984)

* [semi-modular][ready]YEE HAW! More cowboy clothes! * the belt space * Update _neck.dm * pls work * Update _neck.dm * Update modular_skyrat/modules/customization/modules/clothing/neck/_neck.dm Co-authored-by: FlamingLily <80451102+FlamingLily@users.noreply.github.com> * Update modular_skyrat/modules/customization/modules/clothing/neck/_neck.dm Co-authored-by: FlamingLily <80451102+FlamingLily@users.noreply.github.com> * Update modular_skyrat/modules/customization/modules/clothing/neck/_neck.dm Co-authored-by: FlamingLily <80451102+FlamingLily@users.noreply.github.com> * Update modular_skyrat/modules/customization/modules/clothing/neck/_neck.dm Co-authored-by: FlamingLily <80451102+FlamingLily@users.noreply.github.com> * Update modular_skyrat/modules/customization/modules/clothing/neck/_neck.dm Co-authored-by: FlamingLily <80451102+FlamingLily@users.noreply.github.com> * Update cloaks.dm * Update _neck.dm * please work i beg you * Update _neck.dm * work please * please * Update wardrobes.dm * create toggle_base * update cowboylea to use new toggle base * update loadout typeref * actually tick the toggle base * remove old toggle code * rouge tab * move location of toggle base * forgot to call our init helper * need to call action update on toggle dunce * uhh lets hope this works * subtype instead * please help * Update toggle_base.dm * Update cloaks.dm * WORK * Update toggle_base.dm * work Co-authored-by: louiseedwardstuart <bonniefluff> Co-authored-by: FlamingLily <80451102+FlamingLily@users.noreply.github.com> Co-authored-by: Matthew <matthew@tfaluc.com>
2026-08-27 15:17:01 +01:00 · 2021-07-20 17:29:02 +02:00
parent d696ab69aa
commit 42436fad10
24 changed files with 147 additions and 3 deletions
@@ -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

@@ -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,
@@ -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,
@@ -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
@@ -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
@@ -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)"
@@ -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
@@ -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."
@@ -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."
-
@@ -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")
@@ -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"
@@ -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!")
@@ -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
@@ -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"