Merge pull request #1706 from Asanadas/master

Adding 2 custom items
This commit is contained in:
Jim "Apples"
2012-09-08 04:02:48 -07:00
5 changed files with 27 additions and 1 deletions

View File

@@ -123,6 +123,14 @@
icon_on = "redzippoon"
icon_off = "redzippo"
/obj/item/weapon/lighter/zippo/fluff/executivekill_1 //executivekill: Hunter Duke
name = "Gonzo Fist zippo"
desc = "A Zippo lighter with the iconic Gonzo Fist on a matte black finish."
icon = 'custom_items.dmi'
icon_state = "gonzozippo"
icon_on = "gonzozippoon"
icon_off = "gonzozippo"
/obj/item/weapon/fluff/cado_keppel_1 //sparklysheep: Cado Keppel
name = "purple comb"
desc = "A pristine purple comb made from flexible plastic. It has a small K etched into its side."
@@ -266,6 +274,22 @@
icon_state = "mcreary_journal"
item_state = "mcreary_journal"
/obj/item/device/flashlight/fluff/thejesster14_1 //thejesster14: Rosa Wolff
name = "old red flashlight"
desc = "A very old, childlike flashlight."
icon = 'custom_items.dmi'
icon_state = "wolfflight0"
w_class = 2
item_state = "wolfflight"
flags = FPRINT | TABLEPASS | CONDUCT
slot_flags = SLOT_BELT
m_amt = 50
g_amt = 20
on = 0
brightness_on = 4 //luminosity when on
icon_on = "wolfflight1"
icon_off = "wolfflight0"
//////////////////////////////////
//////////// Clothing ////////////
//////////////////////////////////