From db3369ab4311606d260ef955c83056a43655e97a Mon Sep 17 00:00:00 2001 From: Fermi Date: Wed, 29 May 2019 01:51:07 +0100 Subject: [PATCH] Scrubbing messages and cleaning code. --- .../modules/reagents/chemistry/reagents/fermi_reagents.dm | 7 ++----- .../code/modules/reagents/chemistry/recipes/fermi.dm | 6 +++--- 2 files changed, 5 insertions(+), 8 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 6ff655c8c5..48c728963c 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm @@ -1039,11 +1039,8 @@ If it becomes an issue, I'll make all pets pacifists and apply more weakness eff As stated earlier the biggest concern is the use as a murder aid, which I have ideas for. (weaken the enthraller during the enthrallment process?) And as stated earlier, this chem is hard to make, and is punishing on failure. You fall in love with someone if it's impure, and then your piorities change. -(thats not written yet but thats the idea.) */ -//TODO rewrite code so that the low purity stuff is a seperate chem for clarity. - /datum/reagent/fermi/enthrall name = "MKUltra" id = "enthrall" @@ -1121,7 +1118,7 @@ And as stated earlier, this chem is hard to make, and is punishing on failure. Y return var/list/seen = viewers(7, get_turf(M))//Sound and sight checkers for(var/victim in seen) - if((victim == /mob/living/simple_animal/pet/) || (victim == M) || (!M.client)) + if((victim == /mob/living/simple_animal/pet/) || (victim == M) || (!M.client) || (M.stat == DEAD)) seen = seen - victim if(!seen) return @@ -1207,7 +1204,7 @@ And as stated earlier, this chem is hard to make, and is punishing on failure. Y if(!M.has_status_effect(STATUS_EFFECT_INLOVE)) var/list/seen = viewers(7, get_turf(M))//Sound and sight checkers for(var/victim in seen) - if((victim == /mob/living/simple_animal/pet/) || (victim == M)) + if((victim == /mob/living/simple_animal/pet/) || (victim == M) || (M.stat == DEAD)) seen = seen - victim if(seen.len == 0) return diff --git a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm index a7a69e2025..1f86c613bd 100644 --- a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm +++ b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm @@ -290,7 +290,7 @@ //mix_message = "" //FermiChem vars: OptimalTempMin = 500 - OptimalTempMax = 650 + OptimalTempMax = 700 ExplodeTemp = 750 OptimalpHMin = 2 OptimalpHMax = 5 @@ -299,7 +299,7 @@ CurveSharpT = 8 CurveSharppH = 0.5 ThermicConstant = -2 - HIonRelease = -0.05 + HIonRelease = -0.5 RateUpLim = 2 FermiChem = TRUE FermiExplode = TRUE @@ -330,7 +330,7 @@ CurveSharpT = 2 CurveSharppH = 0.5 ThermicConstant = -10 - HIonRelease = -0.1 + HIonRelease = -0.2 RateUpLim = 2 FermiChem = TRUE PurityMin = 0.30