From b321d278d91780d0eaddca05964d15451641183f Mon Sep 17 00:00:00 2001
From: Iwanabeu <82484852+Dragonkiller93@users.noreply.github.com>
Date: Tue, 11 May 2021 14:10:06 -0700
Subject: [PATCH] Adds the code back to carbon/life and removes it from human.

---
 code/modules/mob/living/carbon/human/life.dm | 19 -------------------
 code/modules/mob/living/carbon/life.dm       | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 2fff14882ad..60c21d0e278 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -590,26 +590,7 @@
 				to_chat(src, "<span class='notice'>You no longer feel vigorous.</span>")
 			metabolism_efficiency = 1
 
-	if(drowsyness)
-		AdjustDrowsy(-1)
-		EyeBlurry(2)
-		if(prob(5))
-			AdjustSleeping(1)
-			Paralyse(5)
 
-	if(confused)
-		AdjustConfused(-1)
-	// decrement dizziness counter, clamped to 0
-	if(resting)
-		if(dizziness)
-			AdjustDizzy(-15)
-		if(jitteriness)
-			AdjustJitter(-15)
-	else
-		if(dizziness)
-			AdjustDizzy(-3)
-		if(jitteriness)
-			AdjustJitter(-3)
 
 	if(NO_INTORGANS in dna.species.species_traits)
 		return
diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index 75e087766d4..87f1a6a53e6 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -263,6 +263,7 @@
 			setStaminaLoss(0, FALSE)
 			update_health_hud()
 
+	var/restingpwr = 1 + 4 * resting
 
 	//Dizziness
 	if(dizziness)
@@ -296,6 +297,22 @@
 						C.pixel_x -= pixel_x_diff
 						C.pixel_y -= pixel_y_diff
 			src = oldsrc
+		AdjustDizzy(-restingpwr)
+
+	if(drowsyness)
+		AdjustDrowsy(-restingpwr)
+		EyeBlurry(2)
+		if(prob(5))
+			AdjustSleeping(1)
+			Paralyse(5)
+
+	if(confused)
+		AdjustConfused(-1)
+
+	//Jitteryness
+	if(jitteriness)
+		do_jitter_animation(jitteriness)
+		AdjustJitter(-restingpwr)