diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index df2387e71f..2f0fce2bd3 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/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() diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index c86993fa31..dda0f76560 100644 --- a/code/game/objects/items/toys.dm +++ b/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" diff --git a/code/modules/client/preference_setup/loadout/loadout_shoes.dm b/code/modules/client/preference_setup/loadout/loadout_shoes.dm index 6b15fba5ea..6cca1946fd 100644 --- a/code/modules/client/preference_setup/loadout/loadout_shoes.dm +++ b/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 diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index 76bbebcc3f..6b32034b31 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/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 diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index cc5ca1cc9d..591269f418 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/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 \ No newline at end of file + 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 \ No newline at end of file diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 2fa770fe4b..fd850073d8 100644 --- a/code/modules/clothing/head/misc.dm +++ b/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!" diff --git a/code/modules/clothing/shoes/boots.dm b/code/modules/clothing/shoes/boots.dm index cbd8fe680e..0b6b6757dc 100644 --- a/code/modules/clothing/shoes/boots.dm +++ b/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." diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 5a3483f9c7..1392da3e46 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/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 */ diff --git a/code/modules/clothing/under/accessories/badges.dm b/code/modules/clothing/under/accessories/badges.dm index 2908a7b639..e96ea4ce4e 100644 --- a/code/modules/clothing/under/accessories/badges.dm +++ b/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("[user] invades [M]'s personal space, the sheriff badge into their face!.","You invade [M]'s personal space, thrusting the sheriff badge into their face insistently.") + 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 diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index d45a584e2c..07b0f12609 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/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 */ diff --git a/icons/mob/feet.dmi b/icons/mob/feet.dmi index e61f2d55ac..ba1c32c26a 100644 Binary files a/icons/mob/feet.dmi and b/icons/mob/feet.dmi differ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 3bfa260317..2f3ce03505 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/items/lefthand.dmi b/icons/mob/items/lefthand.dmi index a06310415f..9a8adaeae0 100644 Binary files a/icons/mob/items/lefthand.dmi and b/icons/mob/items/lefthand.dmi differ diff --git a/icons/mob/items/lefthand_suits.dmi b/icons/mob/items/lefthand_suits.dmi index d58dd02379..19b8980747 100644 Binary files a/icons/mob/items/lefthand_suits.dmi and b/icons/mob/items/lefthand_suits.dmi differ diff --git a/icons/mob/items/lefthand_uniforms.dmi b/icons/mob/items/lefthand_uniforms.dmi index 0a03f53ccd..33fcf070b1 100644 Binary files a/icons/mob/items/lefthand_uniforms.dmi and b/icons/mob/items/lefthand_uniforms.dmi differ diff --git a/icons/mob/items/righthand.dmi b/icons/mob/items/righthand.dmi index ac1ea14c40..d2b58c3297 100644 Binary files a/icons/mob/items/righthand.dmi and b/icons/mob/items/righthand.dmi differ diff --git a/icons/mob/items/righthand_suits.dmi b/icons/mob/items/righthand_suits.dmi index d0ced6b9c2..ef19860f96 100644 Binary files a/icons/mob/items/righthand_suits.dmi and b/icons/mob/items/righthand_suits.dmi differ diff --git a/icons/mob/items/righthand_uniforms.dmi b/icons/mob/items/righthand_uniforms.dmi index 78bc6edd3e..ca713f5455 100644 Binary files a/icons/mob/items/righthand_uniforms.dmi and b/icons/mob/items/righthand_uniforms.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 1e4770ea1e..c75364ed56 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi index b90b3bb18d..0aeb148539 100644 Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 5ad776778d..9e50b538ac 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 2fcbe66574..70594a801a 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi index a87dcc3a81..c1e4545825 100644 Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index b8ef0246dc..ab8812741a 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/ties.dmi b/icons/obj/clothing/ties.dmi index 51fa43389d..b71acb7ada 100644 Binary files a/icons/obj/clothing/ties.dmi and b/icons/obj/clothing/ties.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 708023477a..2d8e89049e 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ diff --git a/icons/obj/toy.dmi b/icons/obj/toy.dmi index 8af8f47f41..96ee428824 100644 Binary files a/icons/obj/toy.dmi and b/icons/obj/toy.dmi differ