Skip to content

Commit c9f2faf

Browse files
authored
Boxing Gloves sound effects (ParadiseSS13#28361)
* Pow ha ha * you're now general
1 parent 86dd0ce commit c9f2faf

File tree

8 files changed

+3
-1
lines changed

8 files changed

+3
-1
lines changed

code/game/sound.dm

+2
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,8 @@ falloff_distance - Distance at which falloff begins. Sound is at peak volume (in
248248

249249
if("bonebreak")
250250
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')
251+
if("boxing")
252+
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')
251253
if("honkbot_e")
252254
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')
253255
if("smcalm")

code/modules/martial_arts/brawling.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
var/obj/item/organ/external/affecting = D.get_organ(ran_zone(A.zone_selected))
2828
var/armor_block = D.run_armor_check(affecting, MELEE)
2929

30-
playsound(D.loc, 'sound/weapons/punch1.ogg', 25, TRUE, -1)
30+
playsound(D.loc, "boxing", 50, TRUE, -1)
3131

3232
D.visible_message("<span class='danger'>[A] has hit [D] with a [atk_verb]!</span>", \
3333
"<span class='userdanger'>[A] has hit [D] with a [atk_verb]!</span>")

sound/weapons/boxing1.ogg

28.7 KB
Binary file not shown.

sound/weapons/boxing2.ogg

54.1 KB
Binary file not shown.

sound/weapons/boxing3.ogg

33.3 KB
Binary file not shown.

sound/weapons/boxing4.ogg

29.7 KB
Binary file not shown.

sound/weapons/boxing5.ogg

37.7 KB
Binary file not shown.

sound/weapons/boxing6.ogg

42.4 KB
Binary file not shown.

0 commit comments

Comments
 (0)