diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 698729d9848..7162f03f371 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -333,6 +333,64 @@ icon_state = "comicoutlandish" item_state = "comicoutlandish" +/obj/item/toy/comic/azmarian + name = "az'marian comic" + desc = "A comic book series revolving around a superhero from Az'Mar, popular in the New Kingdom." + icon_state = "comicazmarian" + item_state = "comicazmarian" + +/obj/item/toy/comic/azmarian/issue_1 + desc_extended = "Issue 1 - The Az'Marian Landing! - In this issue, the would-be hero departs from Az'Mar and lands in a war-torn \ + town in the outskirts of the Kingdom, witnessing the townspeople terrorised by a Zhan'Khazan maniacal terrorist. After mutilating \ + his body with alien technology and even cutting off his own arms to replace with robotic equivalents, the cybernetically enhanced \ + Corporal Khara'zan will not let his reign of terror be stopped easily. Will the visitor from Az'mar manage to stand in his way and prevail?" + +/obj/item/toy/comic/azmarian/issue_2 + desc_extended = "Issue 2 - The Road Towards A Dark Future - In this issue, the Az'Marian meets the local nobility whom he had saved from \ + terror, learning that the Kingdom is threatened on all fronts. The superhero embarks on a journey through bandit-infested lands towards the \ + headquarters of evil, meeting an unlikely ally and his band of friends. However, all is not what it seems, and the superhero will soon face \ + a threat that once welcomed him with open arms. A treacherous plot, an ally destined by S'rendarr, and the darkness encroaching; the superhero \ + faces the modern threat of depraved Tajara." + +/obj/item/toy/comic/azmarian/issue_3 + desc_extended = "Issue 3 - The Swamp Debacle - In this issue, the Az'Marian and his loyal but dim-witted sidekick Murr'zhul reach a poisonous \ + swamp polluted by waste-producing factories. A chemical-obsessed scientist looks to experiment and find the perfect poison for his evil deeds, \ + killing the surrounding nature and turning residents sickly. A lumbering creature hiding in the swamp caves, a mad researcher about to find the \ + perfect toxin, and the duo seeking to halt his plans. Will they find a way to shut him down?" + +/obj/item/toy/comic/azmarian/issue_4 + desc_extended = "Issue 4 - The Den of Evil! - In this issue, the hero and his loyal but dim-witted sidekick Murr'zhul reach the stronghold of \ + the retreating Corporal Khara'zan. The superhero uncovers a sinister plot orchestrated by the Corporal's superior to turn all of the local living \ + beings into cyborgs. The leader, Director Shul'tyz, is not yet aware of the Az'Marian's presence, and the time is ripe. Met with a slumbering horde \ + of cybernetic ha'rrons, schlorrgos and even Tajara, the superhero encounters a threat that will truly test his mettle." + +/obj/item/toy/comic/azmarian/issue_5 + desc_extended = "Issue 5 - Path to Recovery - In this issue, the hero, who has faced a successful confrontation with Director Shul'tyz, managed to \ + free the local populace of cybernetic mind control, but at a heavy price. The syringe that was shot into him started coursing through his veins, preventing \ + him from using his powers in a rapidly degrading state. His loyal sidekick Murr'zhul helps bring the hero to the capital of the ancient Kingdom to seek aid. \ + Met with internal politics, a mixed reception, sinister plots and a meeting with the King, will the hero find a way to recover from the illness that plagues him?" + +/obj/item/toy/comic/azmarian/issue_6 + desc_extended = "Issue 6 - The Pilgrimage - Steppe Trouble! - In this issue, the hero and his loyal but dim-witted sidekick Murr'zhul embark on a journey \ + to a sacred shrine in the mountains built by the early Ancient Tajara. Having received a blessing to prevent his state from degrading from the local priests, \ + the hero has little time to waste before the blessing wanes. A meeting with wandering nomads, an audience with their ruler, and a perilous journey across \ + the steppes leads the Az'Marian to face many decisions and challenges as the reality of the nomads comes to light. Deprived of his powers, will he and his \ + trusted Hharar side-kick manage to reach the mountains?" + +/obj/item/toy/comic/azmarian/issue_7 + desc_extended = "Issue 7 - The Pilgrimage Pt. 2 - Mountain Survival - In this issue, the hero and his loyal but dim-witted sidekick Murr'zhul reach \ + the mountains that contain the ancient shrine of the Suns, where he would be able to recover from his illness caused by Director Shul'tyz. Trailed \ + by Sham'tyrs, facing freezing winds and snow, the two will trek to reach the shrine in hope of recovery. Bandits encampments, a village in need of help, \ + a chance encounter with the S'Mara, and a shape-shifting spy amongst the Sham'tyrs, will the heroes make their way in one piece?" + +/obj/item/toy/comic/azmarian/issue_8 + desc_extended = "Issue 8 - The Shrine - In this issue, the hero and his loyal but dim-witted sidekick Murr'zhul meet the Parivara at the ancient shrine. \ + Tended to by the Sun Sister with the blessing of Messa, the Az'Marian manages to recover from his affliction over the course of a week. He learns of an \ + evil plan staged by a group of Cae'rrin living in caves nearby to desecrate the shrine and eat its attendants, and the two embark on a journey to put a \ + stop to this plan. Already aware of the Az'Marian's presence from their spy, they begin to set up traps and occult rituals to prevent him from even reaching \ + the caves. Forces of Raskara, shape-shifting creatures, dastardly traps and true evil lurking within, the Az'Marian and his sidekick will have to use their \ + newly regained powers to their fullest." + // // Toy Crossbows // diff --git a/code/modules/client/preference_setup/loadout/loadout_general.dm b/code/modules/client/preference_setup/loadout/loadout_general.dm index 7ce0c86c667..a7147ad7783 100644 --- a/code/modules/client/preference_setup/loadout/loadout_general.dm +++ b/code/modules/client/preference_setup/loadout/loadout_general.dm @@ -315,6 +315,14 @@ comics["inspector 404 manga"] = /obj/item/toy/comic/inspector comics["stormman manga"] = /obj/item/toy/comic/stormman comics["outlandish tales magazine"] = /obj/item/toy/comic/outlandish_tales + comics["az'marian comic, issue 1"] = /obj/item/toy/comic/azmarian/issue_1 + comics["az'marian comic, issue 2"] = /obj/item/toy/comic/azmarian/issue_2 + comics["az'marian comic, issue 3"] = /obj/item/toy/comic/azmarian/issue_3 + comics["az'marian comic, issue 4"] = /obj/item/toy/comic/azmarian/issue_4 + comics["az'marian comic, issue 5"] = /obj/item/toy/comic/azmarian/issue_5 + comics["az'marian comic, issue 6"] = /obj/item/toy/comic/azmarian/issue_6 + comics["az'marian comic, issue 7"] = /obj/item/toy/comic/azmarian/issue_7 + comics["az'marian comic, issue 8"] = /obj/item/toy/comic/azmarian/issue_8 gear_tweaks += new /datum/gear_tweak/path(comics) /datum/gear/toothpaste diff --git a/html/changelogs/ramke - azmarian.yml b/html/changelogs/ramke - azmarian.yml new file mode 100644 index 00000000000..7bdb24dca25 --- /dev/null +++ b/html/changelogs/ramke - azmarian.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Ramke + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added a new Tajara comic available in loadout." diff --git a/icons/mob/items/lefthand_toy.dmi b/icons/mob/items/lefthand_toy.dmi index 58ccb446306..8d14d4bcd4b 100644 Binary files a/icons/mob/items/lefthand_toy.dmi and b/icons/mob/items/lefthand_toy.dmi differ diff --git a/icons/mob/items/righthand_toy.dmi b/icons/mob/items/righthand_toy.dmi index ccfcbc17d96..43d78331542 100644 Binary files a/icons/mob/items/righthand_toy.dmi and b/icons/mob/items/righthand_toy.dmi differ diff --git a/icons/obj/toy.dmi b/icons/obj/toy.dmi index 6e50993ac19..c5a1d6f0c5c 100644 Binary files a/icons/obj/toy.dmi and b/icons/obj/toy.dmi differ