Merge branch 'master' into CheekyCrenando_Fluff_coat

This commit is contained in:
Gwydion Brain
2019-01-25 13:13:20 -08:00
28 changed files with 151 additions and 109 deletions
+8
View File
@@ -1611,3 +1611,11 @@
icon_state = "asmer_accordion"
item_state = "asmer_accordion"
/obj/item/clothing/head/rabbitears/fluff/pinesalad_bunny // Pineapple Salad : Dan Jello
name = "Bluespace rabbit ears"
desc = "A pair of sparkly bluespace rabbit ears, with a small tag on them that reads,"/"Dan Jello~"/". Yuck, \
there's some pink slime on the part that goes on your head!"
icon = 'icons/obj/custom_items.dmi'
icon_state = "ps_bunny"