From b729ba5d3ff883ce308cfbb3c8d875490c1820bb Mon Sep 17 00:00:00 2001
From: ATH1909 <42606352+ATH1909@users.noreply.github.com>
Date: Tue, 13 Jun 2023 01:39:43 -0400
Subject: [PATCH] The destabilization of your eigenstate can no longer be
 paused by stripping naked (#75982)

## About The Pull Request

The destabilization of your eigenstate can no longer be paused by
stripping naked.

## Why It's Good For The Game

one of the stages of the eigenstasium od's status effect is causing your
items to teleport off of you

this early returned out if you had no items to teleport off of yourself

and it did this before the line of code that increments the status
effect's progress counter

so if you had no items to teleport, you'd never progress to the later
stages of the status effect

## Changelog

:cl: ATHATH
fix: The destabilization of your eigenstate can no longer be paused by
stripping naked.
/:cl:
---
 code/datums/status_effects/neutral.dm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

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)