diff --git a/code/game/sound.dm b/code/game/sound.dm index 40aa7f971e3..30730d25d46 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -248,6 +248,8 @@ falloff_distance - Distance at which falloff begins. Sound is at peak volume (in if("bonebreak") soundin = pick('sound/effects/bone_break_1.ogg', 'sound/effects/bone_break_2.ogg', 'sound/effects/bone_break_3.ogg', 'sound/effects/bone_break_4.ogg', 'sound/effects/bone_break_5.ogg', 'sound/effects/bone_break_6.ogg') + if("boxing") + soundin = pick('sound/weapons/boxing1.ogg', 'sound/weapons/boxing2.ogg', 'sound/weapons/boxing3.ogg', 'sound/weapons/boxing4.ogg', 'sound/weapons/boxing5.ogg', 'sound/weapons/boxing6.ogg') if("honkbot_e") soundin = pick('sound/items/bikehorn.ogg', 'sound/items/AirHorn2.ogg', 'sound/misc/sadtrombone.ogg', 'sound/items/AirHorn.ogg', 'sound/items/WEEOO1.ogg', 'sound/voice/biamthelaw.ogg', 'sound/voice/bcreep.ogg','sound/magic/Fireball.ogg' ,'sound/effects/pray.ogg', 'sound/voice/hiss1.ogg','sound/machines/buzz-sigh.ogg', 'sound/machines/ping.ogg', 'sound/weapons/flashbang.ogg', 'sound/weapons/bladeslice.ogg') if("smcalm") diff --git a/code/modules/martial_arts/brawling.dm b/code/modules/martial_arts/brawling.dm index ade32720246..006520a5d81 100644 --- a/code/modules/martial_arts/brawling.dm +++ b/code/modules/martial_arts/brawling.dm @@ -27,7 +27,7 @@ var/obj/item/organ/external/affecting = D.get_organ(ran_zone(A.zone_selected)) var/armor_block = D.run_armor_check(affecting, MELEE) - playsound(D.loc, 'sound/weapons/punch1.ogg', 25, TRUE, -1) + playsound(D.loc, "boxing", 50, TRUE, -1) D.visible_message("[A] has hit [D] with a [atk_verb]!", \ "[A] has hit [D] with a [atk_verb]!") diff --git a/sound/weapons/boxing1.ogg b/sound/weapons/boxing1.ogg new file mode 100644 index 00000000000..07edc972f72 Binary files /dev/null and b/sound/weapons/boxing1.ogg differ diff --git a/sound/weapons/boxing2.ogg b/sound/weapons/boxing2.ogg new file mode 100644 index 00000000000..0abb14c30a9 Binary files /dev/null and b/sound/weapons/boxing2.ogg differ diff --git a/sound/weapons/boxing3.ogg b/sound/weapons/boxing3.ogg new file mode 100644 index 00000000000..1f7f3fdc2ef Binary files /dev/null and b/sound/weapons/boxing3.ogg differ diff --git a/sound/weapons/boxing4.ogg b/sound/weapons/boxing4.ogg new file mode 100644 index 00000000000..949e885ae63 Binary files /dev/null and b/sound/weapons/boxing4.ogg differ diff --git a/sound/weapons/boxing5.ogg b/sound/weapons/boxing5.ogg new file mode 100644 index 00000000000..033ec033c66 Binary files /dev/null and b/sound/weapons/boxing5.ogg differ diff --git a/sound/weapons/boxing6.ogg b/sound/weapons/boxing6.ogg new file mode 100644 index 00000000000..4db31d6207e Binary files /dev/null and b/sound/weapons/boxing6.ogg differ