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

Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into donoritemmodularization

Browse Source 
# Conflicts:
#	code/citadel/custom_loadout/custom_items.dm
#	code/datums/components/riding.dm
#	code/game/objects/items/implants/implantuplink.dm
#	icons/mob/neck.dmi
#	icons/obj/clothing/cloaks.dmi
This commit is contained in:
deathride58
2017-12-08 19:58:41 -05:00
parent 0fc1837c3a 99283df12b
commit 742d50b5e7
182 changed files with 2740 additions and 736 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/citadel/custom_loadout/custom_items.dm
+1 -3
View File
@@ -231,7 +231,5 @@
icon_state = "vermillion-i"
item_state = "vermillion-w"
body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS
icon = 'icons/obj/custom.dmi'
icon_override = 'icons/obj/custom.dmi'