cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-26 21:48:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes conflicts

Browse Source
This commit is contained in:
rb303
2019-03-11 02:55:21 +00:00
parent 26bcfacf2a
commit f1716ed14a
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/customitems/item_defines.dm
+6 -6
View File
@@ -1684,12 +1684,12 @@
slot_flags = SLOT_TIE
/obj/item/clothing/accessory/rbscarf //Rb303: Isthel Eisenwald
name = "Old purple scarf"
desc = "An old, striped purple scarf. It appears to be hand-knitted and has the name 'Isthel' written on it in bad handwriting."
icon = 'icons/obj/custom_items.dmi'
icon_state = "rbscarf"
item_state = "rbscarf"
item_color = "rbscarf"
name = "Old purple scarf"
desc = "An old, striped purple scarf. It appears to be hand-knitted and has the name 'Isthel' written on it in bad handwriting."
icon = 'icons/obj/custom_items.dmi'
icon_state = "rbscarf"
item_state = "rbscarf"
item_color = "rbscarf"
/obj/item/instrument/accordion/fluff/asmer_accordion //Asmerath: Coloratura
name = "Rara's Somber Accordion"