Sivian Western Sprite Pack (#4970)

* Adds: flamenco dress, bustle dress, cowboy duster, sheriff badge, tiny cowboy hat. To be added: 2 pairs of cowboy boots, stick horse.

* Adds 2 cowboy boots and a stick horse. yeehaw.

* Attempting to squash conflict that was caused by one of my OWN prs. For shame.

* attempting to fix conflict ft. anewbe

code/game/machinery/computer/arcade.dm

@@ -28,7 +28,10 @@
 							/obj/random/action_figure						= 1,
 							/obj/random/plushie								= 1,
 							/obj/item/toy/cultsword							= 1,
-							/obj/item/toy/bouquet/fake						= 1
+							/obj/item/toy/bouquet/fake						= 1,
+							/obj/item/clothing/accessory/badge/sheriff		= 2,
+							/obj/item/clothing/head/cowboy_hat/small		= 2,
+							/obj/item/toy/stickhorse						= 2
 							)
 
 /obj/machinery/computer/arcade/New()

code/game/objects/items/toys.dm

@@ -17,6 +17,7 @@
  *		Plushies
  *		Toy cult sword
  *		Bouquets
+ 		Stick Horse
  */
 
 
@@ -886,6 +887,13 @@
 	name = "plastic bouquet"
 	desc = "A cheap plastic bouquet of flowers. Smells like cheap, toxic plastic."
 
+/obj/item/toy/stickhorse
+	name = "stick horse"
+	desc = "A pretend horse on a stick for any aspiring little cowboy to ride."
+	icon = 'icons/obj/toy.dmi'
+	icon_state = "stickhorse"
+	w_class = ITEMSIZE_LARGE
+
 /* NYET.
 /obj/item/weapon/toddler
 	icon_state = "toddler"

code/modules/client/preference_setup/loadout/loadout_shoes.dm

@@ -141,6 +141,14 @@
 	display_name = "cowboy boots"
 	path = /obj/item/clothing/shoes/boots/cowboy
 
+/datum/gear/shoes/cowboy/classic
+	display_name = "classic cowboy boots"
+	path = /obj/item/clothing/shoes/boots/cowboy/classic
+
+/datum/gear/shoes/cowboy/snakeskin
+	display_name = "snakeskin cowboy boots"
+	path = /obj/item/clothing/shoes/boots/cowboy/snakeskin
+
 /datum/gear/shoes/jungle
 	display_name = "jungle boots"
 	path = /obj/item/clothing/shoes/boots/jungle

code/modules/client/preference_setup/loadout/loadout_suit.dm

@@ -90,6 +90,14 @@
 	display_name = "trenchcoat, grey"
 	path = /obj/item/clothing/suit/storage/trench/grey
 
+datum/gear/suit/duster
+	display_name = "cowboy duster"
+	path = /obj/item/clothing/suit/storage/duster
+
+/datum/gear/suit/duster/New()
+	..()
+	gear_tweaks = list(gear_tweak_free_color_choice)
+
 /datum/gear/suit/hazard_vest
 	display_name = "hazard vest selection"
 	path = /obj/item/clothing/suit/storage/hazardvest

code/modules/client/preference_setup/loadout/loadout_uniform.dm

@@ -448,4 +448,12 @@
 
 /datum/gear/uniform/bathrobe
 	display_name = "bathrobe"
-	path = /obj/item/clothing/under/bathrobe
+	path = /obj/item/clothing/under/bathrobe
+
+/datum/gear/uniform/flamenco
+	display_name = "flamenco dress"
+	path = /obj/item/clothing/under/dress/flamenco
+
+/datum/gear/uniform/westernbustle
+	display_name = "western bustle"
+	path = /obj/item/clothing/under/dress/westernbustle

code/modules/clothing/head/misc.dm

@@ -292,6 +292,11 @@
 	desc = "Because justice isn't going to dispense itself."
 	icon_state = "cowboy_wide"
 
+/obj/item/clothing/head/cowboy_hat/small
+	name = "small cowboy hat"
+	desc = "For the tiniest of cowboys."
+	icon_state = "cowboy_small"
+
 /obj/item/clothing/head/witchwig
 	name = "witch costume wig"
 	desc = "Eeeee~heheheheheheh!"

code/modules/clothing/shoes/boots.dm

@@ -11,6 +11,18 @@
 	desc = "Lacking a durasteel horse to ride."
 	icon_state = "cowboy"
 
+/obj/item/clothing/shoes/boots/cowboy/classic
+	name = "classic cowboy boots"
+	desc = "A classic looking pair of durable cowboy boots."
+	icon_state = "cowboy_classic"
+	item_state_slots = list(slot_r_hand_str = "leather", slot_l_hand_str = "leather")
+
+/obj/item/clothing/shoes/boots/cowboy/snakeskin
+	name = "snakeskin cowboy boots"
+	desc = "A pair of cowboy boots made from python skin."
+	icon_state = "cowboy_snakeskin"
+	item_state_slots = list(slot_r_hand_str = "white", slot_l_hand_str = "white")
+
 /obj/item/clothing/shoes/boots/jackboots
 	name = "jackboots"
 	desc = "Standard-issue Security combat boots for combat scenarios or combat situations. All combat, all the time."

code/modules/clothing/suits/miscellaneous.dm

@@ -348,6 +348,14 @@ obj/item/clothing/suit/storage/toggle/peacoat
 	addblends = "peacoat_a"
 	item_state_slots = list(slot_r_hand_str = "peacoat", slot_l_hand_str = "peacoat")
 	flags_inv = HIDEHOLSTER
+
+/obj/item/clothing/suit/storage/duster
+	name = "cowboy duster"
+	desc = "A duster commonly seen on cowboys from Earth's late 1800's."
+	icon_state = "duster"
+	blood_overlay_type = "coat"
+	allowed = list(/obj/item/weapon/tank/emergency/oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/flame/lighter)
+	flags_inv = HIDEHOLSTER
 /*
  * stripper
  */

code/modules/clothing/under/accessories/badges.dm

@@ -41,6 +41,23 @@
 		user.do_attack_animation(M)
 		user.setClickCooldown(DEFAULT_QUICK_COOLDOWN) //to prevent spam
 
+// Sheriff Badge (toy)
+/obj/item/clothing/accessory/badge/sheriff
+	name = "sheriff badge"
+	desc = "This town ain't big enough for the two of us, pardner."
+	icon_state = "sheriff"
+	item_state = "goldbadge"
+
+/obj/item/clothing/accessory/badge/sheriff/attack_self(mob/user as mob)
+	user.visible_message("[user] shows their sheriff badge. There's a new sheriff in town!",\
+		"You flash the sheriff badge to everyone around you!")
+
+/obj/item/clothing/accessory/badge/sheriff/attack(mob/living/carbon/human/M, mob/living/user)
+	if(isliving(user))
+		user.visible_message("<span class='danger'>[user] invades [M]'s personal space, the sheriff badge into their face!.</span>","<span class='danger'>You invade [M]'s personal space, thrusting the sheriff badge into their face insistently.</span>")
+		user.do_attack_animation(M)
+		user.setClickCooldown(DEFAULT_QUICK_COOLDOWN) //to prevent spam
+
 //.Holobadges.
 /obj/item/clothing/accessory/badge/holo
 	name = "holobadge"
@@ -129,4 +146,4 @@
 		new /obj/item/clothing/accessory/badge/holo/hos(src)
 		new /obj/item/clothing/accessory/badge/holo/cord(src)
 		..()
-		return
+		return

code/modules/clothing/under/miscellaneous.dm

@@ -394,6 +394,16 @@
 	desc = "A red dress that sweeps to the side."
 	icon_state = "red_swept_dress"
 
+/obj/item/clothing/under/dress/flamenco
+	name = "flamenco dress"
+	desc = "A Mexican flamenco dress."
+	icon_state = "flamenco"
+
+/obj/item/clothing/under/dress/westernbustle
+	name = "western bustle"
+	desc = "A western bustle dress from Earth's late 1800's."
+	icon_state = "westernbustle"
+
 /*
  * wedding stuff
  */