diff --git a/code/modules/cargo/random_stock/t1_common.dm b/code/modules/cargo/random_stock/t1_common.dm index 5412de53128..134bb7bfc79 100644 --- a/code/modules/cargo/random_stock/t1_common.dm +++ b/code/modules/cargo/random_stock/t1_common.dm @@ -242,6 +242,8 @@ STOCK_ITEM_COMMON(gloves, 3.3) exclusion += typesof(/obj/item/clothing/gloves/rig) exclusion += typesof(/obj/item/clothing/gloves/lightrig) exclusion += typesof(/obj/item/clothing/gloves/watch) + exclusion += typesof(/obj/item/clothing/gloves/fluff) + exclusion += typesof(/obj/item/clothing/gloves/yellow/fluff) allgloves -= exclusion for (var/i in 1 to rand(1, 5)) diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 0ef11577fd3..01955b4400a 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -288,7 +288,7 @@ All custom items with worn sprites must follow the contained sprite system: http force = 2 -/obj/item/clothing/suit/chaplain_hoodie/fluff/nioathi_hoodie //Shaman Hoodie - Fereydoun Nioathi - jackboot +/obj/item/clothing/suit/chaplain_hoodie/fluff/nioathi_hoodie //Shaman Hoodie - Fereydoun Nioathi - marlonphoenix name = "shaman hoodie" desc = "A slightly faded robe. It's worn by some Unathi shamans." icon = 'icons/obj/custom_items/nioathi_hoodie.dmi' @@ -630,7 +630,7 @@ All custom items with worn sprites must follow the contained sprite system: http contained_sprite = TRUE -/obj/item/sign/fluff/triaka_atimono //Framed Zatimono - Azkuyua Triaka - jackboot +/obj/item/sign/fluff/triaka_atimono //Framed Zatimono - Azkuyua Triaka - marlonphoenix name = "framed zatimono" desc = "A framed Zatimono, a Unathi standard worn into battle similar to an old-Earth Sashimono. This one is slightly faded." icon_state = "triaka_atimono" @@ -1031,7 +1031,7 @@ All custom items with worn sprites must follow the contained sprite system: http icon_state = "oz_plushie" -/obj/item/clothing/suit/storage/fluff/vizili_mantle //Maraziite Throw Over - Urzkrauzi Vizili - jackboot +/obj/item/clothing/suit/storage/fluff/vizili_mantle //Maraziite Throw Over - Urzkrauzi Vizili - marlonphoenix name = "maraziite throw over" desc = "A worn, grey poncho exclusively worn by members of the Maraziite Order." icon = 'icons/obj/custom_items/vizili_clothing.dmi' @@ -1039,7 +1039,7 @@ All custom items with worn sprites must follow the contained sprite system: http item_state = "vizili_mantle" contained_sprite = TRUE -/obj/item/clothing/mask/fluff/vizili_mask //Iron Mask - Urzkrauzi Vizili - jackboot +/obj/item/clothing/mask/fluff/vizili_mask //Iron Mask - Urzkrauzi Vizili - marlonphoenix name = "iron mask" desc = "A mask made of iron worn by members of the Maraziite Order. It can strike dread in the hearts of Unathi that don't toe the line of Sk'akh orthodoxy." icon = 'icons/obj/custom_items/vizili_clothing.dmi' @@ -1260,7 +1260,7 @@ All custom items with worn sprites must follow the contained sprite system: http contained_sprite = TRUE -/obj/item/clothing/under/rank/medical/fluff/jurlkiitajr_scrubs //IAC Scrubs - Rajii'rkalahk Jurlkiitajr - jackboot +/obj/item/clothing/under/rank/medical/fluff/jurlkiitajr_scrubs //IAC Scrubs - Rajii'rkalahk Jurlkiitajr - marlonphoenix name = "\improper IAA scrubs" desc = "A change of sterile medical scrubs worn by IAC workers. This one is specific for Tajara Aid workers." icon = 'icons/obj/custom_items/jurlkiitajr_items.dmi' @@ -1268,7 +1268,7 @@ All custom items with worn sprites must follow the contained sprite system: http item_state = "jurlkiitajr_scrubs" contained_sprite = TRUE -/obj/item/clothing/suit/apron/surgery/fluff/jurlkiitajr_vest //IAC Vest - Rajii'rkalahk Jurlkiitajr - jackboot +/obj/item/clothing/suit/apron/surgery/fluff/jurlkiitajr_vest //IAC Vest - Rajii'rkalahk Jurlkiitajr - marlonphoenix name = "\improper IAA vest" desc = "A vest designed to distinguish medical workers in the Interstellar Aid Corps." icon = 'icons/obj/custom_items/jurlkiitajr_items.dmi' @@ -1760,7 +1760,7 @@ All custom items with worn sprites must follow the contained sprite system: http contained_sprite = TRUE -/obj/item/weapon/paper/fluff/jawdat_paper //Manifesto of the PRA - Rrazujun Rrhazkal-Jawdat - jackboot +/obj/item/weapon/paper/fluff/jawdat_paper //Manifesto of the PRA - Rrazujun Rrhazkal-Jawdat - marlonphoenix name = "manifesto of the PRA" desc = "This is the manifesto of the People's Republic of Adhomai, written by many different Tajara thinkers in the 2430's. Depending on who you ask it is either an enlightening document that showcases the great \ intellectual and cultural genius of Tajara civilization, or a dense collection of gibberish commie nonsense." @@ -2892,4 +2892,67 @@ All custom items with worn sprites must follow the contained sprite system: http icon = 'icons/obj/custom_items/khasan_bucket.dmi' icon_state = "khasan_helmet" item_state = "khasan_helmet" - contained_sprite = TRUE \ No newline at end of file + contained_sprite = TRUE + + +/obj/item/fluff/akinyi_symphette //Holo-symphette - Akinyi Idowu - kyres1 + name = "holo-symphette" + desc = "A cheap, collapsible musical instrument which utilizes holographic projections to generate a rough noise. It's shaped like a small harp, and seems to be \ + able to be tuned to mimic several old stringed Solarian instruments with some distorted audio. It's still got its price tag sticker on it." + icon = 'icons/obj/custom_items/akinyi_symphette.dmi' + icon_state = "akinyi_symphette" + item_state = "akinyi_symphette" + w_class = 3 + slot_flags = SLOT_BACK + contained_sprite = TRUE + var/deployed = FALSE + +/obj/item/fluff/akinyi_symphette/update_icon() + if(deployed) + icon_state = "akinyi_symphette_on" + item_state = "akinyi_symphette_on" + else + icon_state = "akinyi_symphette" + item_state = "akinyi_symphette" + +/obj/item/fluff/akinyi_symphette/attack_self(var/mob/user) + deployed = !deployed + to_chat(user, "You [deployed ? "expand" : "collapse"] \the [src].") + update_icon() + user.update_inv_l_hand() + user.update_inv_r_hand() + +/obj/item/weapon/reagent_containers/food/drinks/teapot/fluff/thea_teapot //Bronze Teapot - Thea Reeves - shestrying + name = "bronze teapot" + desc = "A round-bottomed, well-used teapot. It looks as though it's been carefully maintained." + icon = 'icons/obj/custom_items/thea_tea.dmi' + icon_state = "thea_teapot" + center_of_mass = list("x"=16, "y"=13) + +/obj/item/weapon/reagent_containers/food/drinks/fluff/thea_teacup //Bonze Teacup - Thea Reeves - shestrying + name = "bronze teacup" + desc = "A shallow, bronze teacup. Looks heavy." + icon = 'icons/obj/custom_items/thea_tea.dmi' + icon_state = "thea_teacup" + volume = 20 + center_of_mass = list("x"=16, "y"=12) + +/obj/item/weapon/storage/box/fluff/thea_teabox //Tea Box - Thea Reeves - shestrying + desc = "A black, wooden box, the edges softened with transport and use." + icon = 'icons/obj/custom_items/thea_tea.dmi' + icon_state = "thea_teabox" + foldable = null + can_hold = list(/obj/item/weapon/reagent_containers/food/drinks/teapot/fluff/thea_teapot, /obj/item/weapon/reagent_containers/food/drinks/fluff/thea_teacup) + +/obj/item/weapon/storage/box/fluff/thea_teabox/fill() + new /obj/item/weapon/reagent_containers/food/drinks/teapot/fluff/thea_teapot(src) + for(var/i in 1 to 4) + new /obj/item/weapon/reagent_containers/food/drinks/fluff/thea_teacup(src) + make_exact_fit() + +/obj/item/fluff/fraseq_journal //Fraseq's Journal of Mysteries - Quorrdash Fraseq - kingoftheping + name = "leather journal" + desc = "An old, worn out journal made out of leather. It has a lot of lose pages stuck in it, it surely has seen better days. The front just says \"Fraseq\"." + icon = 'icons/obj/custom_items/fraseq_journal.dmi' + icon_state = "fraseq_journal" + w_class = 3 diff --git a/icons/obj/custom_items/akinyi_symphette.dmi b/icons/obj/custom_items/akinyi_symphette.dmi new file mode 100644 index 00000000000..ae46c189a08 Binary files /dev/null and b/icons/obj/custom_items/akinyi_symphette.dmi differ diff --git a/icons/obj/custom_items/fraseq_journal.dmi b/icons/obj/custom_items/fraseq_journal.dmi new file mode 100644 index 00000000000..d69ffc13bd5 Binary files /dev/null and b/icons/obj/custom_items/fraseq_journal.dmi differ diff --git a/icons/obj/custom_items/thea_tea.dmi b/icons/obj/custom_items/thea_tea.dmi new file mode 100644 index 00000000000..98488a96a16 Binary files /dev/null and b/icons/obj/custom_items/thea_tea.dmi differ