Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DreamFluff

This commit is contained in:
Aurorablade
2017-08-23 17:37:22 -04:00
237 changed files with 1846 additions and 8135 deletions
+7
View File
@@ -533,6 +533,13 @@
icon_state = "hairflowerp"
item_state = "hairflowerp"
/obj/item/clothing/head/valkyriehelmet //R3Valkyrie: Rikki
name = "charred visor"
desc = "A visor of alien origin, charred by fire and completely non-functioning. It's been impeccably polished, shiny!"
icon = 'icons/obj/custom_items.dmi'
icon_state = "charred_visor"
species_restricted = list("Vox")
/obj/item/clothing/head/bearpelt/fluff/polar //Gibson1027: Sploosh
name = "polar bear pelt hat"
desc = "Fuzzy, and also stained with blood."