diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm b/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm index 7eff7a4da82..be42d57fc65 100644 --- a/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm +++ b/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm @@ -162,6 +162,10 @@ var/list/_slime_default_emotes = list( return TRUE else return FALSE + if(ishuman(L)) + var/mob/living/carbon/human/H = L + if(istype(H.species, /datum/species/monkey)) // Monke always food + return FALSE // The other stuff was already checked in parent proc, and the . variable will implicitly return the correct value. // Slimes regenerate passively. diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/defense.dm b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/defense.dm index 51266a6d883..7e0eab5a36c 100644 --- a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/defense.dm +++ b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/defense.dm @@ -51,4 +51,4 @@ // Getting slimebatoned/xenotased. /mob/living/simple_mob/slime/xenobio/slimebatoned(mob/living/user, amount) adjust_discipline(round(amount/2)) - Weaken(amount) // This needs to come afterwards or else it will always be considered abuse to the slime. + Weaken(amount*5) // This needs to come afterwards or else it will always be considered abuse to the slime. Multiply by 5 for stun to not end instantly. diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm index d8f524d7332..72d32abb8c8 100644 --- a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm +++ b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm @@ -563,7 +563,7 @@ /datum/modifier/aura/slime_heal name = "slime mending" - desc = "You feel somewhat gooy." + desc = "You feel somewhat gooey." mob_overlay_state = "pink_sparkles" stacks = MODIFIER_STACK_FORBID aura_max_distance = 2 @@ -605,6 +605,7 @@ ) /mob/living/simple_mob/slime/xenobio/gold/slimebatoned(mob/living/user, amount) + adjust_discipline(round(amount/2)) power_charge = between(0, power_charge + amount, 10) /mob/living/simple_mob/slime/xenobio/gold/get_description_interaction() // So it doesn't say to use a baton on them.