Fluffitem

This commit is contained in:
Aurorablade
2017-05-16 03:53:43 -04:00
parent b062430d3c
commit 6a234d01c1
6 changed files with 71 additions and 2 deletions
@@ -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
@@ -384,6 +384,60 @@
icon_state = "stripedbluescarf"
item_color = "stripedbluescarf"
//Necklaces
/obj/item/clothing/accessory/necklace
name = "necklace"
desc = "A simple necklace."
icon_state = "necklace"
item_state = "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"
slot_flags = SLOT_MASK | SLOT_TIE
var/base_icon
var/open
var/obj/item/held //Item inside locket.
/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, "\The [src] doesn't seem to open.")
return
open = !open
to_chat(user, "You flip \the [src] [open?"open":"closed"].")
if(open)
icon_state = "[base_icon]_open"
if(held)
to_chat(user, "\The [held] falls out!")
held.loc = get_turf(user)
src.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))
if(held)
to_chat(usr, "\The [src] already has something inside it.")
else
to_chat(usr, "You slip [O] into [src].")
user.drop_item()
O.loc = src
src.held = O
return
..()
//Cowboy Shirts
/obj/item/clothing/accessory/cowboyshirt
name = "black cowboy shirt"
+10
View File
@@ -830,3 +830,13 @@
new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass(src)
new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass(src)
new /obj/item/weapon/reagent_containers/food/drinks/bottle/fluff/moonshine(src)
/obj/item/clothing/accessory/necklace/locket/fethasnecklace //Fethas: Sefra'neem
name = "Orange gemmed locket"
desc = "a locket with an 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"
slot_flags = SLOT_MASK | SLOT_TIE