diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 53fa825e6ef..b9733c7ead9 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -560,10 +560,10 @@ mob/living/simple_animal/bullet_act(var/obj/item/projectile/Proj) set name = "Resist" set category = "Abilities" - if(usr.stat == DEAD || !make_sound) + if((usr && usr.stat == DEAD) || !make_sound) return - if(!sound_time) + if(usr && !sound_time) to_chat(usr, span("warning", "Ability on cooldown 2 seconds.")) return @@ -582,7 +582,7 @@ mob/living/simple_animal/bullet_act(var/obj/item/projectile/Proj) message = sanitize(message) if(emote_sounds.len) - var/sound_chance = FALSE + var/sound_chance = TRUE if(client) // we do not want people who assume direct control to spam sound_chance = prob(50) make_noise(sound_chance) diff --git a/html/changelogs/Sindorman-animal.yml b/html/changelogs/Sindorman-animal.yml new file mode 100644 index 00000000000..09562d1ad0d --- /dev/null +++ b/html/changelogs/Sindorman-animal.yml @@ -0,0 +1,41 @@ +################################ +# 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 +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: PoZe + +# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Fixes animals not making sounds because of runtime."