diff --git a/code/modules/mob/living/blood.dm b/code/modules/mob/living/blood.dm index bb7e38f91d..e6dc89d47d 100644 --- a/code/modules/mob/living/blood.dm +++ b/code/modules/mob/living/blood.dm @@ -164,7 +164,7 @@ return /mob/living/carbon/get_blood_data(blood_id) - if(blood_id == "blood") //actual blood reagent + if(blood_id == "blood") //actual blood reagent var/blood_data = list() //set the blood data blood_data["donor"] = src @@ -207,6 +207,21 @@ if(istype(ling)) blood_data["changeling_loudness"] = ling.loudfactor return blood_data + if(blood_id == "slimejelly") + var/blood_data = list() + if(mind) + blood_data["mind"] = mind + else if(last_mind) + blood_data["mind"] = last_mind + if(ckey) + blood_data["ckey"] = ckey + else if(last_mind) + blood_data["ckey"] = ckey(last_mind.key) + blood_data["gender"] = gender + blood_data["real_name"] = real_name + return blood_data + + //get the id of the substance this mob use as blood. /mob/proc/get_blood_id() 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 2cf8603595..b050d461a3 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm @@ -1440,9 +1440,9 @@ Creating a chem with a low purity will make you permanently fall in love with so //I'm concerned this is too weak, but I also don't want deathmixes. /datum/reagent/fermi/fermiTox/on_mob_life(mob/living/carbon/C, method) if(C.dna && istype(C.dna.species, /datum/species/jelly)) - C.adjustToxLoss(-2.5) + C.adjustToxLoss(-2) else - C.adjustToxLoss(2.5) + C.adjustToxLoss(2) ..() /datum/reagent/fermi/fermiABuffer diff --git a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm index 3ad833f5e4..3d3017f847 100644 --- a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm +++ b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm @@ -148,7 +148,7 @@ CurveSharpT = 2 CurveSharppH = 2 ThermicConstant = 1 - HIonRelease = 0.1 + HIonRelease = -0.1 RateUpLim = 5 FermiChem = TRUE FermiExplode = TRUE @@ -180,7 +180,7 @@ CurveSharpT = 2 CurveSharppH = 2 ThermicConstant = 1 - HIonRelease = -0.1 + HIonRelease = 0.1 RateUpLim = 5 FermiChem = TRUE FermiExplode = TRUE @@ -236,15 +236,13 @@ //CatalystFact = 0 CurveSharpT = 0.5 CurveSharppH = 4 - ThermicConstant = 15 + ThermicConstant = 20 HIonRelease = 0.1 RateUpLim = 1 FermiChem = TRUE FermiExplode = TRUE PurityMin = 0.2 - - /datum/chemical_reaction/fermi/enthrall/FermiFinish(datum/reagents/holder, var/atom/my_atom) var/datum/reagent/blood/B = locate(/datum/reagent/blood) in my_atom.reagents.reagent_list var/datum/reagent/fermi/enthrall/E = locate(/datum/reagent/fermi/enthrall) in my_atom.reagents.reagent_list @@ -264,6 +262,29 @@ E.data.["creatorID"] = B.data.["ckey"] E.creatorID = B.data.["ckey"] +//So slimes can play too. +/datum/chemical_reaction/fermi/enthrall/slime + required_catalysts = list("slimejelly" = 1) + +/datum/chemical_reaction/fermi/enthrall/slime/FermiFinish(datum/reagents/holder, var/atom/my_atom) + var/datum/reagent/toxin/slimejelly/B = locate(/datum/reagent/toxin/slimejelly) in my_atom.reagents.reagent_list + var/datum/reagent/fermi/enthrall/E = locate(/datum/reagent/fermi/enthrall) in my_atom.reagents.reagent_list + if(!B.data) + var/list/seen = viewers(5, get_turf(my_atom)) + for(var/mob/M in seen) + to_chat(M, "The reaction splutters and fails to react.") //if this appears, WHAT?! + E.purity = 0 + if (B.data.["gender"] == "female") + E.data.["creatorGender"] = "Mistress" + E.creatorGender = "Mistress" + else + E.data.["creatorGender"] = "Master" + E.creatorGender = "Master" + E.data["creatorName"] = B.data.["real_name"] + E.creatorName = B.data.["real_name"] + E.data.["creatorID"] = B.data.["ckey"] + E.creatorID = B.data.["ckey"] + /datum/chemical_reaction/fermi/enthrall/FermiExplode(datum/reagents, var/atom/my_atom, volume, temp, pH) var/turf/T = get_turf(my_atom) var/datum/reagents/R = new/datum/reagents(1000) @@ -404,7 +425,7 @@ var/datum/reagent/fermi/fermiBBuffer/Fb = locate(/datum/reagent/fermi/fermiBBuffer) in my_atom.reagents.reagent_list Fb.data = 11 -//secretcatchemcode, shh!! Of couse I hide it amongst cats. Also, yes, I expect you, Mr.Maintaner to read and review this, dispite it being hidden and not mentioned in the changelogs. +//secretcatchemcode, shh!! Of couse I hide it amongst cats. Though, I moved it with your requests. //I'm not trying to be sneaky, I'm trying to keep it a secret! //I don't know how to do hidden chems like Aurora //ChemReactionVars: