cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color

Browse Source 
Conflicts:
	code/modules/customitems/item_defines.dm
This commit is contained in:
mwerezak
2015-04-24 18:15:22 -04:00
parent f86642a74e 173329f675
commit 229f4cb043
34 changed files with 1452 additions and 949 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/customitems/item_defines.dm
View File

@@ -1124,8 +1124,8 @@
icon = 'icons/obj/custom_items.dmi'
icon_state = "parker_eliza_arms"
item_state = "parker_eliza_arms"
body_parts_covered = 0 //technicially it's underneath everything, being part of the body
canremove = 0
////////////// Accessories /////