cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sivian Western Sprite Pack (#4970)

Browse Source 
* 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
This commit is contained in:
Schnayy
2018-02-27 21:24:20 +01:00
committed by Anewbe
parent 8c9c99f817
commit 36236e1883
27 changed files with 90 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/game/objects/items/toys.dm
View File

@@ -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"