Merge branch 'master' into rsiksfluffitem

This commit is contained in:
Gwydion Brain
2018-10-01 11:40:01 -07:00
97 changed files with 1927 additions and 1911 deletions
+9
View File
@@ -1207,6 +1207,15 @@
flags = BLOCKHAIR
flags_inv = HIDEFACE
/obj/item/clothing/shoes/fluff/arachno_boots
name = "Arachno-Man boots"
desc = "These boots were made for crawlin'"
icon = 'icons/obj/custom_items.dmi'
icon_state = "superior_boots"
item_state = "superior_boots"
/obj/item/nullrod/fluff/chronx //chronx100: Hughe O'Splash
fluff_transformations = list(/obj/item/nullrod/fluff/chronx/scythe)