Merge pull request #7322 from Aurorablade/KittyFluff

Fethas Fluff Item

code/modules/client/preference/loadout/loadout_accessories.dm

@@ -134,8 +134,13 @@
 	display_name = "cowboy shirt, short sleeved navy"
 	path = /obj/item/clothing/accessory/cowboyshirt/navy/short_sleeved
 
-
-
+/datum/gear/accessory/locket
+	display_name = "gold locket"
+	path = /obj/item/clothing/accessory/necklace/locket
+
+/datum/gear/accessory/necklace
+	display_name = "simple necklace"
+	path = /obj/item/clothing/accessory/necklace
 
 
 

code/modules/clothing/under/accessories/accessory.dm

@@ -384,6 +384,66 @@
 	icon_state = "stripedbluescarf"
 	item_color = "stripedbluescarf"
 
+//Necklaces
+/obj/item/clothing/accessory/necklace
+	name = "necklace"
+	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
+	name = "gold locket"
+	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
+	var/obj/item/held //Item inside locket.
+
+/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)
+		base_icon = icon_state
+
+	if(!("[base_icon]_open" in icon_states(icon)))
+		to_chat(user, "[src] doesn't seem to open.")
+		return
+
+	open = !open
+	to_chat(user, "You flip [src] [open?"open":"closed"].")
+	if(open)
+		icon_state = "[base_icon]_open"
+		if(held)
+			to_chat(user, "[held] falls out!")
+			held.forceMove(get_turf(user))
+			held = null
+	else
+		icon_state = "[base_icon]"
+
+/obj/item/clothing/accessory/necklace/locket/attackby(var/obj/item/O as obj, mob/user as mob)
+	if(!open)
+		to_chat(user, "You have to open it first.")
+		return
+
+	if(istype(O,/obj/item/weapon/paper) || istype(O, /obj/item/weapon/photo) && !(istype(O, /obj/item/weapon/paper/talisman)))
+		if(held)
+			to_chat(usr, "[src] already has something inside it.")
+		else
+			to_chat(usr, "You slip [O] into [src].")
+			user.drop_item()
+			O.forceMove(src)
+			held = O
+	else
+		return ..()
+
 //Cowboy Shirts
 /obj/item/clothing/accessory/cowboyshirt
 	name = "black cowboy shirt"

code/modules/customitems/item_defines.dm

@@ -903,3 +903,13 @@
 		icon_state = options[choice]
 		to_chat(user, "Your strange witch hat has now shapeshifted into it's [choice] form!")
 		return 1
+	..()
+
+/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