From 18b03f90536749d3ee7422aec0ad01c1d64519a1 Mon Sep 17 00:00:00 2001 From: Fermi Date: Thu, 1 Aug 2019 03:38:06 +0100 Subject: [PATCH] Furranium fixes. --- code/game/objects/items/devices/scanners.dm | 2 ++ code/modules/mob/living/carbon/human/human.dm | 2 ++ code/modules/surgery/organs/organ_internal.dm | 11 +++++++++++ code/modules/surgery/organs/tongue.dm | 2 -- .../reagents/chemistry/reagents/fermi_reagents.dm | 11 ++++++----- .../modules/reagents/chemistry/reagents/healing.dm | 14 +++++++++++++- 6 files changed, 34 insertions(+), 8 deletions(-) diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 2585e9b1ee..925e14f7c9 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -171,6 +171,8 @@ SLIME SCANNER var/obj/item/organ/tongue/T = M.getorganslot("tongue") if(!T || T.damage > 40) msg += "\tSubject is suffering from severe burn tissue on their tongue.\n" //i.e. their tongue is shot + if(T.name == "fluffy tongue") + msg += "\tSubject is suffering from a fluffified tongue. Suggested cure: Yamerol or a tongue transplant.\n" var/obj/item/organ/lungs/Lung = M.getorganslot("lungs") if(L) if(Lung.damage > 150) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 67596a828a..85d6e0b85f 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -811,6 +811,8 @@ for(var/datum/mutation/human/HM in dna.mutations) if(HM.quality != POSITIVE) dna.remove_mutation(HM.name) + if(blood_volume < (BLOOD_VOLUME_NORMAL*blood_ratio)) + blood_volume = (BLOOD_VOLUME_NORMAL*blood_ratio) ..() /mob/living/carbon/human/check_weakness(obj/item/weapon, mob/living/attacker) diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm index b16967b6b0..9f910de9a9 100644 --- a/code/modules/surgery/organs/organ_internal.dm +++ b/code/modules/surgery/organs/organ_internal.dm @@ -153,6 +153,17 @@ // if they have no mutant tongues, give them a regular one T.Insert(src) + else + var/obj/item/organ/tongue/oT = getorganslot(ORGAN_SLOT_TONGUE) + if(oT.name == "fluffy tongue") + var/obj/item/organ/tongue/T + if(dna && dna.species && dna.species.mutanttongue) + T = new dna.species.mutanttongue() + else + T = new() + oT.Remove(src) + qdel(oT) + T.Insert(src) if(!getorganslot(ORGAN_SLOT_EYES)) var/obj/item/organ/eyes/E diff --git a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm index 549f0cc953..3eaaa8de92 100644 --- a/code/modules/surgery/organs/tongue.dm +++ b/code/modules/surgery/organs/tongue.dm @@ -253,8 +253,6 @@ message = replacetext(message, "ove", "uv") message = replacetext(message, "l", "w") message = replacetext(message, "r", "w") - if(prob(20)) - message += pick(" OwO", " uwu") message = lowertext(message) speech_args[SPEECH_MESSAGE] = message diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm index 68a6f7a479..914a2a09b1 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm @@ -171,15 +171,15 @@ T.Remove(M) nT.Insert(M) T.moveToNullspace()//To valhalla - to_chat(M, "Youw tongue feews... weally fwuffy!!") + to_chat(M, "Your tongue feels... weally fwuffy!!") if(17 to INFINITY) - if(prob(10)) + if(prob(5)) to_chat(M, "You find yourself unable to supress the desire to meow!") M.emote("nya") - if(prob(10)) + if(prob(5)) to_chat(M, "You find yourself unable to supress the desire to howl!") M.emote("awoo") - if(prob(20)) + if(prob(5)) var/list/seen = viewers(5, get_turf(M))//Sound and sight checkers for(var/victim in seen) if((istype(victim, /mob/living/simple_animal/pet/)) || (victim == M) || (!isliving(victim))) @@ -189,7 +189,7 @@ ..() /datum/reagent/fermi/furranium/on_mob_delete(mob/living/carbon/M) - if(purity < 0.9)//Only permanent if you're a good chemist. + if(purity < 1)//Only permanent if you're a good chemist. nT = M.getorganslot(ORGAN_SLOT_TONGUE) nT.Remove(M) qdel(nT) @@ -199,6 +199,7 @@ else log_game("FERMICHEM: [M] ckey: [M.key]'s tongue has been made permanent") + /////////////////////////////////////////////////////////////////////////////////////////////// //Nanite removal //Writen by Trilby!! Embellsished a little by me. diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm index 0c1707d5fb..fef1f9e013 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm @@ -22,6 +22,19 @@ C.adjustOxyLoss(-2) else C.adjustOxyLoss(-10) + + if(T) + if(T.name == "fluffy tongue") + var/obj/item/organ/tongue/nT + if(C.dna && C.dna.species && C.dna.species.mutanttongue) + nT = new C.dna.species.mutanttongue() + else + nT = new() + T.Remove(C) + qdel(T) + nT.Insert(C) + to_chat(C, "You feel your tongue.... unfluffify...?") + holder.remove_reagent(src.id, "10") ..() /datum/reagent/fermi/yamerol/overdose_process(mob/living/carbon/C) @@ -40,7 +53,6 @@ else if((oT.name == "fluffy tongue") && (purity == 1)) var/obj/item/organ/tongue/T - if(C.dna && C.dna.species && C.dna.species.mutanttongue) T = new C.dna.species.mutanttongue() else