From 6dabe348fab548980beee5cf4a7f89e85d4eefdb Mon Sep 17 00:00:00 2001 From: dzahlus Date: Mon, 8 Feb 2021 14:43:33 +0100 Subject: [PATCH] fixes oversights fixes grenadelauncher.ogg being used where it shouldnt FOR GOOD NOW I SWEAR. Bokken sound fixed, mech weapons now use proper sound too --- code/game/mecha/equipment/weapons/weapons.dm | 10 ++++++---- code/game/objects/items/weaponry.dm | 2 +- .../projectiles/guns/ballistic/launchers.dm | 2 +- sound/weapons/woodbonk.ogg | Bin 0 -> 12407 bytes 4 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 sound/weapons/woodbonk.ogg diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index f2bced4aa8..6956f2ce6c 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -97,7 +97,7 @@ icon_state = "mecha_ion" energy_drain = 120 projectile = /obj/item/projectile/ion - fire_sound = 'sound/weapons/laser.ogg' + fire_sound = 'sound/weapons/IonRifle.ogg' /obj/item/mecha_parts/mecha_equipment/weapon/energy/tesla equip_cooldown = 35 @@ -195,7 +195,7 @@ //Base ballistic weapon type /obj/item/mecha_parts/mecha_equipment/weapon/ballistic name = "general ballistic weapon" - fire_sound = 'sound/weapons/gunshot.ogg' + fire_sound = 'sound/weaponslmgshot.ogg' var/projectiles var/projectiles_cache //ammo to be loaded in, if possible. var/projectiles_cache_max @@ -285,6 +285,7 @@ /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot name = "\improper LBX AC 10 \"Scattershot\"" desc = "A weapon for combat exosuits. Shoots a spread of pellets." + fire_sound = 'sound/weapons/gunshotshotgunshot.ogg' icon_state = "mecha_scatter" equip_cooldown = 20 projectile = /obj/item/projectile/bullet/scattershot @@ -299,6 +300,7 @@ /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/seedscatter name = "\improper Melon Seed \"Scattershot\"" desc = "A weapon for combat exosuits. Shoots a spread of pellets, shaped as seed." + fire_sound = 'sound/weapons/gunshotshotgunshot.ogg' icon_state = "mecha_scatter" equip_cooldown = 20 projectile = /obj/item/projectile/bullet/seed @@ -331,7 +333,7 @@ desc = "A weapon for combat exosuits. Launches light explosive missiles." icon_state = "mecha_missilerack" projectile = /obj/item/projectile/bullet/a84mm_he - fire_sound = 'sound/weapons/grenadelaunch.ogg' + fire_sound = 'sound/weapons/rocketlaunch.ogg' projectiles = 8 projectiles_cache = 0 projectiles_cache_max = 0 @@ -345,7 +347,7 @@ desc = "A weapon for combat exosuits. Launches low-explosive breaching missiles designed to explode only when striking a sturdy target." icon_state = "mecha_missilerack_six" projectile = /obj/item/projectile/bullet/a84mm_br - fire_sound = 'sound/weapons/grenadelaunch.ogg' + fire_sound = 'sound/weapons/rocketlaunch.ogg' projectiles = 6 projectiles_cache = 0 projectiles_cache_max = 0 diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index 07900d6bbf..554ea81974 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -302,7 +302,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 damtype = STAMINA attack_verb = list("whacked", "smacked", "struck") total_mass = TOTAL_MASS_MEDIEVAL_WEAPON - hitsound = 'sound/weapons/grenadelaunch.ogg' // no good wood thunk sounds + hitsound = 'sound/weapons/woodbonk.ogg' var/harm = FALSE // TRUE = brute, FALSE = stam var/reinforced = FALSE var/burnt = FALSE diff --git a/code/modules/projectiles/guns/ballistic/launchers.dm b/code/modules/projectiles/guns/ballistic/launchers.dm index 9e03207888..c53366c4f5 100644 --- a/code/modules/projectiles/guns/ballistic/launchers.dm +++ b/code/modules/projectiles/guns/ballistic/launchers.dm @@ -35,7 +35,7 @@ name = "gyrojet pistol" desc = "A prototype pistol designed to fire self propelled rockets." icon_state = "gyropistol" - fire_sound = 'sound/weapons/grenadelaunch.ogg' + fire_sound = 'sound/weapons/rocketlaunch.ogg' mag_type = /obj/item/ammo_box/magazine/m75 burst_size = 1 fire_delay = 0 diff --git a/sound/weapons/woodbonk.ogg b/sound/weapons/woodbonk.ogg new file mode 100644 index 0000000000000000000000000000000000000000..5fbadb104d6f88acfb2b870749ecf50fdba46661 GIT binary patch literal 12407 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 w960gT?aQmNeO^Zzztxs++dK