From 228014a989599b1fc51212e2afbf80a747680b10 Mon Sep 17 00:00:00 2001 From: Iajret Creature <122297233+Steals-The-PRs@users.noreply.github.com> Date: Thu, 7 Dec 2023 20:44:29 +0300 Subject: [PATCH] [MODULAR] Grants Hearthkin Transcendent Olfaction (& One Other Thing)(#1022) * initial d * wew * Apply suggestions from code review * Maybe this will fix it? * Revert "Maybe this will fix it?" This reverts commit b75cca9d4d33634e1d899c3bc5fdabbd288b00a8. * Test CI * Update species.dm * Testing to see if this fixes it * Let's test this too. * Update species.dm * Update dna.dm * Update dna.dm * Update body.dm * Revert "Update body.dm" This reverts commit a213fc7c6091e626ebd870c8432db6f54cf1a6e6. * Revert "Update dna.dm" This reverts commit f4af1a25ad40e9e6caae4541aa6564607f9f785a. * Revert "Update dna.dm" This reverts commit 385c1122e99200fd85ee732c85f534b8dbdbc9db. * Revert "Merge branch 'sniffsnoff' of https://github.com/Nerev4r/Skyrat-tg into pr/25067" This reverts commit 825f586201aa42417bfb95cf29151336e51793b6, reversing changes made to 385c1122e99200fd85ee732c85f534b8dbdbc9db. * Revert "Let's test this too." This reverts commit 55ecfa9b704c181ba1efb2ccb5cc8ae5014ebe6a. * Revert "Testing to see if this fixes it" This reverts commit f08e50c88f979284322a79c6c479195c7a1d47f6. * Update species.dm --------- Co-authored-by: Nerevar <12636964+Nerev4r@users.noreply.github.com> Co-authored-by: Snakebittenn <12636964+Snakebittenn@users.noreply.github.com> Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> Co-authored-by: Iajret --- .../code/clothing_vendor.dm | 1 + .../primitive_catgirls/code/species.dm | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/modular_skyrat/modules/primitive_catgirls/code/clothing_vendor.dm b/modular_skyrat/modules/primitive_catgirls/code/clothing_vendor.dm index 17a9f81d3ce..1a1d75bc6d6 100644 --- a/modular_skyrat/modules/primitive_catgirls/code/clothing_vendor.dm +++ b/modular_skyrat/modules/primitive_catgirls/code/clothing_vendor.dm @@ -25,6 +25,7 @@ /obj/item/clothing/neck/ranger_poncho/primitive_catgirl_leather = 5, /obj/item/clothing/glasses/eyepatch/wrap = 5, /obj/item/clothing/head/pelt/snow_tiger = 5, + /obj/item/clothing/head/pelt = 5, /obj/item/clothing/head/pelt/black = 5, /obj/item/clothing/head/pelt/white = 5, /obj/item/clothing/head/pelt/wolf = 5, diff --git a/modular_skyrat/modules/primitive_catgirls/code/species.dm b/modular_skyrat/modules/primitive_catgirls/code/species.dm index 586c7b22900..2a40acb58d2 100644 --- a/modular_skyrat/modules/primitive_catgirls/code/species.dm +++ b/modular_skyrat/modules/primitive_catgirls/code/species.dm @@ -35,6 +35,26 @@ always_customizable = TRUE +/datum/species/human/felinid/primitive/on_species_gain(mob/living/carbon/new_primitive, datum/species/old_species, pref_load) + . = ..() + var/mob/living/carbon/human/hearthkin = new_primitive + if(!istype(hearthkin)) + return + hearthkin.dna.add_mutation(/datum/mutation/human/olfaction, MUT_NORMAL) + hearthkin.dna.activate_mutation(/datum/mutation/human/olfaction) + + // >mfw I take mutadone and my nose clogs + var/datum/mutation/human/olfaction/mutation = locate() in hearthkin.dna.mutations + mutation.mutadone_proof = TRUE + mutation.instability = 0 + +/datum/species/human/felinid/primitive/on_species_loss(mob/living/carbon/former_primitive, datum/species/new_species, pref_load) + . = ..() + var/mob/living/carbon/human/hearthkin = former_primitive + if(!istype(hearthkin)) + return + hearthkin.dna.remove_mutation(/datum/mutation/human/olfaction) + /datum/species/human/felinid/primitive/prepare_human_for_preview(mob/living/carbon/human/human_for_preview) human_for_preview.hairstyle = "Blunt Bangs Alt" human_for_preview.hair_color = "#323442"