diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index c2777808970..e27162f877e 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -1,6 +1,9 @@ /// Aurora custom items /// -// Add custom items to this file, their sprites into their own dmi. in the icons/obj/custom_items -// Clothing items will probably require contained sprites +/*basic guidelines: +Custom items must be accepted at some point in the forums by the staff handling them. +Add custom items to this file, their sprites into their own dmi. in the icons/obj/custom_items. +All custom items with worn sprites must follow the contained sprite system: http://forums.aurorastation.org/viewtopic.php?f=23&t=6798 +*/ /obj/item/clothing/accessory/fluff/antique_pocket_watch //Antique Pocket Watch - Eric Derringer - xelnagahunter - Done name = "antique pocket watch" @@ -23,7 +26,7 @@ /obj/item/clothing/head/soft/sec/corp/fluff/mendoza_cap //Mendoza's cap - Chance Mendoza - loow - DONE - name = "Mendoza's corporate security cap" + name = "well-worn corporate security cap" desc = "A baseball hat in corporate colors.'C. Mendoza' is embroidered in fine print on the bill. On the underside of the cap, in dark ink, the phrase 'Gamble till you're Lucky!' is written in loopy cursive handwriting." @@ -339,7 +342,7 @@ /obj/item/weapon/fluff/moon_baton //Tiger Claw - Zander Moon - omnivac - DONE name = "tiger claw" - desc = "A small energy dagger given to Golden Tigers." + desc = "A small cerimonial energy dagger given to Golden Tigers." icon = 'icons/obj/custom_items/moon_baton.dmi' icon_state = "tigerclaw" item_state = "tigerclaw" @@ -364,7 +367,7 @@ icon_state = initial(icon_state) item_state = icon_state slot_flags = initial(slot_flags) - attack_verb = list() + attack_verb = list("prodded") user.regenerate_icons() @@ -438,7 +441,7 @@ icon_state = "kir_bandanna" item_state = "kir_bandanna" contained_sprite = 1 - + /obj/item/clothing/suit/storage/toggle/bomber/fluff/ash_jacket //Hand-me-down Bomber Jacket - superballs - Ash LaCroix - DONE name = "hand-me-down bomber jacket" @@ -488,8 +491,8 @@ icon_state = "stone_ring" item_state = "stone_ring" contained_sprite = 1 - - + + /obj/item/clothing/under/dress/fluff/sayyidah_dress //Traditional Jumper Dress - Sayyidah Al-Kateb - alberyk - DONE name = "traditional jumper dress" desc = "A light summer-time dress, decorated neatly with black and silver colors, it seems to be rather old." @@ -497,3 +500,57 @@ icon_state = "sayyidah_dress" item_state = "sayyidah_dress" contained_sprite = 1 + + +/obj/item/clothing/suit/storage/fluff/vittorio_jacket //Atlas Overcoat - Vittorio Giurifiglio - tytostyris - DONE + name = "atlas overcoat" + desc = "A classy black militaristic uniform, which is adorned with a sash and an eagle." + icon = 'icons/obj/custom_items/vittorio_jacket.dmi' + icon_state = "vittorio_jacket" + item_state = "vittorio_jacket" + contained_sprite = 1 + + +/obj/item/clothing/suit/storage/toggle/labcoat/fluff/helmut_labcoat //CERN Labcoat - Helmut Kronigernischultz - pyrociraptor - DONE + name = "CERN labcoat" + desc = "A Labcoat with a blue pocket and blue collar. On the pocket, you can read 'C.E.R.N.'" + icon = 'icons/obj/custom_items/helmut_labcoat.dmi' + icon_state = "helmut_labcoat" + item_state = "helmut_labcoat" + icon_open = "helmut_labcoat_open" + icon_closed = "helmut_labcoat" + contained_sprite = 1 + + +/obj/item/clothing/shoes/jackboots/unathi/fluff/yinzr_sandals //Marching Sandals - Sslazhir Yinzr - alberyk - DONE + name = "marching sandals" + desc = "A pair of sturdy marching sandals made of layers of leather and with a reinforced sole, they are also rather big." + icon = 'icons/obj/custom_items/yinzr_sandals.dmi' + item_state = "yinzr_sandals" + icon_state = "yinzr_sandals" + contained_sprite = 1 + + +/obj/item/clothing/accessory/fluff/laikov_broach //Jeweled Broach - Aji'Rah Laikov - nebulaflare - DONE + name = "jeweled broach" + desc = "A jeweled broach, inlaid with semi-precious gems. The clasp appears to have been replaced." + icon = 'icons/obj/custom_items/laikov_broach.dmi' + item_state = "laikov_broach" + icon_state = "laikov_broach" + contained_sprite = 1 + +/obj/item/clothing/accessory/fluff/laikov_broach/attack_self(mob/user as mob) + if(isliving(user)) + user.visible_message("[user] displays their [src.name]. It glitters in many colors.") + +/obj/item/clothing/accessory/fluff/laikov_broach/attack(mob/living/carbon/human/M, mob/living/user) + if(isliving(user)) + user.visible_message("[user] thrust the [src.name] into [M]'s face.") + + +/obj/item/weapon/fluff/akela_photo // Akela's Family Photo - Akela Ha'kim - moltenkore - DONE + name = "family photo" + desc = "You see on the photo a tajaran couple holding a small kit in their arms, while looking very happy. On the back it is written; 'Nasir, Akela and Ishka' with a little gold mark that reads: 'Two months'." + icon = 'icons/obj/custom_items/akela_photo.dmi' + icon_state = "akela_photo" + w_class = 2 diff --git a/icons/obj/custom_items/akela_photo.dmi b/icons/obj/custom_items/akela_photo.dmi new file mode 100644 index 00000000000..3985c92f4be Binary files /dev/null and b/icons/obj/custom_items/akela_photo.dmi differ diff --git a/icons/obj/custom_items/helmut_labcoat.dmi b/icons/obj/custom_items/helmut_labcoat.dmi new file mode 100644 index 00000000000..dd24c221679 Binary files /dev/null and b/icons/obj/custom_items/helmut_labcoat.dmi differ diff --git a/icons/obj/custom_items/laikov_broach.dmi b/icons/obj/custom_items/laikov_broach.dmi new file mode 100644 index 00000000000..346c388b992 Binary files /dev/null and b/icons/obj/custom_items/laikov_broach.dmi differ diff --git a/icons/obj/custom_items/sayyidah_dress.dmi b/icons/obj/custom_items/sayyidah_dress.dmi index 4e99764acd2..dd133411133 100644 Binary files a/icons/obj/custom_items/sayyidah_dress.dmi and b/icons/obj/custom_items/sayyidah_dress.dmi differ diff --git a/icons/obj/custom_items/vittorio_jacket.dmi b/icons/obj/custom_items/vittorio_jacket.dmi new file mode 100644 index 00000000000..02ddc9055f6 Binary files /dev/null and b/icons/obj/custom_items/vittorio_jacket.dmi differ diff --git a/icons/obj/custom_items/yinzr_sandals.dmi b/icons/obj/custom_items/yinzr_sandals.dmi new file mode 100644 index 00000000000..04cf3383a2b Binary files /dev/null and b/icons/obj/custom_items/yinzr_sandals.dmi differ