Skip to content

Commit

Permalink
Boxing Gloves sound effects (#28361)
Browse files Browse the repository at this point in the history
* Pow ha ha

* you're now general
  • Loading branch information
Vi3trice authored Mar 5, 2025
1 parent 86dd0ce commit c9f2faf
Show file tree
Hide file tree
Showing 8 changed files with 3 additions and 1 deletion.
2 changes: 2 additions & 0 deletions code/game/sound.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion code/modules/martial_arts/brawling.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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("<span class='danger'>[A] has hit [D] with a [atk_verb]!</span>", \
"<span class='userdanger'>[A] has hit [D] with a [atk_verb]!</span>")
Expand Down
Binary file added sound/weapons/boxing1.ogg
Binary file not shown.
Binary file added sound/weapons/boxing2.ogg
Binary file not shown.
Binary file added sound/weapons/boxing3.ogg
Binary file not shown.
Binary file added sound/weapons/boxing4.ogg
Binary file not shown.
Binary file added sound/weapons/boxing5.ogg
Binary file not shown.
Binary file added sound/weapons/boxing6.ogg
Binary file not shown.

0 comments on commit c9f2faf

Please sign in to comment.