diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm
index 9a1a58a21d..e7ce36e557 100644
--- a/code/modules/reagents/reagent_containers.dm
+++ b/code/modules/reagents/reagent_containers.dm
@@ -142,7 +142,7 @@
/obj/item/reagent_containers/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
reagents.expose_temperature(exposed_temperature)
if(beaker_weakness_bitflag & TEMP_WEAK)
- if(reagents.chem_temp > 444)//assuming polypropylene
+ if(reagents.chem_temp >= 444)//assuming polypropylene
var/list/seen = viewers(5, get_turf(src))
var/iconhtml = icon2html(src, seen)
for(var/mob/M in seen)
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index 28fc36e080..1175e7f17b 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -334,6 +334,7 @@
/obj/item/reagent_containers/glass/beaker/waterbottle/Initialize()
beaker_weakness_bitflag |= TEMP_WEAK
+ . = ..()
/obj/item/reagent_containers/glass/beaker/waterbottle/empty
list_reagents = list()
diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/eigentstasium.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/eigentstasium.dm
index 7794037e27..2b0a54b081 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/eigentstasium.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/eigentstasium.dm
@@ -17,7 +17,7 @@
color = "#5020H4" // rgb: 50, 20, 255
overdose_threshold = 15
addiction_threshold = 15
- metabolization_rate = 0.5 * REAGENTS_METABOLISM
+ metabolization_rate = 1.2 * REAGENTS_METABOLISM
addiction_stage2_end = 30
addiction_stage3_end = 41
addiction_stage4_end = 44 //Incase it's too long
@@ -34,11 +34,11 @@
if(current_cycle == 0)
location_return = get_turf(M) //sets up return point
to_chat(M, "You feel your wavefunction split!")
- if(purity > 0.8 && location_created) //Teleports you home if it's pure enough
+ if(purity > 0.9) //Teleports you home if it's pure enough
log_game("FERMICHEM: [M] ckey: [M.key] returned to [location_created] using eigenstasium")
//var/turf/open/creation = location_created
do_sparks(5,FALSE,M)
- do_teleport(M, location_created, 0, asoundin = 'sound/effects/phasein.ogg')
+ do_teleport(M, loc, 0, asoundin = 'sound/effects/phasein.ogg')
do_sparks(5,FALSE,M)
if(prob(20))
do_sparks(5,FALSE,M)
@@ -59,14 +59,13 @@
metabolization_rate += 0.5 //So you're not stuck forever teleporting.
/datum/reagent/fermi/eigenstate/overdose_process(mob/living/M) //Overdose, makes you teleport randomly, probably one of my favourite effects. Sometimes kills you.
- do_sparks(5,FALSE,src)
do_teleport(M, get_turf(M), 10, asoundin = 'sound/effects/phasein.ogg')
do_sparks(5,FALSE,src)
..()
//Addiction
/datum/reagent/fermi/eigenstate/addiction_act_stage1(mob/living/M) //Welcome to Fermis' wild ride.
- if(addiction_stage == 0)
+ if(addiction_stage == 1)
to_chat(M, "Your wavefunction feels like it's been ripped in half. You feel empty inside.")
log_game("FERMICHEM: [M] ckey: [M.key] has become addicted to eigenstasium")
M.Jitter(10)
@@ -76,9 +75,9 @@
/datum/reagent/fermi/eigenstate/addiction_act_stage2(mob/living/M)
if(addiction_stage == 11)
to_chat(M, "You start to convlse violently as you feel your consciousness split and merge across realities as your possessions fly wildy off your body.")
- M.Jitter(50)
- M.Knockdown(100)
- M.Stun(40)
+ M.Jitter(200)
+ M.Knockdown(200)
+ M.Stun(80)
var/items = M.get_contents()
if(!LAZYLEN(items))
@@ -91,7 +90,6 @@
..()
/datum/reagent/fermi/eigenstate/addiction_act_stage3(mob/living/M)//Pulls multiple copies of the character from alternative realities while teleporting them around!
-
//Clone function - spawns a clone then deletes it - simulates multiple copies of the player teleporting in
switch(addictCyc3) //Loops 0 -> 1 -> 2 -> 0 ...ect.
if(0)
@@ -127,9 +125,9 @@
do_sparks(5,FALSE,M)
do_teleport(M, get_turf(M), 2, no_effects=TRUE) //teleports clone so it's hard to find the real one!
do_sparks(5,FALSE,M)
- M.Sleeping(50, 0)
+ M.Sleeping(100, 0)
M.Jitter(50)
- M.Knockdown(0)
+ M.Knockdown(100)
to_chat(M, "You feel your eigenstate settle, snapping an alternative version of yourself into reality. All your previous memories are lost and replaced with the alternative version of yourself. This version of you feels more [pick("affectionate", "happy", "lusty", "radical", "shy", "ambitious", "frank", "voracious", "sensible", "witty")] than your previous self, sent to god knows what universe.")
M.emote("me",1,"flashes into reality suddenly, gasping as they gaze around in a bewildered and highly confused fashion!",TRUE)
log_game("FERMICHEM: [M] ckey: [M.key] has become an alternative universe version of themselves.")
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 f081bef0b8..d7c89150f8 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
@@ -406,7 +406,7 @@
/datum/reagent/fermi/secretcatchem/on_mob_life(mob/living/carbon/H)
if(catto.health <= 50)
catto.icon_state = "custom_cat_dead"
- catto.stun(1000)
+ catto.Stun(1000)
else if(prob(5))
playsound(get_turf(catto), 'modular_citadel/sound/voice/merowr.ogg', 50, 1, -1)
catto.say("lets out a meowrowr!*")