cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-29 18:31:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev

Browse Source 
Conflicts:
	baystation12.dme
	code/modules/projectiles/ammunition/bullets.dm
This commit is contained in:
Erthilo
2013-09-02 23:32:33 +01:00
parent 33e17c6925 4cb945d921
commit 3b61ba850f
146 changed files with 287 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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