cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 11:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into more-fluff

Browse Source 
# Conflicts:
#	icons/obj/custom_items.dmi
This commit is contained in:
FlattestGuitar
2017-09-11 22:25:54 +02:00
parent 46a35e0535 fdca509b74
commit 81f5ea440f
15 changed files with 152 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/customitems/item_defines.dm
+10
View File
@@ -1203,3 +1203,13 @@
item_state = "fethasnecklace"
item_color = "fethasnecklace"
slot_flags = SLOT_MASK | SLOT_TIE
/obj/item/weapon/bedsheet/fluff/hugosheet //HugoLuman: Dan Martinez
name = "Cosmic space blankie"
desc = "Made from the dreams of space children everywhere."
icon = 'icons/obj/custom_items.dmi'
lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi'
righthand_file = 'icons/mob/inhands/fluff_righthand.dmi'
icon_state = "sheetcosmos"
item_state = "sheetcosmos"
item_color = "sheetcosmos"