+Yamerol, tweaked PE, tweaked CM3000, tweaked medpH.

This commit is contained in:
Fermi
2019-07-02 22:15:32 +01:00
parent d83fe49556
commit 946fbff999
12 changed files with 142 additions and 27 deletions
@@ -325,7 +325,7 @@ Creating a chem with a low purity will make you permanently fall in love with so
if(!love)
return
M.apply_status_effect(STATUS_EFFECT_INLOVE, love)
to_chat(M, "[(M.lewd?"<span class='love'>":"<span class='warning'>")][(M.lewd?"You develop a sudden crush on [love], your heart beginning to race as you look upon them with new eyes.":"You suddenly feel like making friends with [love].")] You are determined to make friends with them and feel drawn towards them.</span>")
to_chat(M, "[(M.lewd?"<span class='love'>":"<span class='warning'>")][(M.lewd?"You develop a sudden crush on [love], your heart beginning to race as you look upon them with new eyes.":"You suddenly feel like making friends with [love].")] You feel strangely drawn towards them.</span>")
log_game("FERMICHEM: [M] ckey: [M.key] has temporarily bonded with [love] ckey: [love.key]")
SSblackbox.record_feedback("tally", "fermi_chem", 1, "Times people have bonded")
else
@@ -340,10 +340,10 @@
/datum/reagent/fermi/acidic_buffer
name = "Acidic buffer"
id = "acidic_buffer"
description = "This reagent will consume itself and move the pH of a beaker towards 3 when added to another."
description = "This reagent will consume itself and move the pH of a beaker towards acidity when added to another."
taste_description = "an acidy sort of taste, blech."
color = "#fbc314"
pH = 3
pH = 0
//Consumes self on addition and shifts pH
/datum/reagent/fermi/acidic_buffer/on_new(datapH)
@@ -361,10 +361,10 @@
/datum/reagent/fermi/basic_buffer
name = "Basic buffer"
id = "basic_buffer"
description = "This reagent will consume itself and move the pH of a beaker towards 11 when added to another."
description = "This reagent will consume itself and move the pH of a beaker towards alkalinity when added to another."
taste_description = "an soapy sort of taste, blech."
color = "#3853a4"
pH = 11
pH = 14
/datum/reagent/fermi/basic_buffer/on_new(datapH)
data = datapH
@@ -0,0 +1,88 @@
/datum/reagent/fermi/yamerol
name = "Yamerol"
id = "yamerol"
description = "For when you've trouble speaking or breathing, just yell YAMEROL! A chem that helps soothe any congestion problems and at high concentrations restores damaged lungs and tongues!"
taste_description = "a weird, syrupy flavour, yamero"
color = "#68e83a"
pH = 8.6
overdose_threshold = 35
ImpureChem = "yamerol_tox" //If you make an inpure chem, it stalls growth
InverseChemVal = 0.3
InverseChem = "yamerol_tox" //At really impure vols, it just becomes 100% inverse
/datum/reagent/fermi/yamerol/on_mob_life(mob/living/carbon/C)
var/obj/item/organ/tongue/T = C.getorganslot(ORGAN_SLOT_TONGUE)
var/obj/item/organ/lungs/L = C.getorganslot(ORGAN_SLOT_LUNGS)
message_admins("Yamero!")
if(T)
T.adjustTongueLoss(C, -2)
message_admins("Yamero tongue!")
if(L)
message_admins("Yamero lungs!")
L.adjustLungLoss(-5, C)
C.adjustOxyLoss(-2)
else
message_admins("Yamero no lungs!")
C.adjustOxyLoss(-10)
..()
/datum/reagent/fermi/yamerol/overdose_process(mob/living/carbon/C)
var/obj/item/organ/tongue/oT = C.getorganslot(ORGAN_SLOT_TONGUE)
if(current_cycle > 10)
if(!C.getorganslot(ORGAN_SLOT_TONGUE))
var/obj/item/organ/tongue/T
if(C.dna && C.dna.species && C.dna.species.mutanttongue)
T = new C.dna.species.mutanttongue()
else
T = new()
T.Insert(C)
to_chat(M, "<span class='notice'>You feel your tongue reform in your mouth.</span>")
holder.remove_reagent(src.id, "10")
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
T = new()
oT.Remove(C)
qdel(oT)
T.Insert(C)
to_chat(M, "<span class='notice'>You feel your tongue.... unfluffify...?</span>")
holder.remove_reagent(src.id, "10")
if(!C.getorganslot(ORGAN_SLOT_LUNGS))
var/obj/item/organ/lungs/L = new()
L.Insert(C)
to_chat(M, "<span class='notice'>You feel your lungs reform in your chest.</span>")
holder.remove_reagent(src.id, "10")
..()
/datum/reagent/fermi/yamerol_tox
name = "Yamerol"
id = "yamerol_tox"
description = "For when you've trouble speaking or breathing, just yell YAMEROL! A chem that helps soothe any congestion problems and at high concentrations restores damaged lungs and tongues!"
taste_description = "a weird, syrupy flavour, yamero"
color = "#68e83a"
pH = 8.6
/datum/reagent/fermi/yamerol_tox/on_mob_life(mob/living/carbon/C)
var/obj/item/organ/tongue/T = C.getorganslot(ORGAN_SLOT_TONGUE)
var/obj/item/organ/lungs/L = C.getorganslot(ORGAN_SLOT_LUNGS)
message_admins("Yameroe!")
if(T)
message_admins("Yamero tongue!")
T.adjustTongueLoss(C, 2)
if(L)
message_admins("Yameroe lungs!")
L.adjustLungLoss(5, C)
C.adjustOxyLoss(2)
else
message_admins("Yameroe no lungs!")
C.adjustOxyLoss(10)
..()
@@ -6,7 +6,7 @@
return
//Called when reaction STOP_PROCESSING
/datum/chemical_reaction/fermi/proc/FermiFinish(datum/reagents/holder, multipler)
/datum/chemical_reaction/fermi/proc/FermiFinish(datum/reagents/holder)
return
//Called when temperature is above a certain threshold, or if purity is too low.
@@ -418,19 +418,19 @@
if(!locate(/datum/reagent/fermi/acidic_buffer) in my_atom.reagents.reagent_list)
return
var/datum/reagent/fermi/acidic_buffer/Fa = locate(/datum/reagent/fermi/acidic_buffer) in my_atom.reagents.reagent_list
Fa.data = 3
Fa.data = 0
/datum/chemical_reaction/fermi/basic_buffer//done test
name = "Ethyl Ethanoate buffer"
id = "basic_buffer"
results = list("basic_buffer" = 1.5)
required_reagents = list("acidic_buffer" = 0.5, "ethanol" = 0.5, "salglu_solution" = 0.1, "water" = 0.5)
required_reagents = list("acidic_buffer" = 0.5, "ethanol" = 0.5, , "water" = 0.5)
required_catalysts = list("sacid" = 1) //vagely acetic
//FermiChem vars:
OptimalTempMin = 250
OptimalTempMax = 500
ExplodeTemp = 9999 //check to see overflow doesn't happen!
OptimalpHMin = 8
OptimalpHMin = 6
OptimalpHMax = 12
ReactpHLim = 0
//CatalystFact = 0 //To do 1
@@ -446,7 +446,7 @@
if(!locate(/datum/reagent/fermi/basic_buffer) in my_atom.reagents.reagent_list)
return
var/datum/reagent/fermi/basic_buffer/Fb = locate(/datum/reagent/fermi/basic_buffer) in my_atom.reagents.reagent_list
Fb.data = 11
Fb.data = 14
//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!
@@ -504,3 +504,23 @@
catto.desc = "A cute chem cat, created by a lot of compicated and confusing chemistry!"
catto.color = "#770000"
my_atom.reagents.remove_any(10)
/datum/chemical_reaction/fermi/yamerol//done test
name = "Yamerol"
id = "yamerol"
results = list("yamerol" = 1.5)
required_reagents = list("perfluorodecalin" = 0.5, "furranium" = 0.5, "water" = 0.5)
//FermiChem vars:
OptimalTempMin = 300
OptimalTempMax = 500
ExplodeTemp = 800 //check to see overflow doesn't happen!
OptimalpHMin = 6.8
OptimalpHMax = 7.2
ReactpHLim = 4
//CatalystFact = 0 //To do 1
CurveSharpT = 5
CurveSharppH = 0.5
ThermicConstant = -15
HIonRelease = 0.1
RateUpLim = 2
FermiChem = TRUE