Merge remote-tracking branch 'ParadiseSS13/master' into flatline_partner_fluff

This commit is contained in:
Gwydion Brain
2019-02-08 19:13:51 -08:00
18 changed files with 190 additions and 4 deletions
+7
View File
@@ -1327,6 +1327,13 @@
/obj/item/toy/plushie/fluff/fox/ui_action_click()
change_color()
/obj/item/clothing/suit/jacket/miljacket/desert/fox
name = "rugged military jacket"
desc = "A rugged brown military jacket with a stylized 'A' embroidered on the back. It seems very old, yet is in near mint condition. Has a tag on the inside collar signed 'Fox McCloud'."
icon = 'icons/obj/custom_items.dmi'
icon_state = "fox_coat"
item_color = "fox_coat"
// TheFlagbearer: Willow Walker
/obj/item/clothing/under/fluff/arachno_suit
name = "Arachno-Man costume"