From c2b9c0321db34792fd3be86235cc7570e0f69ad3 Mon Sep 17 00:00:00 2001 From: Fermi Date: Sun, 16 Jun 2019 13:33:41 +0100 Subject: [PATCH] Catfix --- .../modules/reagents/chemistry/reagents/fermi_reagents.dm | 5 ++++- .../code/modules/reagents/chemistry/recipes/fermi.dm | 2 +- modular_citadel/code/modules/reagents/objects/items.dm | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) 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 2f35397ba0..658a66afee 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm @@ -396,15 +396,18 @@ catto.name = H.name catto.desc = "A cute catto! They remind you of [H] somehow." catto.color = "#[H.dna.features["mcolor"]]" + catto.health = 1000 //To simulate fake death, while preventing ghosts escaping. H.forceMove(catto) log_game("FERMICHEM: [H] ckey: [H.key] has been made into a cute catto.") //Just to deal with rascally ghosts ADD_TRAIT(catto, TRAIT_NODEATH, "catto") /datum/reagent/fermi/secretcatchem/on_mob_life(mob/living/carbon/H) - if(catto.health <= 0) + if(catto.health <= 950) //So the dead can't ghost + //catto.revive(full_heal = 1) catto.icon_state = "custom_cat_dead" catto.Stun(1000) + catto.canmove = 0 else if(prob(5)) playsound(get_turf(catto), 'modular_citadel/sound/voice/merowr.ogg', 50, 1, -1) catto.say("lets out a meowrowr!*") diff --git a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm index 8993e2b51d..9913098efc 100644 --- a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm +++ b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm @@ -78,7 +78,7 @@ OptimalpHMax = 8 // Higest value for above ReactpHLim = 4 // How far out pH wil react, giving impurity place (Exponential phase) CatalystFact = 0 // How much the catalyst affects the reaction (0 = no catalyst) - CurveSharpT = 0.6 // How sharp the temperature exponential curve is (to the power of value) + CurveSharpT = 1.6 // How sharp the temperature exponential curve is (to the power of value) CurveSharppH = 2 // How sharp the pH exponential curve is (to the power of value) ThermicConstant = 5 //Temperature change per 1u produced HIonRelease = -0.05 //pH change per 1u reaction diff --git a/modular_citadel/code/modules/reagents/objects/items.dm b/modular_citadel/code/modules/reagents/objects/items.dm index 0516443aab..86c70663e5 100644 --- a/modular_citadel/code/modules/reagents/objects/items.dm +++ b/modular_citadel/code/modules/reagents/objects/items.dm @@ -38,7 +38,7 @@ if(numberOfPages >= 1) var/obj/item/FermiChem/pHpaper/P = new /obj/item/FermiChem/pHpaper P.add_fingerprint(user) - P.forceMove(user.loc) + P.forceMove(user) user.put_in_active_hand(P) to_chat(user, "You take [P] out of \the [src].") numberOfPages--