Furranium fixes.

This commit is contained in:
Fermi
2019-08-01 03:38:06 +01:00
parent a9330b784a
commit 18b03f9053
6 changed files with 34 additions and 8 deletions
@@ -171,6 +171,8 @@ SLIME SCANNER
var/obj/item/organ/tongue/T = M.getorganslot("tongue")
if(!T || T.damage > 40)
msg += "\t<span class='danger'>Subject is suffering from severe burn tissue on their tongue.</span>\n" //i.e. their tongue is shot
if(T.name == "fluffy tongue")
msg += "\t<span class='danger'>Subject is suffering from a fluffified tongue. Suggested cure: Yamerol or a tongue transplant.</span>\n"
var/obj/item/organ/lungs/Lung = M.getorganslot("lungs")
if(L)
if(Lung.damage > 150)
@@ -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)
@@ -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
-2
View File
@@ -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
@@ -171,15 +171,15 @@
T.Remove(M)
nT.Insert(M)
T.moveToNullspace()//To valhalla
to_chat(M, "<span class='notice'>Youw tongue feews... weally fwuffy!!</span>")
to_chat(M, "<span class='notice'>Your tongue feels... weally fwuffy!!</span>")
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.
@@ -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, "<span class='notice'>You feel your tongue.... unfluffify...?</span>")
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