From b87c29d78bad6f68e28c3a0cc26fe2860ff8c35d Mon Sep 17 00:00:00 2001 From: MortoSasye <38175176+MortoSasye@users.noreply.github.com> Date: Thu, 13 Jun 2024 00:11:54 -0300 Subject: [PATCH] Hearthkin's Lung Transfiguration Ritual + Anointing Bloodresin Changes (#2925) * hearthkin-lung-magic-wooo * Update modular_nova/modules/icemoon_additions/code/icecat_recipes.dm Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> * Update modular_nova/modules/icemoon_additions/code/icecat_recipes.dm Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> * Update modular_nova/modules/icemoon_additions/code/icecat_recipes.dm Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> * Update modular_nova/modules/icemoon_additions/code/icecat_recipes.dm Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> * Update modular_nova/modules/icemoon_additions/code/icecat_recipes.dm Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> --------- Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> --- .../icemoon_additions/code/icecat_recipes.dm | 52 +++++++++++++++++- .../modules/primitive_catgirls/code/organs.dm | 2 + .../primitive_catgirls/code/spawner.dm | 1 + .../primitive_catgirls/icons/objects.dmi | Bin 0 -> 2344 bytes .../primitive_catgirls/icons/organs.dmi | Bin 0 -> 719 bytes 5 files changed, 52 insertions(+), 3 deletions(-) create mode 100644 modular_nova/modules/primitive_catgirls/icons/objects.dmi create mode 100644 modular_nova/modules/primitive_catgirls/icons/organs.dmi diff --git a/modular_nova/modules/icemoon_additions/code/icecat_recipes.dm b/modular_nova/modules/icemoon_additions/code/icecat_recipes.dm index cf7811ffd44..6dd65abef5c 100644 --- a/modular_nova/modules/icemoon_additions/code/icecat_recipes.dm +++ b/modular_nova/modules/icemoon_additions/code/icecat_recipes.dm @@ -1,8 +1,8 @@ /obj/item/anointing_oil name = "anointing bloodresin" desc = "And so Helgar Knife-Arm spoke to the Hearth, and decreed that all of the Kin who gave name to beasts would do so with conquest and blood." - icon = 'icons/obj/medical/chemical.dmi' - icon_state = "potred" + icon = 'modular_nova/modules/primitive_catgirls/icons/objects.dmi' + icon_state = "anointingbloodresin" throwforce = 0 w_class = WEIGHT_CLASS_TINY @@ -58,7 +58,7 @@ crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_MUST_BE_LEARNED reqs = list( - /datum/reagent/consumable/liquidgibs = 80, + /datum/reagent/consumable/liquidgibs = 20, /datum/reagent/blood = 20, ) @@ -142,3 +142,49 @@ ) result = /obj/structure/bed/double/pelt/black + +// Hearthkin exclusive object to make their special lungs. +/obj/item/frozen_breath + name = "Frozen Breath" + desc = "A strange brew, it smells minty and is extremely cold to the touch. It is rumored that a cold-hearted witch managed to make this, to mend the breath of her kindred." + icon = 'modular_nova/modules/primitive_catgirls/icons/objects.dmi' + icon_state = "frozenbreath" + throwforce = 0 + w_class = WEIGHT_CLASS_TINY + +/obj/item/frozen_breath/afterattack(atom/target, mob/living/carbon/user) + if (!is_species(user, /datum/species/human/felinid/primitive)) + to_chat(user, span_warning("You have no idea how to use this freezing concoction.")) + return + + if(istype(target, /obj/item/organ/internal/lungs)) + var/obj/item/organ/internal/lungs/target_lungs = target + if(IS_ROBOTIC_ORGAN(target_lungs)) + target.balloon_alert(user, "The lungs have to be organic!") + return + var/location = get_turf(target_lungs) + playsound(location, 'sound/effects/slosh.ogg', 25, TRUE) + user.visible_message(span_notice("[user] pours a strange blue liquid over the set of lungs. The flesh starts glistening in a strange cyan light, transforming before your very eyes!"), + span_notice("Recalling the instructions for the lung transfiguration ritual, you pour the liquid over the flesh of the organ. Soon, the lungs glow in a mute cyan light, before they turn dim and change form before your very eyes!")) + var/obj/item/organ/internal/lungs/icebox_adapted/new_lungs = new(location) + new_lungs.damage = target_lungs.damage + qdel(target_lungs) + qdel(src) + +/obj/item/frozen_breath/examine(mob/user) + . = ..() + if(is_species(user, /datum/species/human/felinid/primitive)) + . += span_info("Using this on a pair of organic lungs transforms them into hardy lungs. This will remove any other special features from the old lungs, if there were any.") + +/datum/crafting_recipe/frozen_breath + name = "Frozen Breath" + category = CAT_MISC + //recipe given to icecats as part of their spawner/team setting + crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_MUST_BE_LEARNED + + reqs = list( + /datum/reagent/consumable/frostoil = 50, + /datum/reagent/medicine/c2/synthflesh = 50, + ) + + result = /obj/item/frozen_breath diff --git a/modular_nova/modules/primitive_catgirls/code/organs.dm b/modular_nova/modules/primitive_catgirls/code/organs.dm index a50c9b67700..94e8acd121d 100644 --- a/modular_nova/modules/primitive_catgirls/code/organs.dm +++ b/modular_nova/modules/primitive_catgirls/code/organs.dm @@ -5,6 +5,8 @@ /obj/item/organ/internal/lungs/icebox_adapted name = "hardy lungs" desc = "Lungs adapted to frozen environments that would be otherwise inhospitable to most races. Feels cold." + icon_state = "hardylungs" + icon = 'modular_nova/modules/primitive_catgirls/icons/organs.dmi' /obj/item/organ/internal/lungs/icebox_adapted/Initialize(mapload) . = ..() diff --git a/modular_nova/modules/primitive_catgirls/code/spawner.dm b/modular_nova/modules/primitive_catgirls/code/spawner.dm index dbdcdc59ba7..6fc05687489 100644 --- a/modular_nova/modules/primitive_catgirls/code/spawner.dm +++ b/modular_nova/modules/primitive_catgirls/code/spawner.dm @@ -294,6 +294,7 @@ /datum/crafting_recipe/handcrafted_hearthkin_armor, /datum/crafting_recipe/black_pelt_bed, /datum/crafting_recipe/white_pelt_bed, + /datum/crafting_recipe/frozen_breath, ) /datum/antagonist/primitive_catgirl/Destroy() diff --git a/modular_nova/modules/primitive_catgirls/icons/objects.dmi b/modular_nova/modules/primitive_catgirls/icons/objects.dmi new file mode 100644 index 0000000000000000000000000000000000000000..d0602e47f696d7dfda423b7f507c7e61a6da6b1d GIT binary patch literal 2344 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 BNap|m literal 0 HcmV?d00001