diff --git a/icons/mob/pets.dmi b/icons/mob/pets.dmi index e7444f194f..10f29f51e4 100644 Binary files a/icons/mob/pets.dmi and b/icons/mob/pets.dmi differ diff --git a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm index 43f3afec78..9552b58ab3 100644 --- a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm +++ b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm @@ -81,7 +81,7 @@ CurveSharpT = 1.5 // How sharp the temperature exponential curve is (to the power of value) CurveSharppH = 3 // How sharp the pH exponential curve is (to the power of value) ThermicConstant = 10 //Temperature change per 1u produced - HIonRelease = -0.5 //pH change per 1u reaction + HIonRelease = -0.01 //pH change per 1u reaction RateUpLim = 3 //Optimal/max rate possible if all conditions are perfect FermiChem = TRUE//If the chemical uses the Fermichem reaction mechanics FermiExplode = FALSE //If the chemical explodes in a special way @@ -90,8 +90,9 @@ /datum/chemical_reaction/fermi/eigenstate/FermiFinish(datum/reagents/holder, var/atom/my_atom)//Strange how this doesn't work but the other does. var/turf/open/location = get_turf(my_atom) var/datum/reagent/fermi/eigenstate/E = locate(/datum/reagent/fermi/eigenstate) in my_atom.reagents.reagent_list - E.location_created = location - E.data.["location_created"] = location + if(location) + E.location_created = location + E.data.["location_created"] = location //serum diff --git a/tgstation.dme b/tgstation.dme index db2e7f77e7..9aafb1b60b 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -2105,6 +2105,7 @@ #include "code\modules\mob\living\simple_animal\friendly\gondola.dm" #include "code\modules\mob\living\simple_animal\friendly\lizard.dm" #include "code\modules\mob\living\simple_animal\friendly\mouse.dm" +#include "code\modules\mob\living\simple_animal\friendly\panda.dm" #include "code\modules\mob\living\simple_animal\friendly\penguin.dm" #include "code\modules\mob\living\simple_animal\friendly\pet.dm" #include "code\modules\mob\living\simple_animal\friendly\sloth.dm"