From 0d9da06677564a2511961b151b92bed44121320e Mon Sep 17 00:00:00 2001 From: "johnsonmt88@gmail.com" Date: Wed, 29 Aug 2012 16:04:23 +0000 Subject: [PATCH] Added an attack sound to: Glass shard Broken bottle Sord/Claymore/Katana Cult blade Kitchen knife/Butcher's cleaver Nettle/Death nettle Hatchet Thank you carn for testing this for me :) git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4580 316c924e-a436-60f5-8080-3fe189b3f50e --- code/defines/obj/weapon.dm | 24 ++++++++++++++++++- code/game/gamemodes/cult/cult_items.dm | 1 + .../game/objects/items/weapons/hydroponics.dm | 3 +++ code/game/objects/items/weapons/kitchen.dm | 1 + .../reagent_containers/food/drinks/bottle.dm | 4 +++- 5 files changed, 31 insertions(+), 2 deletions(-) diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index d810d247e34..8a8fdf58f63 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -75,6 +75,10 @@ w_class = 3 attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") +/obj/item/weapon/sord/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) + playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1) + return ..() + /obj/item/weapon/claymore name = "claymore" desc = "What are you standing around staring at this for? Get to killing!" @@ -90,6 +94,10 @@ IsShield() return 1 +/obj/item/weapon/claymore/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) + playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1) + return ..() + /obj/item/weapon/katana name = "katana" desc = "Woefully underpowered in D20" @@ -102,9 +110,12 @@ w_class = 3 attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") - IsShield() +/obj/item/weapon/katana/IsShield() return 1 +/obj/item/weapon/katana/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) + playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1) + return ..() /obj/item/weapon/bodybag name = "body bag" @@ -1008,6 +1019,10 @@ g_amt = 3750 attack_verb = list("stabbed", "slashed", "sliced", "cut") +/obj/item/weapon/shard/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) + playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1) + return ..() + /*/obj/item/weapon/syndicate_uplink name = "station bounced radio" desc = "Remain silent about this..." @@ -1365,6 +1380,10 @@ origin_tech = "materials=1" attack_verb = list("cleaved", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") +/obj/item/weapon/butch/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) + playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1) + return ..() + /obj/item/weapon/tray name = "tray" icon = 'icons/obj/food.dmi' @@ -1533,6 +1552,9 @@ origin_tech = "materials=2;combat=1" attack_verb = list("chopped", "torn", "cut") +/obj/item/weapon/hatchet/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) + playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1) + return ..() /* /obj/item/weapon/cigarpacket diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index 85a2b924366..26bf308cdc7 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -12,6 +12,7 @@ /obj/item/weapon/melee/cultblade/attack(mob/living/target as mob, mob/living/carbon/human/user as mob) if(iscultist(user)) + playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1) return ..() else user.Paralyse(5) diff --git a/code/game/objects/items/weapons/hydroponics.dm b/code/game/objects/items/weapons/hydroponics.dm index 87d592a1e9e..a6699b41966 100644 --- a/code/game/objects/items/weapons/hydroponics.dm +++ b/code/game/objects/items/weapons/hydroponics.dm @@ -65,6 +65,7 @@ /obj/item/weapon/grown/nettle/afterattack(atom/A as mob|obj, mob/user as mob) if(force > 0) force -= rand(1,(force/3)+1) // When you whack someone with it, leaves fall off + playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1) else usr << "All the leaves have fallen off the nettle from violent whacking." del(src) @@ -99,6 +100,8 @@ log_attack(" [user.name] ([user.ckey]) used the [src.name] on [M.name] ([M.ckey])") + playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1) + M.eye_blurry += force/7 if(prob(20)) M.Paralyse(force/6) diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm index 0b2c869cc3a..3a6a4d434f7 100644 --- a/code/game/objects/items/weapons/kitchen.dm +++ b/code/game/objects/items/weapons/kitchen.dm @@ -50,6 +50,7 @@ user << "\red You accidentally cut yourself with the [src]." user.take_organ_damage(20) return + playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1) return ..() /* diff --git a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm index 3b69fe71e25..62558a8d243 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm @@ -128,7 +128,9 @@ attack_verb = list("stabbed", "slashed", "attacked") var/icon/broken_outline = icon('icons/obj/drinks.dmi', "broken") - +/obj/item/weapon/broken_bottle/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) + playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1) + return ..() /obj/item/weapon/reagent_containers/food/drinks/bottle/gin