diff --git a/code/game/gamemodes/cult/narsie.dm b/code/game/gamemodes/cult/narsie.dm index 9328671a1cf..77ed7531a79 100644 --- a/code/game/gamemodes/cult/narsie.dm +++ b/code/game/gamemodes/cult/narsie.dm @@ -44,7 +44,7 @@ var/global/list/narsie_list = list() ..() if(announce) world << "[uppertext(name)] HAS RISEN" - world << sound('sound/effects/wind/wind_5_1.ogg') + world << sound('sound/effects/narsie.ogg') narsie_spawn_animation() diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm index a66b6344fc1..a673e05caa9 100644 --- a/code/game/objects/items/devices/megaphone.dm +++ b/code/game/objects/items/devices/megaphone.dm @@ -41,6 +41,7 @@ for(var/mob/O in (viewers(user))) O.show_message("[user] broadcasts, \"[message]\"",2) // 2 stands for hearable message + playsound(loc, 'sound/items/megaphone.ogg', 100, 0, 1) spamcheck = 1 spawn(20) spamcheck = 0 diff --git a/code/game/objects/items/weapons/grenades/flashbang.dm b/code/game/objects/items/weapons/grenades/flashbang.dm index b919186aa3d..2485f0d2ad5 100644 --- a/code/game/objects/items/weapons/grenades/flashbang.dm +++ b/code/game/objects/items/weapons/grenades/flashbang.dm @@ -33,7 +33,7 @@ S.icon_state = "shield0" M << "BANG" - playsound(src.loc, 'sound/effects/bang.ogg', 50, 1, 5) + playsound(src.loc, 'sound/weapons/flashbang.ogg', 50, 1, 5) //Checking for protections var/eye_safety = 0 @@ -90,6 +90,7 @@ else if(get_dist(M, T) <= 5) if(!ear_safety) + M << sound('sound/weapons/flash_ring.ogg',0,1,0,100) M.Stun(8) M.ear_damage += rand(0, 3) M.ear_deaf = max(M.ear_deaf,10) diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm index de856ab9222..4a215605173 100644 --- a/code/game/objects/items/weapons/melee/misc.dm +++ b/code/game/objects/items/weapons/melee/misc.dm @@ -10,6 +10,7 @@ w_class = 3 origin_tech = list(TECH_COMBAT = 4) attack_verb = list("flogged", "whipped", "lashed", "disciplined") + hitsound = 'sound/weapons/chainhit.ogg' /obj/item/weapon/melee/chainsword name = "chainsword" diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index a369a0fdce8..c3910928135 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -394,6 +394,7 @@ M << "You switch the [src] on." else if(T) T.visible_message("\The [src] turns on.") + playsound(loc, 'sound/items/WelderActivate.ogg', 50, 1) src.force = 15 src.damtype = "fire" src.w_class = 4 @@ -410,6 +411,7 @@ M << "You switch \the [src] off." else if(T) T.visible_message("\The [src] turns off.") + playsound(loc, 'sound/items/WelderDeactivate.ogg', 50, 1) src.force = 3 src.damtype = "brute" src.w_class = initial(src.w_class) diff --git a/code/game/objects/structures/curtains.dm b/code/game/objects/structures/curtains.dm index 074c92cb6a0..823e70e8e9a 100644 --- a/code/game/objects/structures/curtains.dm +++ b/code/game/objects/structures/curtains.dm @@ -22,7 +22,7 @@ ..(P, def_zone) /obj/structure/curtain/attack_hand(mob/user) - playsound(get_turf(loc), "rustle", 15, 1, -5) + playsound(get_turf(loc), 'sound/effects/curtain.ogg', 15, 1, -5) toggle() ..() diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 4a6488ad376..6f997f66851 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -194,6 +194,7 @@ else if(seed.chems) if(istype(W,/obj/item/weapon/material/hatchet) && !isnull(seed.chems["woodpulp"])) user.show_message("You make planks out of \the [src]!", 1) + playsound(loc, 'sound/effects/woodcutting.ogg', 50, 1) var/flesh_colour = seed.get_trait(TRAIT_FLESH_COLOUR) if(!flesh_colour) flesh_colour = seed.get_trait(TRAIT_PRODUCT_COLOUR) for(var/i=0,i<2,i++) diff --git a/code/modules/projectiles/guns/launcher/rocket.dm b/code/modules/projectiles/guns/launcher/rocket.dm index 32a2b48d00d..7bf7ef9aced 100644 --- a/code/modules/projectiles/guns/launcher/rocket.dm +++ b/code/modules/projectiles/guns/launcher/rocket.dm @@ -10,7 +10,7 @@ flags = CONDUCT slot_flags = 0 origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 5) - fire_sound = 'sound/effects/bang.ogg' + fire_sound = 'sound/weapons/rocketlaunch.ogg' release_force = 15 throw_distance = 30 diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index 29bb2a8e374..e4bbf7ec724 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -253,6 +253,10 @@ /obj/item/weapon/gun/projectile/automatic/rifle/l6_saw/proc/toggle_cover(mob/user) cover_open = !cover_open user << "You [cover_open ? "open" : "close"] [src]'s cover." + if(cover_open) + playsound(user, 'sound/weapons/sawopen.ogg', 60, 1) + else + playsound(user, 'sound/weapons/sawclose.ogg', 60, 1) update_icon() /obj/item/weapon/gun/projectile/automatic/rifle/l6_saw/attack_self(mob/user as mob) diff --git a/html/changelogs/alberyk-PR-3474.yml b/html/changelogs/alberyk-PR-3474.yml new file mode 100644 index 00000000000..b89f4101171 --- /dev/null +++ b/html/changelogs/alberyk-PR-3474.yml @@ -0,0 +1,6 @@ +author: Alberyk + +delete-after: True + +changes: + - soundadd: "Added new sounds to certain items and actions." diff --git a/sound/effects/curtain.ogg b/sound/effects/curtain.ogg new file mode 100644 index 00000000000..b3be91aaa28 Binary files /dev/null and b/sound/effects/curtain.ogg differ diff --git a/sound/effects/narsie.ogg b/sound/effects/narsie.ogg new file mode 100644 index 00000000000..af14ea5861c Binary files /dev/null and b/sound/effects/narsie.ogg differ diff --git a/sound/effects/woodcutting.ogg b/sound/effects/woodcutting.ogg new file mode 100644 index 00000000000..ef4883ba7e3 Binary files /dev/null and b/sound/effects/woodcutting.ogg differ diff --git a/sound/items/WelderActivate.ogg b/sound/items/WelderActivate.ogg new file mode 100644 index 00000000000..5218f2ab1cf Binary files /dev/null and b/sound/items/WelderActivate.ogg differ diff --git a/sound/items/WelderDeactivate.ogg b/sound/items/WelderDeactivate.ogg new file mode 100644 index 00000000000..22ac4f445cb Binary files /dev/null and b/sound/items/WelderDeactivate.ogg differ diff --git a/sound/items/megaphone.ogg b/sound/items/megaphone.ogg new file mode 100644 index 00000000000..31d7a8d1ad9 Binary files /dev/null and b/sound/items/megaphone.ogg differ diff --git a/sound/weapons/chainhit.ogg b/sound/weapons/chainhit.ogg new file mode 100644 index 00000000000..3e61c3dad76 Binary files /dev/null and b/sound/weapons/chainhit.ogg differ diff --git a/sound/weapons/flash_ring.ogg b/sound/weapons/flash_ring.ogg new file mode 100644 index 00000000000..a5d2014b8a2 Binary files /dev/null and b/sound/weapons/flash_ring.ogg differ diff --git a/sound/weapons/flashbang.ogg b/sound/weapons/flashbang.ogg new file mode 100644 index 00000000000..389aad77bc2 Binary files /dev/null and b/sound/weapons/flashbang.ogg differ diff --git a/sound/weapons/rocketlaunch.ogg b/sound/weapons/rocketlaunch.ogg new file mode 100644 index 00000000000..6972eda044d Binary files /dev/null and b/sound/weapons/rocketlaunch.ogg differ diff --git a/sound/weapons/sawclose.ogg b/sound/weapons/sawclose.ogg new file mode 100644 index 00000000000..f33a06059fd Binary files /dev/null and b/sound/weapons/sawclose.ogg differ diff --git a/sound/weapons/sawopen.ogg b/sound/weapons/sawopen.ogg new file mode 100644 index 00000000000..c6da68e323e Binary files /dev/null and b/sound/weapons/sawopen.ogg differ