diff --git a/code/modules/mob/simple_animal/simple_animal_misc.dm b/code/modules/mob/simple_animal/simple_animal_misc.dm index 4fa50f03bab..2c79a471264 100644 --- a/code/modules/mob/simple_animal/simple_animal_misc.dm +++ b/code/modules/mob/simple_animal/simple_animal_misc.dm @@ -41,12 +41,11 @@ for(var/mob/M in view(src,7)) M << "[src] [pick(speak_emote)], \"[message]\"" -/mob/living/simple_animal/emote(var/message = null, var/m_type=1, var/act = "auto") +/mob/living/simple_animal/emote(var/act = "auto", var/m_type=1, var/message = null) switch(act) if ("scream") message = "[src] makes a loud and pained whimper" m_type = 2 - if ("custom") var/input = copytext(sanitize(input("Choose an emote to display.") as text|null),1,MAX_MESSAGE_LEN) if (!input) @@ -60,7 +59,6 @@ alert("Unable to use this emote, must be either hearable or visible.") return message = "[src] [input]" - if ("me") if(silent) return diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 13b2a67967e..80d8e798c71 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -694,6 +694,8 @@ M.weakened += 2 if(prob(20)) M.paralysis += 2 + if(istype(M,/mob/living/simple_animal/mouse)) + continue if(istype(M,/mob/living/carbon/human)) var/name = pick(M:organs) var/datum/organ/external/temp = M:organs[name]