iokay then.

This commit is contained in:
Aurorablade
2017-05-17 01:33:44 -04:00
parent 61933c99dc
commit eba2ff229e
6 changed files with 6 additions and 2 deletions
@@ -390,6 +390,7 @@
desc = "A simple necklace."
icon_state = "necklace"
item_state = "necklace"
item_color = "necklace"
slot_flags = SLOT_MASK | SLOT_TIE
/obj/item/clothing/accessory/necklace/locket
@@ -397,6 +398,7 @@
desc = "A gold locket that seems to have space for a photo within."
icon_state = "locket"
item_state = "locket"
item_color = "locket"
slot_flags = SLOT_MASK | SLOT_TIE
var/base_icon
var/open
@@ -404,6 +406,8 @@
/obj/item/clothing/accessory/necklace/locket/Destroy()
QDEL_NULL(held)
return ..()
/obj/item/clothing/accessory/necklace/locket/attack_self(mob/user as mob)
if(!base_icon)
@@ -440,7 +444,6 @@
else
return ..()
//Cowboy Shirts
/obj/item/clothing/accessory/cowboyshirt
name = "black cowboy shirt"
+2 -1
View File
@@ -931,10 +931,11 @@
/obj/item/clothing/accessory/necklace/locket/fethasnecklace //Fethas: Sefra'neem
/obj/item/clothing/accessory/necklace/locket/fluff/fethasnecklace //Fethas: Sefra'neem
name = "Orange gemmed locket"
desc = "A locket with a orange gem set on the front, the picture inside seems to be of a Tajaran."
icon = 'icons/obj/custom_items.dmi'
icon_state = "fethasnecklace"
item_state = "fethasnecklace"
item_color = "fethasnecklace"
slot_flags = SLOT_MASK | SLOT_TIE
Binary file not shown.

Before

Width:  |  Height:  |  Size: 45 KiB

After

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 66 KiB

After

Width:  |  Height:  |  Size: 71 KiB