diff --git a/code/modules/overmap/ship_weaponry/_ship_gun.dm b/code/modules/overmap/ship_weaponry/_ship_gun.dm index 9bc1ce1e8e2..44df58b2775 100644 --- a/code/modules/overmap/ship_weaponry/_ship_gun.dm +++ b/code/modules/overmap/ship_weaponry/_ship_gun.dm @@ -136,12 +136,18 @@ for(var/mob/living/carbon/human/H in player_list) if(H.z in connected_z_levels) playsound(H, heavy_firing_sound, 100) + if(H.is_listening()) + H.adjustEarDamage(rand(0, 5), 2, TRUE) else if(firing_effects & FIRING_EFFECT_FLAG_SILENT) for(var/mob/living/carbon/human/H in get_area(src)) playsound(H, heavy_firing_sound, 100) + if(H.is_listening()) + H.adjustEarDamage(rand(0, 5), 2, TRUE) else for(var/mob/living/carbon/human/H in get_area(src)) playsound(H, heavy_firing_sound, 100) + if (H.is_listening()) + H.adjustEarDamage(rand(0, 5), 2, TRUE) var/list/connected_z_levels = GetConnectedZlevels(z) for(var/mob/living/carbon/human/H in player_list) if(H.z in connected_z_levels) diff --git a/html/changelogs/ramke.yml b/html/changelogs/ramke.yml new file mode 100644 index 00000000000..cd79be7dc5e --- /dev/null +++ b/html/changelogs/ramke.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: Ramke + +# 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: + - tweak: "Mobs listening intently will receive hearing damage from loud ship firing sounds."