Merge pull request #279 from JoanRisu/Fluff_Items_worshop

Fluff Items Workshop
This commit is contained in:
Spades
2016-06-03 10:54:47 -04:00
5 changed files with 18 additions and 3 deletions
@@ -63,14 +63,14 @@
/obj/item/clothing/shoes/black,
/*/obj/item/toy/crayon/mime*/) //Need to track down the code for crayons before adding this back in
// joanrisu:Joan Risu
//joanrisu:Joan Risu
/obj/item/weapon/storage/box/fluff/joanrisu
name = "Federation Officer's Kit"
desc = "A care package for every serving Federation officer serving away from the Federation."
has_items = list(
/obj/item/clothing/accessory/holster/hip,
/obj/item/clothing/suit/storage/fluff/fedcoat/fedcapt,
/obj/item/weapon/card/id/gold/fluff/joanbadge,
/obj/item/weapon/card/id/centcom/fluff/joanbadge,
/obj/item/weapon/gun/energy/gun/fluff/dominator,
/obj/item/clothing/suit/armor/det_suit,)
@@ -592,3 +592,8 @@
item_state = "arosuit_mob"
w_class = 4 //Oh but I can.
allowed = list(/obj/item/device/suit_cooling_unit) //Can't fit O2 tanks
//Viveret:Keturah
/obj/item/clothing/under/dress/maid/
name = "Maid Outfit"
desc = "A french maid outfit made ironically in Gaia's version of the far east."
@@ -91,7 +91,7 @@
attack_verb = list("attacked", "hammered", "smashed", "slammed", "crushed")
//JoanRisu:Joan Risu
/obj/item/weapon/card/id/gold/fluff/joanbadge
/obj/item/weapon/card/id/centcom/fluff/joanbadge
name = "Faded Badge"
desc = "A faded badge, backed with leather, that reads 'NT Security Force' across the front."
icon = 'icons/vore/custom_items_vr.dmi'
@@ -246,3 +246,13 @@
New()
..()
update_name()
//Swat43:Fortune Bloise
/obj/item/weapon/storage/backpack/satchel/fluff/swat43bag
name = "Coloured Satchel"
desc = "That's a coloured satchel with red stripes, with a heart and ripley logo on each side."
icon = 'icons/vore/custom_items_vr.dmi'
icon_state = "swat43-bag"
icon_override = 'icons/vore/custom_items_vr.dmi'
item_state = "swat43-bag_mob"