diff --git a/code/datums/status_effects/neutral.dm b/code/datums/status_effects/neutral.dm index d6df0be2f6e..a24c9cb5087 100644 --- a/code/datums/status_effects/neutral.dm +++ b/code/datums/status_effects/neutral.dm @@ -356,7 +356,7 @@ status_type = STATUS_EFFECT_REFRESH alert_type = null -#define EIGENSTASIUM_MAX_BUFFER -250 +#define EIGENSTASIUM_MAX_BUFFER -251 #define EIGENSTASIUM_STABILISATION_RATE 5 #define EIGENSTASIUM_PHASE_1_END 50 #define EIGENSTASIUM_PHASE_2_END 80 @@ -417,6 +417,10 @@ return stable_message = FALSE + + //Increment cycle + current_cycle++ //needs to be done here because phase 2 can early return + //These run on specific cycles switch(current_cycle) if(0) @@ -510,9 +514,6 @@ owner.remove_status_effect(/datum/status_effect/eigenstasium) - //Finally increment cycle - current_cycle++ - /datum/status_effect/eigenstasium/proc/remove_clone_from_var() SIGNAL_HANDLER UnregisterSignal(alt_clone, COMSIG_QDELETING)