shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into kitsundevilwings

Browse Source
This commit is contained in:
deathride58
2018-06-12 07:57:15 +00:00
committed by GitHub
parent 8169c9256f ecd200a5bc
commit 5189199b50
201 changed files with 1443 additions and 1532 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/custom_loadout/custom_items.dm
+12
View File
@@ -328,6 +328,18 @@
/obj/item/toy/sword/darksabre
))
/obj/item/clothing/suit/armor/vest/darkcarapace
name = "Dark Armor"
desc = "A dark, non-functional piece of armor sporting a red and black finish."
icon = 'icons/obj/custom.dmi'
icon_override = 'icons/mob/custom_w.dmi'
icon_state = "darkcarapace"
item_state = "darkcarapace"
blood_overlay_type = "armor"
dog_fashion = /datum/dog_fashion/back
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
/obj/item/clothing/neck/cloak/green
name = "Generic Green Cloak"
desc = "This cloak doesn't seem too special."