diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 89695cce..dce2cbbd 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -294,7 +294,12 @@
if(!SSticker.HasRoundStarted())
to_chat(M, "You cannot attack people before the game has started.")
return
-
+//Hyperstation Edit
+ if(istype(src, /mob/living/simple_animal/slime))
+ M.visible_message("[M] boops \the [src].","You boop \the [src].")
+ //This was made to prevent sentient slime players from exploting removing infinite nutrient from other slimes.
+ return
+//End of hyperstation edit
if(M.buckled)
if(M in buckled_mobs)
M.Feedstop()
diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm
index ea916dc9..a66abfdc 100644
--- a/code/modules/mob/living/simple_animal/friendly/cat.dm
+++ b/code/modules/mob/living/simple_animal/friendly/cat.dm
@@ -113,30 +113,26 @@
icon_dead = "original_dead"
//Read_Memory()
. = ..()
-
+/*
/mob/living/simple_animal/pet/cat/Runtime/Life()
- /*
if(!cats_deployed && SSticker.current_state >= GAME_STATE_SETTING_UP)
Deploy_The_Cats()
if(!stat && SSticker.current_state == GAME_STATE_FINISHED && !memory_saved)
Write_Memory()
memory_saved = TRUE
- */
..()
-
+*/
/mob/living/simple_animal/pet/cat/Runtime/make_babies()
var/mob/baby = ..()
if(baby)
children += baby
return baby
-
-/mob/living/simple_animal/pet/cat/Runtime/death()
/*
+/mob/living/simple_animal/pet/cat/Runtime/death()
if(!memory_saved)
Write_Memory(TRUE)
..()
*/
-
/mob/living/simple_animal/pet/cat/Runtime/proc/Read_Memory()
if(fexists("data/npc_saves/Runtime.sav")) //legacy compatability to convert old format to new
var/savefile/S = new /savefile("data/npc_saves/Runtime.sav")