From d31b159813a5844d4441c701992be749b62bd402 Mon Sep 17 00:00:00 2001 From: Arkatos1 Date: Sun, 21 Apr 2019 20:25:14 +0200 Subject: [PATCH 1/2] Added bola throw sound, sound equality across all bolas --- code/game/objects/items/weapons/legcuffs.dm | 6 ++++++ sound/weapons/bolathrow.ogg | Bin 0 -> 10572 bytes 2 files changed, 6 insertions(+) create mode 100644 sound/weapons/bolathrow.ogg diff --git a/code/game/objects/items/weapons/legcuffs.dm b/code/game/objects/items/weapons/legcuffs.dm index 297966525f0..c46d15f89f3 100644 --- a/code/game/objects/items/weapons/legcuffs.dm +++ b/code/game/objects/items/weapons/legcuffs.dm @@ -154,6 +154,11 @@ origin_tech = "engineering=3;combat=1" var/weaken = 0 +/obj/item/restraints/legcuffs/bola/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback) + playsound(src.loc,'sound/weapons/bolathrow.ogg', 75, TRUE) + if(!..()) + return + /obj/item/restraints/legcuffs/bola/throw_impact(atom/hit_atom) if(..() || !iscarbon(hit_atom))//if it gets caught or the target can't be cuffed, return//abort @@ -166,6 +171,7 @@ feedback_add_details("handcuffs","B") to_chat(C, "[src] ensnares you!") C.Weaken(weaken) + playsound(src.loc, 'sound/effects/snap.ogg', 50, TRUE) /obj/item/restraints/legcuffs/bola/tactical //traitor variant name = "reinforced bola" diff --git a/sound/weapons/bolathrow.ogg b/sound/weapons/bolathrow.ogg new file mode 100644 index 0000000000000000000000000000000000000000..9a7b78fb67f9b2bd9598da8e2fb2d5a96cfe63b0 GIT binary patch literal 10572 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 literal 0 HcmV?d00001 From 8d79486d3ab106f5efde4a2e34e1bde4fb863c5f Mon Sep 17 00:00:00 2001 From: Arkatos1 Date: Wed, 24 Apr 2019 16:29:22 +0200 Subject: [PATCH 2/2] Code review fixes --- code/game/objects/items/weapons/legcuffs.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/legcuffs.dm b/code/game/objects/items/weapons/legcuffs.dm index c46d15f89f3..66e0ba6b110 100644 --- a/code/game/objects/items/weapons/legcuffs.dm +++ b/code/game/objects/items/weapons/legcuffs.dm @@ -152,10 +152,11 @@ breakouttime = 35//easy to apply, easy to break out of gender = NEUTER origin_tech = "engineering=3;combat=1" + hitsound = 'sound/effects/snap.ogg' var/weaken = 0 /obj/item/restraints/legcuffs/bola/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback) - playsound(src.loc,'sound/weapons/bolathrow.ogg', 75, TRUE) + playsound(loc,'sound/weapons/bolathrow.ogg', 50, TRUE) if(!..()) return @@ -171,7 +172,7 @@ feedback_add_details("handcuffs","B") to_chat(C, "[src] ensnares you!") C.Weaken(weaken) - playsound(src.loc, 'sound/effects/snap.ogg', 50, TRUE) + playsound(loc, hitsound, 50, TRUE) /obj/item/restraints/legcuffs/bola/tactical //traitor variant name = "reinforced bola"