Conflicts

This commit is contained in:
FlattestGuitar
2017-08-12 11:07:12 +02:00
7 changed files with 122 additions and 86 deletions
+7
View File
@@ -565,6 +565,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."