cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-18 10:33:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

i thought i commited this...

Browse Source
This commit is contained in:
Aurorablade
2017-10-08 18:37:34 -04:00
parent 73b0f32927
commit 53d63a29f8
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/customitems/item_defines.dm
+1 -5
View File
@@ -1224,9 +1224,6 @@
item_color = "fethasnecklace"
slot_flags = SLOT_MASK | SLOT_TIE
<<<<<<< HEAD
=======
/obj/item/weapon/bedsheet/fluff/hugosheet //HugoLuman: Dan Martinez
name = "Cosmic space blankie"
desc = "Made from the dreams of space children everywhere."
@@ -1235,5 +1232,4 @@
righthand_file = 'icons/mob/inhands/fluff_righthand.dmi'
icon_state = "sheetcosmos"
item_state = "sheetcosmos"
item_color = "sheetcosmos"
>>>>>>> 179477ed078256f709c70b05fd03040cb8d46ca3
item_color = "sheetcosmos"