diff --git a/code/game/gamemodes/technomancer/spells/audible_deception.dm b/code/game/gamemodes/technomancer/spells/audible_deception.dm index dd8ac673b21..f4245cb329d 100644 --- a/code/game/gamemodes/technomancer/spells/audible_deception.dm +++ b/code/game/gamemodes/technomancer/spells/audible_deception.dm @@ -29,7 +29,7 @@ "Airlock" = 'sound/machines/airlock.ogg', "Airlock Creak" = 'sound/machines/airlock_open_force.ogg', - "Shotgun Pumping" = 'sound/weapons/shotgun_pump.ogg', + "Shotgun Pumping" = 'sound/weapons/reloads/shotgun_pump.ogg', "Flash" = 'sound/weapons/flash.ogg', "Bite" = 'sound/weapons/bite.ogg', "Low-Caliber Gun Firing"= 'sound/weapons/gunshot/gunshot_light.ogg', diff --git a/code/game/objects/items/weapons/vaurca_items.dm b/code/game/objects/items/weapons/vaurca_items.dm index e04e73ec074..b823fb2c23e 100644 --- a/code/game/objects/items/weapons/vaurca_items.dm +++ b/code/game/objects/items/weapons/vaurca_items.dm @@ -449,7 +449,7 @@ pump(user) /obj/item/gun/launcher/crossbow/vaurca/proc/pump(mob/M as mob) - playsound(M, 'sound/weapons/shotgun_pump.ogg', 60, 1) + playsound(M, 'sound/weapons/reloads/shotgun_pump.ogg', 60, 1) if(bolt) if(tension < max_tension) diff --git a/code/game/sound.dm b/code/game/sound.dm index d4dcba25c70..baad2c0fd35 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -541,9 +541,116 @@ 'sound/items/drop/casing2.ogg', 'sound/items/drop/casing3.ogg', 'sound/items/drop/casing4.ogg', - 'sound/items/drop/casing5.ogg' + 'sound/items/drop/casing5.ogg', + 'sound/items/drop/casing6.ogg', + 'sound/items/drop/casing7.ogg', + 'sound/items/drop/casing8.ogg', + 'sound/items/drop/casing9.ogg', + 'sound/items/drop/casing10.ogg', + 'sound/items/drop/casing11.ogg', + 'sound/items/drop/casing12.ogg', + 'sound/items/drop/casing13.ogg', + 'sound/items/drop/casing15.ogg', + 'sound/items/drop/casing16.ogg', + 'sound/items/drop/casing17.ogg', + 'sound/items/drop/casing18.ogg', + 'sound/items/drop/casing19.ogg', + 'sound/items/drop/casing20.ogg', + 'sound/items/drop/casing21.ogg', + 'sound/items/drop/casing22.ogg', + 'sound/items/drop/casing23.ogg', + 'sound/items/drop/casing24.ogg', + 'sound/items/drop/casing25.ogg' ) +/decl/sound_category/casing_drop_sound_shotgun + sounds = list( + 'sound/items/drop/casing_shotgun1.ogg', + 'sound/items/drop/casing_shotgun2.ogg', + 'sound/items/drop/casing_shotgun3.ogg', + 'sound/items/drop/casing_shotgun4.ogg', + 'sound/items/drop/casing_shotgun5.ogg' + ) + +/decl/sound_category/out_of_ammo + sounds = list( + 'sound/weapons/empty/empty2.ogg', + 'sound/weapons/empty/empty3.ogg', + 'sound/weapons/empty/empty4.ogg', + 'sound/weapons/empty/empty5.ogg', + 'sound/weapons/empty/empty6.ogg' + ) + +/decl/sound_category/out_of_ammo_revolver + sounds = list( + 'sound/weapons/empty/empty_revolver.ogg', + 'sound/weapons/empty/empty_revolver3.ogg' + ) + +/decl/sound_category/out_of_ammo_rifle + sounds = list( + 'sound/weapons/empty/empty_rifle1.ogg', + 'sound/weapons/empty/empty_rifle2.ogg' + ) + +/decl/sound_category/out_of_ammo_shotgun + sounds = list( + 'sound/weapons/empty/empty_shotgun1.ogg' + ) + +/decl/sound_category/metal_slide_reload + sounds = list( + 'sound/weapons/reloads/pistol_metal_slide1.ogg', + 'sound/weapons/reloads/pistol_metal_slide2.ogg', + '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' + ) + +/decl/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' + ) + +/decl/sound_category/rifle_slide_reload + sounds = list( + 'sound/weapons/reloads/rifle_slide.ogg', + 'sound/weapons/reloads/rifle_slide2.ogg', + 'sound/weapons/reloads/rifle_slide3.ogg', + 'sound/weapons/reloads/rifle_slide4.ogg', + 'sound/weapons/reloads/rifle_slide5.ogg' + ) + +/decl/sound_category/revolver_reload + sounds = list( + 'sound/weapons/reloads/revolver_reload.ogg' + ) +/decl/sound_category/shotgun_pump + sounds = list( + 'sound/weapons/reloads/shotgun_pump2.ogg', + 'sound/weapons/reloads/shotgun_pump3.ogg', + 'sound/weapons/reloads/shotgun_pump4.ogg', + 'sound/weapons/reloads/shotgun_pump5.ogg', + 'sound/weapons/reloads/shotgun_pump6.ogg' + ) + +/decl/sound_category/shotgun_reload + sounds = list( + 'sound/weapons/reloads/reload_shell.ogg', + 'sound/weapons/reloads/reload_shell2.ogg', + 'sound/weapons/reloads/reload_shell3.ogg', + 'sound/weapons/reloads/reload_shell4.ogg' + ) + +/decl/sound_category/heavy_machine_gun_reload + sounds = list( + 'sound/weapons/reloads/hmg_reload1.ogg', + 'sound/weapons/reloads/hmg_reload2.ogg', + 'sound/weapons/reloads/hmg_reload3.ogg' + ) /decl/sound_category/drillhit_sound sounds = list( 'sound/weapons/saw/drillhit1.ogg', @@ -553,13 +660,13 @@ /decl/sound_category/generic_drop_sound sounds = list( 'sound/items/drop/generic1.ogg', - 'sound/items/drop/generic2.ogg', + 'sound/items/drop/generic2.ogg' ) /decl/sound_category/generic_pickup_sound sounds = list( 'sound/items/pickup/generic1.ogg', 'sound/items/pickup/generic2.ogg', - 'sound/items/pickup/generic3.ogg', + 'sound/items/pickup/generic3.ogg' ) /decl/sound_category/generic_wield_sound sounds = list( diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm index 5c98f4a050f..9f9af6a6d70 100644 --- a/code/modules/projectiles/ammunition.dm +++ b/code/modules/projectiles/ammunition.dm @@ -112,7 +112,7 @@ var/list/icon_keys = list() //keys var/list/ammo_states = list() //values - var/insert_sound = 'sound/weapons/magazine_insert.ogg' //sound it plays when it gets inserted into a gun. + var/insert_sound = /decl/sound_category/metal_slide_reload //sound it plays when it gets inserted into a gun. var/eject_sound = 'sound/weapons/magazine_eject.ogg' /obj/item/ammo_magazine/Initialize() diff --git a/code/modules/projectiles/ammunition/boxes.dm b/code/modules/projectiles/ammunition/boxes.dm index 7101940b4ea..3531f70d143 100644 --- a/code/modules/projectiles/ammunition/boxes.dm +++ b/code/modules/projectiles/ammunition/boxes.dm @@ -1,7 +1,9 @@ +// Revolvos // /obj/item/ammo_magazine/a357 name = "speed loader (.357)" icon_state = "T38" caliber = "357" + insert_sound = /decl/sound_category/revolver_reload ammo_type = /obj/item/ammo_casing/a357 matter = list(DEFAULT_WALL_MATERIAL = 1260) max_ammo = 8 @@ -11,6 +13,7 @@ name = "speed loader (.454)" icon_state = "a454" caliber = "454" + insert_sound = /decl/sound_category/revolver_reload ammo_type = /obj/item/ammo_casing/a454 matter = list(DEFAULT_WALL_MATERIAL = 1260) max_ammo = 7 @@ -20,6 +23,7 @@ name = "speed loader (.38)" icon_state = "38" caliber = "38" + insert_sound = /decl/sound_category/revolver_reload matter = list(DEFAULT_WALL_MATERIAL = 360) ammo_type = /obj/item/ammo_casing/c38 max_ammo = 6 @@ -34,6 +38,9 @@ ammo_type = /obj/item/ammo_casing/c38/emp matter = list(DEFAULT_WALL_MATERIAL = 360, MATERIAL_URANIUM = 600) +// End of Revolvos // + +// Pistols and handguns // /obj/item/ammo_magazine/c45 name = "ammunition Box (.45)" icon_state = "9mm" @@ -54,6 +61,20 @@ max_ammo = 16 multiple_sprites = 1 +/obj/item/ammo_magazine/a50 + name = "magazine (.50)" + icon_state = "50ae" + origin_tech = list(TECH_COMBAT = 2) + mag_type = MAGAZINE + caliber = ".50" + matter = list(DEFAULT_WALL_MATERIAL = 1260) + ammo_type = /obj/item/ammo_casing/a50 + max_ammo = 7 + multiple_sprites = 1 + +/obj/item/ammo_magazine/a50/empty + initial_ammo = 0 + /obj/item/ammo_magazine/c45m name = "magazine (.45)" icon_state = "45" @@ -101,6 +122,17 @@ max_ammo = 16 multiple_sprites = 1 +/obj/item/ammo_magazine/super_heavy + name = ".599 magazine" + desc = "A bulky magazine for the Kumar Arms 2557." + icon_state = "k2557" + caliber = ".599 Kumar Super" + ammo_type = /obj/item/ammo_casing/kumar_super + mag_type = MAGAZINE + max_ammo = 5 + multiple_sprites = 1 + insert_sound = 'sound/weapons/k2557-insert.ogg' + /obj/item/ammo_magazine/mc10mm name = "magazine (10mm)" icon_state = "tommy-mag" @@ -145,12 +177,16 @@ name = "magazine (9mm flash)" ammo_type = /obj/item/ammo_casing/c9mm/flash +// End of pistols // + +// Submachine guns and PDWs /obj/item/ammo_magazine/c9mm name = "ammunition box (9mm)" icon_state = "9mm" origin_tech = list(TECH_COMBAT = 2) matter = list(DEFAULT_WALL_MATERIAL = 1800) caliber = "9mm" + insert_sound = /decl/sound_category/polymer_slide_reload ammo_type = /obj/item/ammo_casing/c9mm max_ammo = 30 @@ -164,6 +200,7 @@ ammo_type = /obj/item/ammo_casing/c9mm matter = list(DEFAULT_WALL_MATERIAL = 1200) caliber = "9mm" + insert_sound = /decl/sound_category/polymer_slide_reload max_ammo = 20 multiple_sprites = 1 @@ -196,6 +233,7 @@ origin_tech = list(TECH_COMBAT = 2) mag_type = MAGAZINE caliber = "10mm" + insert_sound = /decl/sound_category/polymer_slide_reload matter = list(DEFAULT_WALL_MATERIAL = 1500) ammo_type = /obj/item/ammo_casing/c10mm max_ammo = 20 @@ -204,12 +242,54 @@ /obj/item/ammo_magazine/a10mm/empty initial_ammo = 0 +/obj/item/ammo_magazine/c45uzi + name = "stick magazine (.45)" + icon_state = "uzi45" + mag_type = MAGAZINE + ammo_type = /obj/item/ammo_casing/c45 + matter = list(DEFAULT_WALL_MATERIAL = 1200) + caliber = ".45" + max_ammo = 16 + insert_sound = /decl/sound_category/polymer_slide_reload + multiple_sprites = 1 + +/obj/item/ammo_magazine/c45uzi/empty + initial_ammo = 0 + +/obj/item/ammo_magazine/submachinemag + name = "magazine (.45)" + icon_state = "tommy-mag" + mag_type = MAGAZINE + ammo_type = /obj/item/ammo_casing/c45 + matter = list(DEFAULT_WALL_MATERIAL = 1500) + caliber = ".45" + insert_sound = /decl/sound_category/polymer_slide_reload + max_ammo = 20 + +/obj/item/ammo_magazine/submachinemag/empty + initial_ammo = 0 + +/obj/item/ammo_magazine/submachinedrum + name = "drum magazine (.45)" + icon_state = "tommy-drum" + w_class = ITEMSIZE_NORMAL // Bulky ammo doesn't fit in your pockets! + mag_type = MAGAZINE + ammo_type = /obj/item/ammo_casing/c45 + matter = list(DEFAULT_WALL_MATERIAL = 3750) + caliber = ".45" + insert_sound = /decl/sound_category/polymer_slide_reload + max_ammo = 50 + +// End of SMGs and PDWs // + +// Rifles and bigger calibers // /obj/item/ammo_magazine/a556 name = "magazine (5.56mm)" icon_state = "5.56" origin_tech = list(TECH_COMBAT = 2) mag_type = MAGAZINE caliber = "a556" + insert_sound = /decl/sound_category/rifle_slide_reload matter = list(DEFAULT_WALL_MATERIAL = 1800) ammo_type = /obj/item/ammo_casing/a556 max_ammo = 30 @@ -258,25 +338,12 @@ /obj/item/ammo_magazine/a556/makeshift/empty initial_ammo = 0 -/obj/item/ammo_magazine/a50 - name = "magazine (.50)" - icon_state = "50ae" - origin_tech = list(TECH_COMBAT = 2) - mag_type = MAGAZINE - caliber = ".50" - matter = list(DEFAULT_WALL_MATERIAL = 1260) - ammo_type = /obj/item/ammo_casing/a50 - max_ammo = 7 - multiple_sprites = 1 - -/obj/item/ammo_magazine/a50/empty - initial_ammo = 0 - /obj/item/ammo_magazine/a75 name = "ammo magazine (20mm)" icon_state = "75" mag_type = MAGAZINE caliber = "75" + insert_sound = /decl/sound_category/rifle_slide_reload ammo_type = /obj/item/ammo_casing/a75 multiple_sprites = 1 max_ammo = 4 @@ -289,6 +356,7 @@ icon_state = "trodpack-2" mag_type = MAGAZINE caliber = "trod" + insert_sound = 'sound/weapons/reloads/rifle_slide3.ogg' ammo_type = /obj/item/ammo_casing/trod multiple_sprites = 1 max_ammo = 2 @@ -302,6 +370,7 @@ origin_tech = list(TECH_COMBAT = 2) mag_type = MAGAZINE caliber = "a762" + insert_sound = /decl/sound_category/rifle_slide_reload matter = list(DEFAULT_WALL_MATERIAL = 4500) ammo_type = /obj/item/ammo_casing/a762 max_ammo = 50 @@ -315,6 +384,7 @@ icon_state = "c762" mag_type = MAGAZINE caliber = "a762" + insert_sound = /decl/sound_category/rifle_slide_reload matter = list(DEFAULT_WALL_MATERIAL = 1800) ammo_type = /obj/item/ammo_casing/a762 max_ammo = 20 @@ -342,53 +412,6 @@ ammo_type = /obj/item/ammo_casing/vintage caliber = "vintage" -/obj/item/ammo_magazine/c45uzi - name = "stick magazine (.45)" - icon_state = "uzi45" - mag_type = MAGAZINE - ammo_type = /obj/item/ammo_casing/c45 - matter = list(DEFAULT_WALL_MATERIAL = 1200) - caliber = ".45" - max_ammo = 16 - multiple_sprites = 1 - -/obj/item/ammo_magazine/c45uzi/empty - initial_ammo = 0 - -/obj/item/ammo_magazine/submachinemag - name = "magazine (.45)" - icon_state = "tommy-mag" - mag_type = MAGAZINE - ammo_type = /obj/item/ammo_casing/c45 - matter = list(DEFAULT_WALL_MATERIAL = 1500) - caliber = ".45" - max_ammo = 20 - -/obj/item/ammo_magazine/submachinemag/empty - initial_ammo = 0 - -/obj/item/ammo_magazine/submachinedrum - name = "drum magazine (.45)" - icon_state = "tommy-drum" - w_class = ITEMSIZE_NORMAL // Bulky ammo doesn't fit in your pockets! - mag_type = MAGAZINE - ammo_type = /obj/item/ammo_casing/c45 - matter = list(DEFAULT_WALL_MATERIAL = 3750) - caliber = ".45" - max_ammo = 50 - -/obj/item/ammo_magazine/caps - name = "speed loader (caps)" - icon_state = "T38" - caliber = "caps" - color = "#FF0000" - ammo_type = /obj/item/ammo_casing/cap - matter = list(DEFAULT_WALL_MATERIAL = 600) - max_ammo = 7 - multiple_sprites = 1 - -//dragunov magazine - /obj/item/ammo_magazine/d762 name = "magazine (7.62mm)" icon_state = "SVD" @@ -402,12 +425,14 @@ /obj/item/ammo_magazine/d762/empty initial_ammo = 0 +// Shotguns and special // /obj/item/ammo_magazine/flechette name = "flechette rounds" icon = 'icons/obj/terminator.dmi' icon_state = "flechette" mag_type = MAGAZINE caliber = "flechette" + insert_sound = /decl/sound_category/rifle_slide_reload matter = list(DEFAULT_WALL_MATERIAL = 1200) ammo_type = /obj/item/ammo_casing/flechette max_ammo = 40 @@ -435,6 +460,7 @@ name = "magazine (slug)" icon_state = "csmb" caliber = "shotgun" + insert_sound = /decl/sound_category/rifle_slide_reload mag_type = MAGAZINE ammo_type = /obj/item/ammo_casing/shotgun max_ammo = 8 @@ -488,6 +514,7 @@ icon_state = "heavy_plasma_cell" mag_type = MAGAZINE caliber = "plasma slug" + insert_sound = 'sound/weapons/railgun_insert_emp.ogg' ammo_type = /obj/item/ammo_casing/plasma_slug max_ammo = 10 @@ -509,16 +536,17 @@ w_class = ITEMSIZE_NORMAL mag_type = MAGAZINE caliber = "nuke" + insert_sound = 'sound/weapons/reloads/rifle_slide3.ogg' ammo_type = /obj/item/ammo_casing/nuke max_ammo = 2 multiple_sprites = 1 -/obj/item/ammo_magazine/super_heavy - name = ".599 magazine" - desc = "A bulky magazine for the Kumar Arms 2557." - icon_state = "k2557" - caliber = ".599 Kumar Super" - ammo_type = /obj/item/ammo_casing/kumar_super - mag_type = MAGAZINE - max_ammo = 5 + +/obj/item/ammo_magazine/caps + name = "speed loader (caps)" + icon_state = "T38" + caliber = "caps" + color = "#FF0000" + ammo_type = /obj/item/ammo_casing/cap + matter = list(DEFAULT_WALL_MATERIAL = 600) + max_ammo = 7 multiple_sprites = 1 - insert_sound = 'sound/weapons/k2557-insert.ogg' \ No newline at end of file diff --git a/code/modules/projectiles/ammunition/bullets.dm b/code/modules/projectiles/ammunition/bullets.dm index d8f56e00379..dbef0e30664 100644 --- a/code/modules/projectiles/ammunition/bullets.dm +++ b/code/modules/projectiles/ammunition/bullets.dm @@ -107,7 +107,8 @@ caliber = "shotgun" projectile_type = /obj/item/projectile/bullet/shotgun matter = list(DEFAULT_WALL_MATERIAL = 360) - reload_sound = 'sound/weapons/reload_shell.ogg' + reload_sound = /decl/sound_category/shotgun_reload + drop_sound = /decl/sound_category/casing_drop_sound_shotgun /obj/item/ammo_casing/shotgun/pellet name = "shotgun shell" @@ -336,7 +337,8 @@ w_class = ITEMSIZE_NORMAL slot_flags = null max_stack = 1 - reload_sound = 'sound/weapons/reload_shell.ogg' + reload_sound = 'sound/weapons/reloads/shotgun_pump.ogg' + drop_sound = /decl/sound_category/generic_drop_sound /obj/item/ammo_casing/cannon/explosive name = "explosive cannonball" @@ -357,6 +359,7 @@ slot_flags = null desc = "A miniaturized version of a nuclear bomb." projectile_type = /obj/item/projectile/bullet/nuke + drop_sound = /decl/sound_category/generic_drop_sound max_stack = 2 /obj/item/ammo_casing/musket @@ -365,7 +368,7 @@ icon_state = "musketball" caliber = "musket" projectile_type = /obj/item/projectile/bullet/pistol/strong - reload_sound = 'sound/weapons/reload_shell.ogg' + reload_sound = 'sound/weapons/reloads/shotgun_pump.ogg' /obj/item/ammo_casing/recoilless_rifle name = "anti-tank warhead" @@ -374,7 +377,7 @@ w_class = ITEMSIZE_NORMAL slot_flags = null projectile_type = /obj/item/projectile/bullet/recoilless_rifle - reload_sound = 'sound/weapons/reload_shell.ogg' + reload_sound = 'sound/weapons/reloads/shotgun_pump.ogg' max_stack = 1 /obj/item/ammo_casing/peac diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 92d656caf19..035708545bd 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -83,6 +83,8 @@ var/displays_maptext = FALSE var/can_ammo_display = TRUE var/obj/item/ammo_display + var/empty_sound = /decl/sound_category/out_of_ammo + var/casing_drop_sound = /decl/sound_category/casing_drop_sound maptext_x = 22 maptext_y = 2 @@ -312,7 +314,7 @@ user.setClickCooldown(shoot_time) user.setMoveCooldown(shoot_time) next_fire_time = world.time + shoot_time - + user.face_atom(target, TRUE) return TRUE @@ -434,8 +436,8 @@ if(user) to_chat(user, SPAN_DANGER("*click*")) else - src.visible_message("*click click*") - playsound(loc, 'sound/weapons/empty.ogg', 100, 1) + src.visible_message("*click*") + playsound(loc, empty_sound, 100, 1) //called after successfully firing /obj/item/gun/proc/handle_post_fire(mob/user, atom/target, var/pointblank = FALSE, var/reflex = FALSE, var/playemote = TRUE) diff --git a/code/modules/projectiles/guns/launcher/grenade_launcher.dm b/code/modules/projectiles/guns/launcher/grenade_launcher.dm index 1e738238b6e..1c1e41f278a 100644 --- a/code/modules/projectiles/guns/launcher/grenade_launcher.dm +++ b/code/modules/projectiles/guns/launcher/grenade_launcher.dm @@ -27,7 +27,7 @@ //revolves the magazine, allowing players to choose between multiple grenade types /obj/item/gun/launcher/grenade/proc/pump(mob/M as mob) - playsound(M, 'sound/weapons/shotgun_pump.ogg', 60, 1) + playsound(M, 'sound/weapons/reloads/shotgun_pump.ogg', 60, 1) var/obj/item/grenade/next if(grenades.len) @@ -132,4 +132,4 @@ user.visible_message("[user] removes \a [chambered] from [src].", SPAN_NOTICE("You remove \a [chambered] from [src].")) chambered = null else - to_chat(user, SPAN_WARNING("[src] is empty.")) \ No newline at end of file + to_chat(user, SPAN_WARNING("[src] is empty.")) diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index 7df3d97ce24..afe991a1ffc 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -123,6 +123,7 @@ slot_flags = SLOT_BACK load_method = MAGAZINE fire_sound = 'sound/weapons/gunshot/gunshot_rifle.ogg' + empty_sound = /decl/sound_category/out_of_ammo_rifle magazine_type = /obj/item/ammo_magazine/c762 allowed_magazines = list(/obj/item/ammo_magazine/c762) diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm index 416d67137fc..f46de6781d2 100644 --- a/code/modules/projectiles/guns/projectile/revolver.dm +++ b/code/modules/projectiles/guns/projectile/revolver.dm @@ -13,6 +13,7 @@ ammo_type = /obj/item/ammo_casing/a357 magazine_type = /obj/item/ammo_magazine/a357 fire_sound = 'sound/weapons/gunshot/gunshot_revolver.ogg' + empty_sound = /decl/sound_category/out_of_ammo_revolver var/chamber_offset = 0 //how many empty chambers in the cylinder until you hit a round /obj/item/gun/projectile/revolver/verb/spin_cylinder() diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index 43816b9f97f..fda8c282af3 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -58,7 +58,7 @@ fire_sound = 'sound/weapons/gunshot/gunshot_shotgun2.ogg' is_wieldable = TRUE var/recentpump = 0 // to prevent spammage - var/rack_sound = 'sound/weapons/shotgun_pump.ogg' + var/rack_sound = /decl/sound_category/shotgun_pump var/rack_verb = "pump" /obj/item/gun/projectile/shotgun/pump/consume_next_projectile() diff --git a/html/changelogs/KingOfThePing - high_maintenance_gun_fetish_bait.yml b/html/changelogs/KingOfThePing - high_maintenance_gun_fetish_bait.yml new file mode 100644 index 00000000000..f10450425e6 --- /dev/null +++ b/html/changelogs/KingOfThePing - high_maintenance_gun_fetish_bait.yml @@ -0,0 +1,44 @@ +################################ +# 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: 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, 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: + - soundadd: "Added a lot (around 65) new gun related sounds. Including but not limited to: dry firing and reloading for all gun types, shotgun pumping, casings and shells hitting the ground, as well as some gun specific uniques." + - sounddel: "Deleted a very sharp and old shotgun pumping sound that didn't fit in anywhere anymore." + - backend: "Re-organized a lot of sound categories." + - backend: "Re-organized the gun magazine code while I was at it." diff --git a/sound/items/drop/casing10.ogg b/sound/items/drop/casing10.ogg new file mode 100644 index 00000000000..54b45188e9f Binary files /dev/null and b/sound/items/drop/casing10.ogg differ diff --git a/sound/items/drop/casing11.ogg b/sound/items/drop/casing11.ogg new file mode 100644 index 00000000000..2a3682dfd7d Binary files /dev/null and b/sound/items/drop/casing11.ogg differ diff --git a/sound/items/drop/casing12.ogg b/sound/items/drop/casing12.ogg new file mode 100644 index 00000000000..ac790029c2e Binary files /dev/null and b/sound/items/drop/casing12.ogg differ diff --git a/sound/items/drop/casing13.ogg b/sound/items/drop/casing13.ogg new file mode 100644 index 00000000000..7b05a4880f9 Binary files /dev/null and b/sound/items/drop/casing13.ogg differ diff --git a/sound/items/drop/casing15.ogg b/sound/items/drop/casing15.ogg new file mode 100644 index 00000000000..708b3eaff67 Binary files /dev/null and b/sound/items/drop/casing15.ogg differ diff --git a/sound/items/drop/casing16.ogg b/sound/items/drop/casing16.ogg new file mode 100644 index 00000000000..483bc5ac75c Binary files /dev/null and b/sound/items/drop/casing16.ogg differ diff --git a/sound/items/drop/casing17.ogg b/sound/items/drop/casing17.ogg new file mode 100644 index 00000000000..f76394f0eaf Binary files /dev/null and b/sound/items/drop/casing17.ogg differ diff --git a/sound/items/drop/casing18.ogg b/sound/items/drop/casing18.ogg new file mode 100644 index 00000000000..44c1d935a20 Binary files /dev/null and b/sound/items/drop/casing18.ogg differ diff --git a/sound/items/drop/casing19.ogg b/sound/items/drop/casing19.ogg new file mode 100644 index 00000000000..5fe583c1ac8 Binary files /dev/null and b/sound/items/drop/casing19.ogg differ diff --git a/sound/items/drop/casing20.ogg b/sound/items/drop/casing20.ogg new file mode 100644 index 00000000000..f5f8f75afc3 Binary files /dev/null and b/sound/items/drop/casing20.ogg differ diff --git a/sound/items/drop/casing21.ogg b/sound/items/drop/casing21.ogg new file mode 100644 index 00000000000..2160c056f61 Binary files /dev/null and b/sound/items/drop/casing21.ogg differ diff --git a/sound/items/drop/casing22.ogg b/sound/items/drop/casing22.ogg new file mode 100644 index 00000000000..03cf7e0862c Binary files /dev/null and b/sound/items/drop/casing22.ogg differ diff --git a/sound/items/drop/casing23.ogg b/sound/items/drop/casing23.ogg new file mode 100644 index 00000000000..8f3eae0e549 Binary files /dev/null and b/sound/items/drop/casing23.ogg differ diff --git a/sound/items/drop/casing24.ogg b/sound/items/drop/casing24.ogg new file mode 100644 index 00000000000..0184841db78 Binary files /dev/null and b/sound/items/drop/casing24.ogg differ diff --git a/sound/items/drop/casing25.ogg b/sound/items/drop/casing25.ogg new file mode 100644 index 00000000000..af1b7e40d28 Binary files /dev/null and b/sound/items/drop/casing25.ogg differ diff --git a/sound/items/drop/casing6.ogg b/sound/items/drop/casing6.ogg new file mode 100644 index 00000000000..6a254118864 Binary files /dev/null and b/sound/items/drop/casing6.ogg differ diff --git a/sound/items/drop/casing7.ogg b/sound/items/drop/casing7.ogg new file mode 100644 index 00000000000..6ba67fa1591 Binary files /dev/null and b/sound/items/drop/casing7.ogg differ diff --git a/sound/items/drop/casing8.ogg b/sound/items/drop/casing8.ogg new file mode 100644 index 00000000000..b3d7cb71777 Binary files /dev/null and b/sound/items/drop/casing8.ogg differ diff --git a/sound/items/drop/casing9.ogg b/sound/items/drop/casing9.ogg new file mode 100644 index 00000000000..e006c39177a Binary files /dev/null and b/sound/items/drop/casing9.ogg differ diff --git a/sound/items/drop/casing_shotgun1.ogg b/sound/items/drop/casing_shotgun1.ogg new file mode 100644 index 00000000000..7ed886bc864 Binary files /dev/null and b/sound/items/drop/casing_shotgun1.ogg differ diff --git a/sound/items/drop/casing_shotgun2.ogg b/sound/items/drop/casing_shotgun2.ogg new file mode 100644 index 00000000000..c56f77cd4f1 Binary files /dev/null and b/sound/items/drop/casing_shotgun2.ogg differ diff --git a/sound/items/drop/casing_shotgun3.ogg b/sound/items/drop/casing_shotgun3.ogg new file mode 100644 index 00000000000..11a304ff18f Binary files /dev/null and b/sound/items/drop/casing_shotgun3.ogg differ diff --git a/sound/items/drop/casing_shotgun4.ogg b/sound/items/drop/casing_shotgun4.ogg new file mode 100644 index 00000000000..2b00bdee6bf Binary files /dev/null and b/sound/items/drop/casing_shotgun4.ogg differ diff --git a/sound/items/drop/casing_shotgun5.ogg b/sound/items/drop/casing_shotgun5.ogg new file mode 100644 index 00000000000..52e256d7525 Binary files /dev/null and b/sound/items/drop/casing_shotgun5.ogg differ diff --git a/sound/weapons/empty/empty2.ogg b/sound/weapons/empty/empty2.ogg new file mode 100644 index 00000000000..b2fc91cbf9a Binary files /dev/null and b/sound/weapons/empty/empty2.ogg differ diff --git a/sound/weapons/empty/empty3.ogg b/sound/weapons/empty/empty3.ogg new file mode 100644 index 00000000000..4fcb6370b3a Binary files /dev/null and b/sound/weapons/empty/empty3.ogg differ diff --git a/sound/weapons/empty/empty4.ogg b/sound/weapons/empty/empty4.ogg new file mode 100644 index 00000000000..885ebe2e7bf Binary files /dev/null and b/sound/weapons/empty/empty4.ogg differ diff --git a/sound/weapons/empty/empty5.ogg b/sound/weapons/empty/empty5.ogg new file mode 100644 index 00000000000..e97fef088cb Binary files /dev/null and b/sound/weapons/empty/empty5.ogg differ diff --git a/sound/weapons/empty/empty6.ogg b/sound/weapons/empty/empty6.ogg new file mode 100644 index 00000000000..bb291433cb0 Binary files /dev/null and b/sound/weapons/empty/empty6.ogg differ diff --git a/sound/weapons/empty/empty_revolver.ogg b/sound/weapons/empty/empty_revolver.ogg new file mode 100644 index 00000000000..cf05355ebd6 Binary files /dev/null and b/sound/weapons/empty/empty_revolver.ogg differ diff --git a/sound/weapons/empty/empty_revolver3.ogg b/sound/weapons/empty/empty_revolver3.ogg new file mode 100644 index 00000000000..c7217664738 Binary files /dev/null and b/sound/weapons/empty/empty_revolver3.ogg differ diff --git a/sound/weapons/empty/empty_rifle1.ogg b/sound/weapons/empty/empty_rifle1.ogg new file mode 100644 index 00000000000..87028c577a6 Binary files /dev/null and b/sound/weapons/empty/empty_rifle1.ogg differ diff --git a/sound/weapons/empty/empty_rifle2.ogg b/sound/weapons/empty/empty_rifle2.ogg new file mode 100644 index 00000000000..4a4edb2b2f2 Binary files /dev/null and b/sound/weapons/empty/empty_rifle2.ogg differ diff --git a/sound/weapons/empty/empty_shotgun1.ogg b/sound/weapons/empty/empty_shotgun1.ogg new file mode 100644 index 00000000000..dc4c988d863 Binary files /dev/null and b/sound/weapons/empty/empty_shotgun1.ogg differ diff --git a/sound/weapons/reloads/hmg_reload1.ogg b/sound/weapons/reloads/hmg_reload1.ogg new file mode 100644 index 00000000000..a54e0f7e30f Binary files /dev/null and b/sound/weapons/reloads/hmg_reload1.ogg differ diff --git a/sound/weapons/reloads/hmg_reload2.ogg b/sound/weapons/reloads/hmg_reload2.ogg new file mode 100644 index 00000000000..f671f4c5961 Binary files /dev/null and b/sound/weapons/reloads/hmg_reload2.ogg differ diff --git a/sound/weapons/reloads/hmg_reload3.ogg b/sound/weapons/reloads/hmg_reload3.ogg new file mode 100644 index 00000000000..a031393cf3a Binary files /dev/null and b/sound/weapons/reloads/hmg_reload3.ogg differ diff --git a/sound/weapons/reloads/pistol_metal_slide1.ogg b/sound/weapons/reloads/pistol_metal_slide1.ogg new file mode 100644 index 00000000000..b0232d109c8 Binary files /dev/null and b/sound/weapons/reloads/pistol_metal_slide1.ogg differ diff --git a/sound/weapons/reloads/pistol_metal_slide2.ogg b/sound/weapons/reloads/pistol_metal_slide2.ogg new file mode 100644 index 00000000000..e8d559216d5 Binary files /dev/null and b/sound/weapons/reloads/pistol_metal_slide2.ogg differ diff --git a/sound/weapons/reloads/pistol_metal_slide3.ogg b/sound/weapons/reloads/pistol_metal_slide3.ogg new file mode 100644 index 00000000000..31dbf855a00 Binary files /dev/null and b/sound/weapons/reloads/pistol_metal_slide3.ogg differ diff --git a/sound/weapons/reloads/pistol_metal_slide4.ogg b/sound/weapons/reloads/pistol_metal_slide4.ogg new file mode 100644 index 00000000000..9523473f95e Binary files /dev/null and b/sound/weapons/reloads/pistol_metal_slide4.ogg differ diff --git a/sound/weapons/reloads/pistol_metal_slide5.ogg b/sound/weapons/reloads/pistol_metal_slide5.ogg new file mode 100644 index 00000000000..9aa3d4a6e0e Binary files /dev/null and b/sound/weapons/reloads/pistol_metal_slide5.ogg differ diff --git a/sound/weapons/reloads/pistol_metal_slide6.ogg b/sound/weapons/reloads/pistol_metal_slide6.ogg new file mode 100644 index 00000000000..8ce4f59c31e Binary files /dev/null and b/sound/weapons/reloads/pistol_metal_slide6.ogg differ diff --git a/sound/weapons/reloads/pistol_polymer_slide1.ogg b/sound/weapons/reloads/pistol_polymer_slide1.ogg new file mode 100644 index 00000000000..64677996e1c Binary files /dev/null and b/sound/weapons/reloads/pistol_polymer_slide1.ogg differ diff --git a/sound/weapons/reloads/pistol_polymer_slide2.ogg b/sound/weapons/reloads/pistol_polymer_slide2.ogg new file mode 100644 index 00000000000..10c9a55be63 Binary files /dev/null and b/sound/weapons/reloads/pistol_polymer_slide2.ogg differ diff --git a/sound/weapons/reloads/pistol_polymer_slide3.ogg b/sound/weapons/reloads/pistol_polymer_slide3.ogg new file mode 100644 index 00000000000..bd0a572e721 Binary files /dev/null and b/sound/weapons/reloads/pistol_polymer_slide3.ogg differ diff --git a/sound/weapons/reload_shell.ogg b/sound/weapons/reloads/reload_shell.ogg similarity index 100% rename from sound/weapons/reload_shell.ogg rename to sound/weapons/reloads/reload_shell.ogg diff --git a/sound/weapons/reloads/reload_shell2.ogg b/sound/weapons/reloads/reload_shell2.ogg new file mode 100644 index 00000000000..c76c61f67fa Binary files /dev/null and b/sound/weapons/reloads/reload_shell2.ogg differ diff --git a/sound/weapons/reloads/reload_shell3.ogg b/sound/weapons/reloads/reload_shell3.ogg new file mode 100644 index 00000000000..1a2e1e1400f Binary files /dev/null and b/sound/weapons/reloads/reload_shell3.ogg differ diff --git a/sound/weapons/reloads/reload_shell4.ogg b/sound/weapons/reloads/reload_shell4.ogg new file mode 100644 index 00000000000..db0ce346cc8 Binary files /dev/null and b/sound/weapons/reloads/reload_shell4.ogg differ diff --git a/sound/weapons/reloads/revolver_reload.ogg b/sound/weapons/reloads/revolver_reload.ogg new file mode 100644 index 00000000000..311319cb37e Binary files /dev/null and b/sound/weapons/reloads/revolver_reload.ogg differ diff --git a/sound/weapons/reloads/rifle_slide.ogg b/sound/weapons/reloads/rifle_slide.ogg new file mode 100644 index 00000000000..6b2b06407b2 Binary files /dev/null and b/sound/weapons/reloads/rifle_slide.ogg differ diff --git a/sound/weapons/reloads/rifle_slide2.ogg b/sound/weapons/reloads/rifle_slide2.ogg new file mode 100644 index 00000000000..d114b4232b3 Binary files /dev/null and b/sound/weapons/reloads/rifle_slide2.ogg differ diff --git a/sound/weapons/reloads/rifle_slide3.ogg b/sound/weapons/reloads/rifle_slide3.ogg new file mode 100644 index 00000000000..6088975d25e Binary files /dev/null and b/sound/weapons/reloads/rifle_slide3.ogg differ diff --git a/sound/weapons/reloads/rifle_slide4.ogg b/sound/weapons/reloads/rifle_slide4.ogg new file mode 100644 index 00000000000..fff06843af4 Binary files /dev/null and b/sound/weapons/reloads/rifle_slide4.ogg differ diff --git a/sound/weapons/reloads/rifle_slide5.ogg b/sound/weapons/reloads/rifle_slide5.ogg new file mode 100644 index 00000000000..4e3f4284bbf Binary files /dev/null and b/sound/weapons/reloads/rifle_slide5.ogg differ diff --git a/sound/weapons/reloads/shotgun_pump.ogg b/sound/weapons/reloads/shotgun_pump.ogg new file mode 100644 index 00000000000..a91d7d4795c Binary files /dev/null and b/sound/weapons/reloads/shotgun_pump.ogg differ diff --git a/sound/weapons/reloads/shotgun_pump2.ogg b/sound/weapons/reloads/shotgun_pump2.ogg new file mode 100644 index 00000000000..e3a13a231c7 Binary files /dev/null and b/sound/weapons/reloads/shotgun_pump2.ogg differ diff --git a/sound/weapons/reloads/shotgun_pump3.ogg b/sound/weapons/reloads/shotgun_pump3.ogg new file mode 100644 index 00000000000..a795dd49fe9 Binary files /dev/null and b/sound/weapons/reloads/shotgun_pump3.ogg differ diff --git a/sound/weapons/reloads/shotgun_pump4.ogg b/sound/weapons/reloads/shotgun_pump4.ogg new file mode 100644 index 00000000000..55caa563709 Binary files /dev/null and b/sound/weapons/reloads/shotgun_pump4.ogg differ diff --git a/sound/weapons/reloads/shotgun_pump5.ogg b/sound/weapons/reloads/shotgun_pump5.ogg new file mode 100644 index 00000000000..3ee9fa2664c Binary files /dev/null and b/sound/weapons/reloads/shotgun_pump5.ogg differ diff --git a/sound/weapons/reloads/shotgun_pump6.ogg b/sound/weapons/reloads/shotgun_pump6.ogg new file mode 100644 index 00000000000..a3270c6db6b Binary files /dev/null and b/sound/weapons/reloads/shotgun_pump6.ogg differ diff --git a/sound/weapons/shotgun_pump.ogg b/sound/weapons/shotgun_pump.ogg deleted file mode 100644 index e44d0b1de99..00000000000 Binary files a/sound/weapons/shotgun_pump.ogg and /dev/null differ