diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index c0db9535005..5baf977f931 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -187,7 +187,7 @@ /mob/living/simple_animal/hostile/adjustBruteLoss(var/damage) ..(damage) - if(!stat && search_objects < 3)//Not unconscious, and we don't ignore mobs + if(!client && !stat && search_objects < 3)//Not unconscious, and we don't ignore mobs if(search_objects)//Turn off item searching and ignore whatever item we were looking at, we're more concerned with fight or flight search_objects = 0 target = null diff --git a/code/modules/mob/living/simple_animal/morph/morph.dm b/code/modules/mob/living/simple_animal/morph/morph.dm index b6e5c48570f..fb17c943adf 100644 --- a/code/modules/mob/living/simple_animal/morph/morph.dm +++ b/code/modules/mob/living/simple_animal/morph/morph.dm @@ -110,12 +110,12 @@ visible_message("The [src] dissolves!") restore() - //Dump eaten stuff - for(var/obj/O in src) - O.loc = loc + //Dump eaten stuff + for(var/obj/O in src) + O.loc = loc - for(var/mob/M in src) - M.loc = loc + for(var/mob/M in src) + M.loc = loc ..(0) return @@ -146,7 +146,7 @@ if(isliving(target)) // Eat Corpses to regen health var/mob/living/L = target if(L.stat == DEAD) - if(do_after(src, 30, target = src)) + if(do_after(src, 30, target = L)) visible_message("[src] swallows the [target] whole!") L.loc = src adjustBruteLoss(-50) @@ -154,7 +154,7 @@ if(istype(target,/obj/item)) // Eat items just to be annoying var/obj/item/I = target if(!I.anchored) - if(do_after(src,20, target = src)) + if(do_after(src,20, target = I)) visible_message("[src] swallows the [target] whole!") I.loc = src return diff --git a/html/changelogs/AnturK-Morph.yml b/html/changelogs/AnturK-Morph.yml new file mode 100644 index 00000000000..f8af17015e9 --- /dev/null +++ b/html/changelogs/AnturK-Morph.yml @@ -0,0 +1,37 @@ + +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# spellcheck (typo fixes) +# experiment +# tgs (TG-ported fixes?) +################################# + +# Your name. +author: AnturK + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "New species of mimic was spotted in the wilderness of space. Watch out!" \ No newline at end of file diff --git a/icons/mob/animal.dmi b/icons/mob/animal.dmi index db036d5f1c4..e33396b7049 100644 Binary files a/icons/mob/animal.dmi and b/icons/mob/animal.dmi differ