diff --git a/code/controllers/subsystems/night_lighting.dm b/code/controllers/subsystems/night_lighting.dm index 0d82ba681ab..ab6f999a182 100644 --- a/code/controllers/subsystems/night_lighting.dm +++ b/code/controllers/subsystems/night_lighting.dm @@ -53,12 +53,12 @@ var/datum/controller/subsystem/nightlight/SSnightlight if (!isactive) activate() if (announce) - command_announcement.Announce("Good evening. The time is [worldtime2text()]. \n\nThe automated systems aboard the [station_name()] will now dim lighting in the public hallways in order to accommodate the circadian rhythm of some species.", "Automated Lighting System", new_sound = 'sound/misc/announcements/notice.ogg') + command_announcement.Announce("Good evening. The time is [worldtime2text()]. \n\nThe automated systems aboard the [station_name()] will now dim lighting in the public hallways in order to accommodate the circadian rhythm of some species.", "Automated Lighting System", new_sound = 'sound/misc/announcements/nightlight.ogg') else if (isactive) deactivate() if (announce) - command_announcement.Announce("Good morning. The time is [worldtime2text()]. \n\nThe automated systems aboard the [station_name()] will now return the public hallway lighting levels to normal.", "Automated Lighting System", new_sound = 'sound/misc/announcements/notice.ogg') + command_announcement.Announce("Good morning. The time is [worldtime2text()]. \n\nThe automated systems aboard the [station_name()] will now return the public hallway lighting levels to normal.", "Automated Lighting System", new_sound = 'sound/misc/announcements/nightlight.ogg') // 'whitelisted' areas are areas that have nightmode explicitly enabled diff --git a/code/game/turfs/simulated/wall_attacks.dm b/code/game/turfs/simulated/wall_attacks.dm index 36e422fade6..dddcf20ddcb 100644 --- a/code/game/turfs/simulated/wall_attacks.dm +++ b/code/game/turfs/simulated/wall_attacks.dm @@ -53,7 +53,7 @@ if(!can_open) to_chat(user, SPAN_NOTICE("You push the wall, but nothing happens.")) - playsound(src, 'sound/weapons/genhit.ogg', 25, TRUE) + playsound(src, hitsound, 25, TRUE) else toggle_open(user) return FALSE @@ -399,4 +399,5 @@ take_damage(damage_to_deal) else visible_message(SPAN_WARNING("[user] strikes \the [src] with \the [W], but it bounces off!")) + playsound(src, hitsound, 25, 1) user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index e75b4e58f59..55b03632561 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -20,6 +20,7 @@ var/material/reinf_material var/last_state var/construction_stage + var/hitsound = 'sound/weapons/genhit.ogg' var/use_standard_smoothing var/use_set_icon_state @@ -49,6 +50,7 @@ if(!isnull(rmaterialtype)) reinf_material = SSmaterials.get_material_by_name(rmaterialtype) update_material() + hitsound = material.hitsound if (material.radioactivity || (reinf_material && reinf_material.radioactivity)) START_PROCESSING(SSprocessing, src) @@ -90,10 +92,9 @@ return var/tforce = AM:throwforce * (speed/THROWFORCE_SPEED_DIVISOR) - if (tforce < 15) - return - - take_damage(tforce) + playsound(src, hitsound, tforce >= 15? 60 : 25, TRUE) + if(tforce >= 15) + take_damage(tforce) /turf/simulated/wall/proc/clear_plants() for(var/obj/effect/overlay/wallrot/WR in src) diff --git a/code/modules/mob/language/station.dm b/code/modules/mob/language/station.dm index 12f2d921be9..229073e6fc4 100644 --- a/code/modules/mob/language/station.dm +++ b/code/modules/mob/language/station.dm @@ -190,6 +190,7 @@ if(isvaurca(speaker)) speaker.custom_emote(VISIBLE_MESSAGE, "[pick("twitches their antennae", "twitches their antennae rhythmically")].") + playsound(speaker, 'sound/voice/vaurca_antenna_twitch.ogg', 60, 1) if (within_jamming_range(speaker)) // The user thinks that the message got through. @@ -285,4 +286,3 @@ flags = WHITELISTED | NONVERBAL syllables = list("azs","zis","zau","azua","skiu","zuakz","izo","aei","ki","kut","zo") partial_understanding = list(LANGUAGE_UNATHI = 50) - diff --git a/html/changelogs/wezzy_some_sounds.yml b/html/changelogs/wezzy_some_sounds.yml new file mode 100644 index 00000000000..9748249aa87 --- /dev/null +++ b/html/changelogs/wezzy_some_sounds.yml @@ -0,0 +1,42 @@ +################################ +# 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: Wowzewow (Wezzy) + +# 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 rustle1.ogg." + - soundadd: "New vaurca antenna twitch, zippo, wall hitting and announcement sounds." diff --git a/sound/effects/metalhit.ogg b/sound/effects/metalhit.ogg new file mode 100644 index 00000000000..edc32ffb33f Binary files /dev/null and b/sound/effects/metalhit.ogg differ diff --git a/sound/items/cigs_lighters/zippo_off.ogg b/sound/items/cigs_lighters/zippo_off.ogg index 381702d3c99..8d51263dfd8 100644 Binary files a/sound/items/cigs_lighters/zippo_off.ogg and b/sound/items/cigs_lighters/zippo_off.ogg differ diff --git a/sound/items/cigs_lighters/zippo_on.ogg b/sound/items/cigs_lighters/zippo_on.ogg index 287168d937f..1c1681d999a 100644 Binary files a/sound/items/cigs_lighters/zippo_on.ogg and b/sound/items/cigs_lighters/zippo_on.ogg differ diff --git a/sound/items/storage/rustle1.ogg b/sound/items/storage/rustle1.ogg index 8e94aada89e..6c91ccf99b0 100644 Binary files a/sound/items/storage/rustle1.ogg and b/sound/items/storage/rustle1.ogg differ diff --git a/sound/misc/announcements/nightlight.ogg b/sound/misc/announcements/nightlight.ogg new file mode 100644 index 00000000000..ad02a523542 Binary files /dev/null and b/sound/misc/announcements/nightlight.ogg differ diff --git a/sound/misc/announcements/notice.ogg b/sound/misc/announcements/notice.ogg index ad02a523542..0ee0f36d56f 100644 Binary files a/sound/misc/announcements/notice.ogg and b/sound/misc/announcements/notice.ogg differ diff --git a/sound/voice/vaurca_antenna_twitch.ogg b/sound/voice/vaurca_antenna_twitch.ogg new file mode 100644 index 00000000000..a3a72358c59 Binary files /dev/null and b/sound/voice/vaurca_antenna_twitch.ogg differ