diff --git a/code/game/sound.dm b/code/game/sound.dm index 813c63b10dd..f24a73f43a5 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -616,14 +616,21 @@ 'sound/weapons/reloads/pistol_metal_slide3.ogg', 'sound/weapons/reloads/pistol_metal_slide4.ogg', 'sound/weapons/reloads/pistol_metal_slide5.ogg', - 'sound/weapons/reloads/pistol_metal_slide6.ogg' + 'sound/weapons/reloads/pistol_metal_slide6.ogg', + 'sound/weapons/reloads/pistol_metal_slide7.ogg', + 'sound/weapons/reloads/pistol_metal_slide8.ogg', + 'sound/weapons/reloads/pistol_metal_slide9.ogg', + 'sound/weapons/reloads/pistol_metal_slide10.ogg', + 'sound/weapons/reloads/pistol_metal_slide11.ogg' ) /singleton/sound_category/polymer_slide_reload sounds = list( 'sound/weapons/reloads/pistol_polymer_slide1.ogg', 'sound/weapons/reloads/pistol_polymer_slide2.ogg', - 'sound/weapons/reloads/pistol_polymer_slide3.ogg' + 'sound/weapons/reloads/pistol_polymer_slide3.ogg', + 'sound/weapons/reloads/pistol_polymer_slide4.ogg', + 'sound/weapons/reloads/pistol_polymer_slide5.ogg' ) /singleton/sound_category/rifle_slide_reload @@ -636,7 +643,10 @@ 'sound/weapons/reloads/rifle_slide6.ogg', 'sound/weapons/reloads/rifle_slide7.ogg', 'sound/weapons/reloads/rifle_slide8.ogg', - 'sound/weapons/reloads/rifle_slide9.ogg' + 'sound/weapons/reloads/rifle_slide9.ogg', + 'sound/weapons/reloads/rifle_slide10.ogg', + 'sound/weapons/reloads/rifle_slide11.ogg', + 'sound/weapons/reloads/rifle_slide12.ogg' ) /singleton/sound_category/revolver_reload @@ -649,7 +659,9 @@ 'sound/weapons/reloads/shotgun_pump3.ogg', 'sound/weapons/reloads/shotgun_pump4.ogg', 'sound/weapons/reloads/shotgun_pump5.ogg', - 'sound/weapons/reloads/shotgun_pump6.ogg' + 'sound/weapons/reloads/shotgun_pump6.ogg', + 'sound/weapons/reloads/shotgun_pump7.ogg', + 'sound/weapons/reloads/shotgun_pump8.ogg' ) /singleton/sound_category/shotgun_reload diff --git a/html/changelogs/KingOfThePing - 21198.yml b/html/changelogs/KingOfThePing - 21198.yml new file mode 100644 index 00000000000..a94784e1f81 --- /dev/null +++ b/html/changelogs/KingOfThePing - 21198.yml @@ -0,0 +1,59 @@ +################################ +# 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 +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: KingOfThePing + +# 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: + - soundadd: "Added a variety of sounds for ballistic guns reloads. Includes rifles, pistols, SMGs and racking shotguns." + - sounddel: "Deleted rifle reload sound #3, because it was quite bad. It has been replaced with a better sound." diff --git a/sound/attributions.txt b/sound/attributions.txt index 2c5f8534476..40eaabab292 100644 --- a/sound/attributions.txt +++ b/sound/attributions.txt @@ -27,12 +27,24 @@ sound/weapons/reloads/pistol_metal_slide1.ogg to 6 sound/weapons/reloads/pistol_polymer_slide1.ogg to 3 sound/weapons/reloads/reload_shell.ogg to 4 sound/weapons/reloads/revolver_reload.ogg -sound/weapons/reloads/rifle_slide.ogg to 9 +sound/weapons/reloads/rifle_slide.ogg to 2 and 4 to 9 sound/weapons/reloads/shotgun_pump.ogg to 6 All sounds listed above in this section part of "Valhalla", licensed under CC0 1.0 Universal (CC0 1.0). Obtained from https://freesound.org/people/FilmmakersManual ATTRIBUTIONS SECTION END +ATTRIBUTION SECTION START +sound/weapons/reloads/pistol_metal_slide 7-9.ogg - Gary Guns Mixed.wav by GaryQ | License: Creative Commons 0. Obtained from www.freesound.org (not available anymore) +sound/weapons/reloads/pistol_metal_slide 10.ogg - PistolReloadSound.wav by MaximBomba | License: Creative Commons 0. Obtained from https://freesound.org/people/MaximBomba/sounds/432139/ +sound/weapons/reloads/pistol_metal_slide 11.ogg - Browning Hi-Power handgun being reloaded while empty. Full sequence by serøtōnin | License: Creative Commons 0. Obtained from https://freesound.org/people/ser%C3%B8t%C5%8Dnin/sounds/674569/ +sound/weapons/reloads/pistol_polymer_slide 4.ogg - M9 Reload.wav by oneshotofficial | License: Creative Commons 0. Obtained from https://freesound.org/people/oneshotofficial/sounds/616758/ +sound/weapons/reloads/pistol_polymer_slide 5.ogg - Gary Guns Mixed.wav by GaryQ | License: Creative Commons 0. Obtained from www.freesound.org (not available anymore) +sound/weapons/reloads/shotgun_pump 7-8.ogg - pump shotgun.WAV by shaana | License: Attribution NonCommercial 4.0. Obtained from https://freesound.org/people/shaana/sounds/222131/ +sound/weapons/reloads/rifle_slide 3.ogg - Uzi submachine gun being reloaded while empty. Full sequence by serøtōnin | License: Creative Commons 0. Obtained from https://freesound.org/people/ser%C3%B8t%C5%8Dnin/sounds/677160/ +sound/weapons/reloads/rifle_slide 10.ogg - AK-47 Assault Rifle being unloaded and reloaded by serøtōnin | License: Creative Commons 0. Obtained from https://freesound.org/people/ser%C3%B8t%C5%8Dnin/sounds/674742/ +sound/weapons/reloads/rifle_slide 11-12.ogg - AK-47 assault rifle being cocked 3x by serøtōnin | License: Creative Commons 0. Obtained from https://freesound.org/people/ser%C3%B8t%C5%8Dnin/sounds/675008/ +ATTRIBUTIONS SECTION END + ATTRIBUTIONS SECTION START sound/items/drop/bone_drop.ogg - "MugClinks", licensed under CC0. Obtained from https://freesound.org/people/sidequesting/sounds/547489/ sound/item/cards/bone_flip.ogg - "MugClinks", licensed under CC0. Obtained from https://freesound.org/people/sidequesting/sounds/547489/ diff --git a/sound/weapons/reloads/pistol_metal_slide10.ogg b/sound/weapons/reloads/pistol_metal_slide10.ogg new file mode 100644 index 00000000000..cc23e1dbb69 Binary files /dev/null and b/sound/weapons/reloads/pistol_metal_slide10.ogg differ diff --git a/sound/weapons/reloads/pistol_metal_slide11.ogg b/sound/weapons/reloads/pistol_metal_slide11.ogg new file mode 100644 index 00000000000..bd01abc786c Binary files /dev/null and b/sound/weapons/reloads/pistol_metal_slide11.ogg differ diff --git a/sound/weapons/reloads/pistol_metal_slide7.ogg b/sound/weapons/reloads/pistol_metal_slide7.ogg new file mode 100644 index 00000000000..3bb4d3d0ad1 Binary files /dev/null and b/sound/weapons/reloads/pistol_metal_slide7.ogg differ diff --git a/sound/weapons/reloads/pistol_metal_slide8.ogg b/sound/weapons/reloads/pistol_metal_slide8.ogg new file mode 100644 index 00000000000..b5130700a4c Binary files /dev/null and b/sound/weapons/reloads/pistol_metal_slide8.ogg differ diff --git a/sound/weapons/reloads/pistol_metal_slide9.ogg b/sound/weapons/reloads/pistol_metal_slide9.ogg new file mode 100644 index 00000000000..5cef50f3bf8 Binary files /dev/null and b/sound/weapons/reloads/pistol_metal_slide9.ogg differ diff --git a/sound/weapons/reloads/pistol_polymer_slide4.ogg b/sound/weapons/reloads/pistol_polymer_slide4.ogg new file mode 100644 index 00000000000..4d0ebbde9d9 Binary files /dev/null and b/sound/weapons/reloads/pistol_polymer_slide4.ogg differ diff --git a/sound/weapons/reloads/pistol_polymer_slide5.ogg b/sound/weapons/reloads/pistol_polymer_slide5.ogg new file mode 100644 index 00000000000..bd26087ec23 Binary files /dev/null and b/sound/weapons/reloads/pistol_polymer_slide5.ogg differ diff --git a/sound/weapons/reloads/rifle_slide10.ogg b/sound/weapons/reloads/rifle_slide10.ogg new file mode 100644 index 00000000000..32fe7662eb5 Binary files /dev/null and b/sound/weapons/reloads/rifle_slide10.ogg differ diff --git a/sound/weapons/reloads/rifle_slide11.ogg b/sound/weapons/reloads/rifle_slide11.ogg new file mode 100644 index 00000000000..06625b6deaa Binary files /dev/null and b/sound/weapons/reloads/rifle_slide11.ogg differ diff --git a/sound/weapons/reloads/rifle_slide12.ogg b/sound/weapons/reloads/rifle_slide12.ogg new file mode 100644 index 00000000000..f724b1acd77 Binary files /dev/null and b/sound/weapons/reloads/rifle_slide12.ogg differ diff --git a/sound/weapons/reloads/rifle_slide3.ogg b/sound/weapons/reloads/rifle_slide3.ogg index 6088975d25e..4f036620a13 100644 Binary files a/sound/weapons/reloads/rifle_slide3.ogg and b/sound/weapons/reloads/rifle_slide3.ogg differ diff --git a/sound/weapons/reloads/shotgun_pump7.ogg b/sound/weapons/reloads/shotgun_pump7.ogg new file mode 100644 index 00000000000..9345381e698 Binary files /dev/null and b/sound/weapons/reloads/shotgun_pump7.ogg differ diff --git a/sound/weapons/reloads/shotgun_pump8.ogg b/sound/weapons/reloads/shotgun_pump8.ogg new file mode 100644 index 00000000000..e4451fa5dd8 Binary files /dev/null and b/sound/weapons/reloads/shotgun_pump8.ogg differ