cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Baystation12/Baystation12

Browse Source 
Conflicts:
	icons/obj/custom_items.dmi
This commit is contained in:
MagmaRam
2013-05-19 06:21:32 +07:00
parent fbfa125f4b 6c062dc05c
commit d7876da147
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -521,9 +521,10 @@ hi
icon_state = "deus_blueshield" icon_state = "deus_blueshield"
item_state = "deus_blueshield" item_state = "deus_blueshield"
/obj/item/clothing/suit/fluff/oldscarf //Writerer2: Sharik Israa /obj/item/clothing/suit/fluff/oldscarf //Writerer2: Javaria Zara
name = "old scarf" name = "old scarf"
desc = "An old looking scarf, it seems to be fairly worn." desc = "An old looking scarf, it seems to be fairly worn."
icon = 'clothing/suits.dmi'
icon_state = "mantle-unathi" icon_state = "mantle-unathi"
item_state = "mantle-unathi" item_state = "mantle-unathi"
body_parts_covered = UPPER_TORSO body_parts_covered = UPPER_TORSO

BIN
icons/obj/custom_items.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 41 KiB

After

Width:  |  Height:  |  Size: 42 KiB