From 3f5d4fe6d5daf2734f28a95f62827f1baf7fba6a Mon Sep 17 00:00:00 2001 From: Dip Date: Mon, 9 Nov 2020 00:23:07 -0300 Subject: [PATCH] Right --- code/modules/mob/living/living_defense.dm | 7 +------ code/modules/mob/living/simple_animal/slime/slime.dm | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index dce2cbbd..89695cce 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -294,12 +294,7 @@ 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/slime/slime.dm b/code/modules/mob/living/simple_animal/slime/slime.dm index 023af30d..86e8d1ea 100644 --- a/code/modules/mob/living/simple_animal/slime/slime.dm +++ b/code/modules/mob/living/simple_animal/slime/slime.dm @@ -260,7 +260,7 @@ visible_message("[M] pulls [src] off!") return attacked += 5 - if(nutrition >= 100) //steal some nutrition. negval handled in life() + if(nutrition >= 100 && !istype(src, /mob/living/simple_animal/slime)) //steal some nutrition. negval handled in life() nutrition -= (50 + (40 * M.is_adult)) M.add_nutrition(50 + (40 * M.is_adult)) if(health > 0)