diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 796edf4e1b6..582f5b8fbac 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -1295,7 +1295,7 @@ All custom items with worn sprites must follow the contained sprite system: http usr << "You close \the [src]." -/obj/item/clothing/suit/storage/fluff/azala_coat //Azala's Gentleman's Coat - Azala Guwan - tomiixstarslasher +/obj/item/clothing/suit/storage/fluff/azala_coat //Azala's Gentleman's Coat - Azala Huz'kai - tomiixstarslasher name = "gentleman's coat" desc = "A blue gentleman's coat. It is very stylish, and appears to be very warm." icon = 'icons/obj/custom_items/azala_items.dmi' @@ -1303,7 +1303,7 @@ All custom items with worn sprites must follow the contained sprite system: http item_state = "azala_coat" contained_sprite = TRUE -/obj/item/clothing/head/fluff/azala_hat //Azala's Gentleman's Cap - Azala Guwan - tomiixstarslasher +/obj/item/clothing/head/fluff/azala_hat //Azala's Gentleman's Cap - Azala Huz'kai - tomiixstarslasher name = "gentleman's cap" desc = "A blue gentleman's cap. It is very stylish, and appears to be warped from being worn crooked." icon = 'icons/obj/custom_items/azala_items.dmi' @@ -1311,7 +1311,7 @@ All custom items with worn sprites must follow the contained sprite system: http item_state = "azala_hat" contained_sprite = TRUE -/obj/item/clothing/under/fluff/azala_jumpsuit //Azala's Roboticist Jumpsuit - Azala Guwan - tomiixstarslasher +/obj/item/clothing/under/fluff/azala_jumpsuit //Azala's Roboticist Jumpsuit - Azala Huz'kai - tomiixstarslasher name = "modified roboticist jumpsuit" desc = "A variation of the roboticists jumpsuit, this one is in blue colors." icon = 'icons/obj/custom_items/azala_items.dmi' @@ -1428,7 +1428,7 @@ All custom items with worn sprites must follow the contained sprite system: http /obj/item/clothing/gloves/watch/fluff/rex_watch //Engraved Wristwatch - Rex Winters - tailson name = "engraved wristwatch" - desc = " A fine gold watch. On the inside is an engraving that reads \"Happy birthday dad, thinking of you always\"." + desc = "A fine gold watch. On the inside is an engraving that reads \"Happy birthday dad, thinking of you always\"." icon = 'icons/obj/custom_items/rex_watch.dmi' icon_state = "rex_watch" @@ -1446,3 +1446,136 @@ All custom items with worn sprites must follow the contained sprite system: http name = "silver star of merit" desc = "The Biesel Silver Star of Merit, rewarded for bravery and professionalism in the line of duty." icon_state = "silver_sword" + + +/obj/item/clothing/mask/gas/fluff/karihaakaki_mask //Wooden Mask - Keziah Green/Karihaakaki - dronzthewolf + name = "wooden mask" + desc = "A wooden mask for non-human proportions, it has craftsmanship of uncanny precision." + icon = 'icons/obj/custom_items/karihaakaki_mask.dmi' + icon_state = "karihaakaki_mask" + item_state = "karihaakaki_mask" + species_restricted = list("Vox") + contained_sprite = TRUE + + +/obj/item/weapon/storage/wallet/fluff/muhawir_wallet //Pineapple Wallet - Muhawir Nawfal - menown + name = "pineapple wallet" + desc = "A rather small, cheaply made felt wallet with a zipper near the top. It looks like a pineapple." + icon = 'icons/obj/custom_items/muhawir_wallet.dmi' + icon_state = "muhawir_wallet" + +/obj/item/weapon/storage/wallet/fluff/muhawir_wallet/update_icon() + return + + +/obj/item/weapon/folder/fluff/sukhoi_folder //Inventor's Notebook - Natascha Sukhoi - lancelynxx + name = "inventor's notebook" + desc = "A dark-green notebook, with crumpled Post-Its sticking out and binding tearing at the edges. It reeks of DromedaryCo cigarettes. The words \"SUKH SYSTEMS\" are scribbled on the cover with a black sharpie." + icon = 'icons/obj/custom_items/sukhoi_folder.dmi' + icon_state = "sukhoi_folder" + + +/obj/item/clothing/suit/fluff/diamond_cloak //Ragged Purple Cloak - Diamond With Flaw - burgerbb + name = "ragged purple cloak" + desc = "An old, worn down cloak that smells of dirt and stories." + icon = 'icons/obj/custom_items/diamond_cloak.dmi' + icon_state = "diamond_cloak" + item_state = "diamond_cloak" + body_parts_covered = UPPER_TORSO|LOWER_TORSO + contained_sprite = TRUE + + +/obj/item/fluff/jennifer_wardrobe_kit //Portable Wardrobe Kit - Jennifer Beal - synnono + name = "portable wardrobe kit" + desc = "A kit containing a change of casual clothes, packaged for easy transport. This one advertises some sort of cartoon featuring slimes. It is labeled \"J. Beal.\"" + icon = 'icons/obj/custom_items/jennifer_clothes.dmi' + icon_state = "jennifer_wardrobe_box" + item_state = "syringe_kit" + +/obj/item/fluff/jennifer_wardrobe_kit/attack_self(mob/user as mob) + if (use_check(user, USE_DISALLOW_SILICONS)) + return + + var/list/outfits = list( + "Pale turtleneck outfit" = list( + /obj/item/clothing/under/fluff/jennifer_turtleneck, + /obj/item/clothing/shoes/fluff/jennifer_aboots + ), + "Black net mesh outfit" = list( + /obj/item/clothing/under/fluff/jennifer_nets, + /obj/item/clothing/shoes/fluff/jennifer_pboots + ), + "Cartoon T-shirt outfit" = list( + /obj/item/clothing/under/fluff/jennifer_tee, + /obj/item/clothing/shoes/fluff/jennifer_shoes + ) + ) + + var/selection = input("What do you find inside?", "Inside the kit...") as null|anything in outfits + if (!selection) + return + for (var/item in outfits[selection]) + new item(get_turf(src)) + to_chat(user, "You unpack the outfit from the kit.") + + qdel(src) + +/obj/item/clothing/under/fluff/jennifer_nets //Black Net Mesh Outfit - Jennifer Beal - synnono + name = "black net mesh outfit" + desc = "A clingy black top and matching skirt, belted with heavy leather around the waist. A soft fabric netting stretches over the exposed collar, midriff, arms and legs." + icon = 'icons/obj/custom_items/jennifer_clothes.dmi' + icon_state = "jennifer_nets" + item_state = "jennifer_nets" + has_sensor = 0 + contained_sprite = TRUE + +/obj/item/clothing/under/fluff/jennifer_turtleneck //Pale Turtleneck Outfit - Jennifer Beal - synnono + name = "pale turtleneck outfit" + desc = "A graphite-blue turtleneck sweater, paired with dark blue jeans." + icon = 'icons/obj/custom_items/jennifer_clothes.dmi' + icon_state = "jennifer_turtleneck" + item_state = "jennifer_turtleneck" + has_sensor = 0 + contained_sprite = TRUE + +/obj/item/clothing/under/fluff/jennifer_tee //Cartoon T-shirt Outfit - Jennifer Beal - synnono + name = "cartoon T-shirt outfit" + desc = "A promotional white T-shirt and cargo shorts. The shirt is printed with Slime Purple, the protagonist of the cartoon 'Great Slime Hero: Zettai Justice.'\nFor great slime justice!" + icon = 'icons/obj/custom_items/jennifer_clothes.dmi' + icon_state = "jennifer_tee" + item_state = "jennifer_tee" + has_sensor = 0 + contained_sprite = TRUE + +/obj/item/clothing/under/fluff/jennifer_jersey //Capital Sting FC Outfit - Jennifer Beal - synnono + name = "association football outfit" + desc = "A yellow and black jersey for the Mendell City women's club \"Capital Sting FC\" paired with black athletic shorts. This belongs on the pitch!" + icon = 'icons/obj/custom_items/jennifer_clothes.dmi' + icon_state = "jennifer_jersey" + item_state = "jennifer_jersey" + has_sensor = 0 + contained_sprite = TRUE + +/obj/item/clothing/shoes/fluff/jennifer_pboots //Black Punk Boots - Jennifer Beal - synnono + name = "black punk boots" + desc = "A tall pair of thick-heeled black leather boots. They are fastened with several burnished steel buckles." + icon = 'icons/obj/custom_items/jennifer_clothes.dmi' + icon_state = "jennifer_pboots" + item_state = "jennifer_pboots" + contained_sprite = TRUE + +/obj/item/clothing/shoes/fluff/jennifer_aboots //Brown Ankle Boots - Jennifer Beal - synnono + name = "brown ankle boots" + desc = "A comfortable pair of short ankle boots." + icon = 'icons/obj/custom_items/jennifer_clothes.dmi' + icon_state = "jennifer_aboots" + item_state = "jennifer_aboots" + contained_sprite = TRUE + +/obj/item/clothing/shoes/fluff/jennifer_shoes //White Walking Sneakers - Jennifer Beal - synnono + name = "white walking sneakers" + desc = "A bright pair of white sneakers. They have purple rubber soles." + icon = 'icons/obj/custom_items/jennifer_clothes.dmi' + icon_state = "jennifer_shoes" + item_state = "jennifer_shoes" + contained_sprite = TRUE \ No newline at end of file diff --git a/icons/obj/custom_items/diamond_cloak.dmi b/icons/obj/custom_items/diamond_cloak.dmi new file mode 100644 index 00000000000..eaa7af336a4 Binary files /dev/null and b/icons/obj/custom_items/diamond_cloak.dmi differ diff --git a/icons/obj/custom_items/jennifer_clothes.dmi b/icons/obj/custom_items/jennifer_clothes.dmi new file mode 100644 index 00000000000..603c88391b0 Binary files /dev/null and b/icons/obj/custom_items/jennifer_clothes.dmi differ diff --git a/icons/obj/custom_items/karihaakaki_mask.dmi b/icons/obj/custom_items/karihaakaki_mask.dmi new file mode 100644 index 00000000000..e6b0aeeeaed Binary files /dev/null and b/icons/obj/custom_items/karihaakaki_mask.dmi differ diff --git a/icons/obj/custom_items/muhawir_wallet.dmi b/icons/obj/custom_items/muhawir_wallet.dmi new file mode 100644 index 00000000000..4aecf46d67b Binary files /dev/null and b/icons/obj/custom_items/muhawir_wallet.dmi differ diff --git a/icons/obj/custom_items/sukhoi_folder.dmi b/icons/obj/custom_items/sukhoi_folder.dmi new file mode 100644 index 00000000000..3df577f8a0c Binary files /dev/null and b/icons/obj/custom_items/sukhoi_folder.dmi differ