From 977462387c81c89785a572eea9a666c8a64584dd Mon Sep 17 00:00:00 2001 From: Useroth Date: Tue, 16 Apr 2019 00:11:53 +0200 Subject: [PATCH] A couple of bugfixes. Also testing if I can even push to this repo. --- code/modules/reagents/chemistry/recipes.dm | 1 + .../code/modules/reagents/chemistry/recipes/fermi.dm | 10 +++++----- tgstation.dme | 9 +++++++-- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/code/modules/reagents/chemistry/recipes.dm b/code/modules/reagents/chemistry/recipes.dm index a3d70efd2d..f5f5eda104 100644 --- a/code/modules/reagents/chemistry/recipes.dm +++ b/code/modules/reagents/chemistry/recipes.dm @@ -26,6 +26,7 @@ var/OptimalpHMax = 10 var/ReactpHLim = 3 //var/CatalystFact = C.CatalystFact + var/CatalystFact = 0 var/CurveSharpT = 2 var/CurveSharppH = 2 var/ThermicConstant = 1 diff --git a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm index bab77de811..4e1a97d269 100644 --- a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm +++ b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm @@ -3,7 +3,7 @@ /datum/chemical_reaction/eigenstate name = "Eigenstasium" id = "eigenstate" - results = list("eigenstate" = `1`) + results = list("eigenstate" = 1) required_reagents = list("bluespace" = 1, "stable_plasma" = 1, "sugar" = 1) //FermiChem vars: OptimalTempMin = 350 // Lower area of bell curve for determining heat based rate reactions @@ -19,20 +19,20 @@ HIonRelease = 0.01 //pH change per 1u reaction RateUpLim = 50 //Optimal/max rate possible if all conditions are perfect FermiChem = TRUE//If the chemical uses the Fermichem reaction mechanics - var/FermiExplode = FALSE //If the chemical explodes in a special way - var/ImpureChem = "toxin" //What chemical is produced with an inpure reaction + FermiExplode = FALSE //If the chemical explodes in a special way + ImpureChem = "toxin" //What chemical is produced with an inpure reaction //serum /datum/chemical_reaction/SDGF name = "synthetic-derived growth factor" id = "SDGF" - results = list("SDGF" = `3`) + results = list("SDGF" = 3) required_reagents = list("stable_plasma" = 5, "slimejelly" = 5, "synthflesh" = 10, "blood" = 10) /datum/chemical_reaction/BElarger name = "" id = "e" - results = list("Eigenstasium" = `6`) + results = list("Eigenstasium" = 6) required_reagents = list("salglu_solution" = 1, "milk" = 5, "synthflesh" = 2, "silicon" = 2, "crocin" = 2) //FermiChem vars: OptimalTempMin = 350 // Lower area of bell curve for determining heat based rate reactions diff --git a/tgstation.dme b/tgstation.dme index d7df01ed59..e84c616d64 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -2528,9 +2528,15 @@ #include "code\modules\research\techweb\all_nodes.dm" #include "code\modules\research\xenobiology\xenobio_camera.dm" #include "code\modules\research\xenobiology\xenobiology.dm" +#include "code\modules\research\xenobiology\crossbreeding\__corecross.dm" +#include "code\modules\research\xenobiology\crossbreeding\_clothing.dm" +#include "code\modules\research\xenobiology\crossbreeding\_misc.dm" +#include "code\modules\research\xenobiology\crossbreeding\_mobs.dm" #include "code\modules\research\xenobiology\crossbreeding\_status_effects.dm" +#include "code\modules\research\xenobiology\crossbreeding\_weapons.dm" #include "code\modules\research\xenobiology\crossbreeding\burning.dm" #include "code\modules\research\xenobiology\crossbreeding\charged.dm" +#include "code\modules\research\xenobiology\crossbreeding\chilling.dm" #include "code\modules\research\xenobiology\crossbreeding\consuming.dm" #include "code\modules\research\xenobiology\crossbreeding\industrial.dm" #include "code\modules\research\xenobiology\crossbreeding\prismatic.dm" @@ -2772,12 +2778,10 @@ #include "modular_citadel\code\datums\components\material_container.dm" #include "modular_citadel\code\datums\components\phantomthief.dm" #include "modular_citadel\code\datums\components\souldeath.dm" -#include "modular_citadel\code\datums\mood_events\chem_events.dm" #include "modular_citadel\code\datums\mood_events\generic_negative_events.dm" #include "modular_citadel\code\datums\mood_events\generic_positive_events.dm" #include "modular_citadel\code\datums\mood_events\moodular.dm" #include "modular_citadel\code\datums\mutations\hulk.dm" -#include "modular_citadel\code\datums\status_effects\chems.dm" #include "modular_citadel\code\datums\status_effects\debuffs.dm" #include "modular_citadel\code\datums\traits\neutral.dm" #include "modular_citadel\code\datums\wires\airlock.dm" @@ -2957,6 +2961,7 @@ #include "modular_citadel\code\modules\projectiles\projectiles\reusable.dm" #include "modular_citadel\code\modules\reagents\chemistry\reagents\fermi_reagents.dm" #include "modular_citadel\code\modules\reagents\chemistry\reagents\other_reagents.dm" +#include "modular_citadel\code\modules\reagents\chemistry\recipes\fermi.dm" #include "modular_citadel\code\modules\reagents\reagent container\cit_kegs.dm" #include "modular_citadel\code\modules\reagents\reagent container\hypospraymkii.dm" #include "modular_citadel\code\modules\reagents\reagent container\hypovial.dm"