From 78fadafa0516bfd1d6bed98bc160532f0d3d794e Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Wed, 17 Jun 2020 21:44:49 -0700
Subject: [PATCH] alright

---
 code/modules/mob/living/carbon/life.dm                 |  1 +
 code/modules/mob/living/life.dm                        |  4 ----
 code/modules/mob/living/silicon/pai/pai.dm             | 10 ++++++----
 code/modules/mob/living/simple_animal/friendly/dog.dm  |  5 +++--
 .../living/simple_animal/guardian/types/assassin.dm    |  5 +++--
 modular_citadel/code/modules/mob/living/carbon/life.dm |  3 ---
 tgstation.dme                                          |  1 -
 7 files changed, 13 insertions(+), 16 deletions(-)
 delete mode 100644 modular_citadel/code/modules/mob/living/carbon/life.dm

diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index 6e58d8ee42..f9c5db4789 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -13,6 +13,7 @@
 		if(bprv & BODYPART_LIFE_UPDATE_HEALTH)
 			updatehealth()
 	update_stamina()
+	doSprintBufferRegen()
 
 	if(stat != DEAD)
 		handle_brain_damage()
diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm
index 65babc06b6..7c99c452a1 100644
--- a/code/modules/mob/living/life.dm
+++ b/code/modules/mob/living/life.dm
@@ -43,8 +43,6 @@
   * Returns TRUE or FALSE based on if we were interrupted. This is used by overridden variants to check if they should stop.
   */
 /mob/living/proc/BiologicalLife(seconds, times_fired)
-	SHOULD_NOT_SLEEP(TRUE)
-
 	handle_diseases()// DEAD check is in the proc itself; we want it to spread even if the mob is dead, but to handle its disease-y properties only if you're not.
 
 	// Everything after this shouldn't process while dead (as of the time of writing)
@@ -78,8 +76,6 @@
   * Returns TRUE or FALSE based on if we were interrupted. This is used by overridden variants to check if they should stop.
   */
 /mob/living/proc/PhysicalLife(seconds, times_fired)
-	SHOULD_NOT_SLEEP(TRUE)
-	
 	if(digitalinvis)
 		handle_diginvis() //AI becomes unable to see mob
 
diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm
index 320e3ecfb9..704a23b8db 100644
--- a/code/modules/mob/living/silicon/pai/pai.dm
+++ b/code/modules/mob/living/silicon/pai/pai.dm
@@ -283,17 +283,19 @@
 	. = ..()
 	. += "A personal AI in holochassis mode. Its master ID string seems to be [master]."
 
-/mob/living/silicon/pai/Life()
-	if(stat == DEAD)
-		return
+/mob/living/silicon/pai/PhysicalLife()
+	. = ..()
 	if(cable)
 		if(get_dist(src, cable) > 1)
 			var/turf/T = get_turf(src.loc)
 			T.visible_message("<span class='warning'>[src.cable] rapidly retracts back into its spool.</span>", "<span class='italics'>You hear a click and the sound of wire spooling rapidly.</span>")
 			qdel(src.cable)
 			cable = null
+
+/mob/living/silicon/pai/BiologicalLife()
+	if(!(. = ..()))
+		return
 	silent = max(silent - 1, 0)
-	. = ..()
 
 /mob/living/silicon/pai/updatehealth()
 	if(status_flags & GODMODE)
diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm
index e054d79248..0584995583 100644
--- a/code/modules/mob/living/simple_animal/friendly/dog.dm
+++ b/code/modules/mob/living/simple_animal/friendly/dog.dm
@@ -420,8 +420,9 @@
 	fdel(json_file)
 	WRITE_FILE(json_file, json_encode(file_data))
 
-/mob/living/simple_animal/pet/dog/corgi/Ian/Life()
-	..()
+/mob/living/simple_animal/pet/dog/corgi/Ian/BiologicalLife()
+	if(!(. = ..()))
+		return
 
 	//Feeding, chasing food, FOOOOODDDD
 	if(!stat && CHECK_MULTIPLE_BITFIELDS(mobility_flags, MOBILITY_STAND|MOBILITY_MOVE) && !buckled)
diff --git a/code/modules/mob/living/simple_animal/guardian/types/assassin.dm b/code/modules/mob/living/simple_animal/guardian/types/assassin.dm
index e82d6cd16a..885f907997 100644
--- a/code/modules/mob/living/simple_animal/guardian/types/assassin.dm
+++ b/code/modules/mob/living/simple_animal/guardian/types/assassin.dm
@@ -19,8 +19,9 @@
 	. = ..()
 	stealthcooldown = 0
 
-/mob/living/simple_animal/hostile/guardian/assassin/Life()
-	. = ..()
+/mob/living/simple_animal/hostile/guardian/assassin/PhysicalLife()
+	if(!(. = ..()))
+		return
 	updatestealthalert()
 	if(loc == summoner && toggle)
 		ToggleMode(0)
diff --git a/modular_citadel/code/modules/mob/living/carbon/life.dm b/modular_citadel/code/modules/mob/living/carbon/life.dm
deleted file mode 100644
index e94bd75985..0000000000
--- a/modular_citadel/code/modules/mob/living/carbon/life.dm
+++ /dev/null
@@ -1,3 +0,0 @@
-/mob/living/carbon/Life()
-	. = ..()
-	doSprintBufferRegen()
diff --git a/tgstation.dme b/tgstation.dme
index dbd7f56bb6..9eb5bb5f39 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -3441,7 +3441,6 @@
 #include "modular_citadel\code\modules\mob\living\living.dm"
 #include "modular_citadel\code\modules\mob\living\carbon\carbon.dm"
 #include "modular_citadel\code\modules\mob\living\carbon\damage_procs.dm"
-#include "modular_citadel\code\modules\mob\living\carbon\life.dm"
 #include "modular_citadel\code\modules\mob\living\carbon\reindex_screams.dm"
 #include "modular_citadel\code\modules\mob\living\carbon\human\human.dm"
 #include "modular_citadel\code\modules\mob\living\carbon\human\human_defense.dm"