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") 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)