diff --git a/code/game/objects/items/melee/axe.dm b/code/game/objects/items/melee/axe.dm index 6c81add449f7..13e47d448dc4 100644 --- a/code/game/objects/items/melee/axe.dm +++ b/code/game/objects/items/melee/axe.dm @@ -8,7 +8,8 @@ slot_flags = ITEM_SLOT_BACK attack_cooldown = HEAVY_WEAPON_CD attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut") - hitsound = 'sound/weapons/bladeslice.ogg' + hitsound = list('sound/weapons/melee/heavyaxe_hit1.ogg', 'sound/weapons/melee/heavyaxe_hit2.ogg') + pickup_sound = 'sound/weapons/melee/heavy_pickup.ogg' sharpness = IS_SHARP max_integrity = 200 armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 30) @@ -18,7 +19,7 @@ /obj/item/melee/axe/ComponentInitialize() . = ..() - AddComponent(/datum/component/butchering, 100, 80, 0 , hitsound) //axes are not known for being precision butchering tools + AddComponent(/datum/component/butchering, 100, 80, 0 , 'sound/weapons/bladeslice.ogg') //axes are not known for being precision butchering tools AddComponent(/datum/component/two_handed, force_unwielded = force, force_wielded = force_wielded, icon_wielded="[base_icon_state]_w") /obj/item/melee/axe/update_icon_state() diff --git a/code/game/objects/items/melee/melee.dm b/code/game/objects/items/melee/melee.dm index 89f8ad44c07a..325f30c62479 100644 --- a/code/game/objects/items/melee/melee.dm +++ b/code/game/objects/items/melee/melee.dm @@ -196,6 +196,22 @@ else qdel(target) +/obj/item/melee/brass_knuckles + name = "spiked brass knuckles" + desc = "spikey." + icon_state = "powerfist" + item_state = "powerfist" + hitsound = 'sound/weapons/melee/stab_hit.ogg' + pickup_sound = 'sound/weapons/melee/general_pickup.ogg' + flags_1 = CONDUCT_1 + attack_verb = list("punched", "jabed", "clocked", "nailed", "bludgeoned", "whacked", "bonked") + force = 20 + throwforce = 10 + throw_range = 7 + w_class = WEIGHT_CLASS_SMALL + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 40) + resistance_flags = FIRE_PROOF + /obj/item/wirerod name = "wired rod" desc = "A rod with some wire wrapped around the top. It'd be easy to attach something to the top bit." diff --git a/code/game/objects/items/melee/powerfist.dm b/code/game/objects/items/melee/powerfist.dm index 13d1d10230f0..c89f056cbb3f 100644 --- a/code/game/objects/items/melee/powerfist.dm +++ b/code/game/objects/items/melee/powerfist.dm @@ -3,8 +3,6 @@ desc = "A metal gauntlet with a piston-powered ram ontop for that extra 'ompfh' in your punch." icon_state = "powerfist" item_state = "powerfist" - lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' - righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi' flags_1 = CONDUCT_1 attack_verb = list("whacked", "fisted", "power-punched") force = 20 diff --git a/sound/weapons/melee/baton_hit.ogg b/sound/weapons/melee/baton_hit.ogg new file mode 100644 index 000000000000..c27f2c147195 Binary files /dev/null and b/sound/weapons/melee/baton_hit.ogg differ diff --git a/sound/weapons/melee/blade_hit1.ogg b/sound/weapons/melee/blade_hit1.ogg new file mode 100644 index 000000000000..862fd392084e Binary files /dev/null and b/sound/weapons/melee/blade_hit1.ogg differ diff --git a/sound/weapons/melee/blade_hit2.ogg b/sound/weapons/melee/blade_hit2.ogg new file mode 100644 index 000000000000..4b2a41a4f36e Binary files /dev/null and b/sound/weapons/melee/blade_hit2.ogg differ diff --git a/sound/weapons/melee/blade_pickup.ogg b/sound/weapons/melee/blade_pickup.ogg new file mode 100644 index 000000000000..10998e0ff01f Binary files /dev/null and b/sound/weapons/melee/blade_pickup.ogg differ diff --git a/sound/weapons/melee/blade_pickup2.ogg b/sound/weapons/melee/blade_pickup2.ogg new file mode 100644 index 000000000000..33032d900c7a Binary files /dev/null and b/sound/weapons/melee/blade_pickup2.ogg differ diff --git a/sound/weapons/melee/general_grip.ogg b/sound/weapons/melee/general_grip.ogg new file mode 100644 index 000000000000..892de54f16a3 Binary files /dev/null and b/sound/weapons/melee/general_grip.ogg differ diff --git a/sound/weapons/melee/general_pickup.ogg b/sound/weapons/melee/general_pickup.ogg new file mode 100644 index 000000000000..53294457837d Binary files /dev/null and b/sound/weapons/melee/general_pickup.ogg differ diff --git a/sound/weapons/melee/genericblunt_hit.ogg b/sound/weapons/melee/genericblunt_hit.ogg new file mode 100644 index 000000000000..43cc0c133737 Binary files /dev/null and b/sound/weapons/melee/genericblunt_hit.ogg differ diff --git a/sound/weapons/melee/hatchet_hit.ogg b/sound/weapons/melee/hatchet_hit.ogg new file mode 100644 index 000000000000..bb1990e8797a Binary files /dev/null and b/sound/weapons/melee/hatchet_hit.ogg differ diff --git a/sound/weapons/melee/heavy_pickup.ogg b/sound/weapons/melee/heavy_pickup.ogg new file mode 100644 index 000000000000..b26f8043901e Binary files /dev/null and b/sound/weapons/melee/heavy_pickup.ogg differ diff --git a/sound/weapons/melee/heavyaxe_hit1.ogg b/sound/weapons/melee/heavyaxe_hit1.ogg new file mode 100644 index 000000000000..6d8f13f0d35d Binary files /dev/null and b/sound/weapons/melee/heavyaxe_hit1.ogg differ diff --git a/sound/weapons/melee/heavyaxe_hit2.ogg b/sound/weapons/melee/heavyaxe_hit2.ogg new file mode 100644 index 000000000000..595d64c0638c Binary files /dev/null and b/sound/weapons/melee/heavyaxe_hit2.ogg differ diff --git a/sound/weapons/melee/heavyblade_hit.ogg b/sound/weapons/melee/heavyblade_hit.ogg new file mode 100644 index 000000000000..1a13b8c11e03 Binary files /dev/null and b/sound/weapons/melee/heavyblade_hit.ogg differ diff --git a/sound/weapons/melee/heavyblunt_hit1.ogg b/sound/weapons/melee/heavyblunt_hit1.ogg new file mode 100644 index 000000000000..d6f9f117993b Binary files /dev/null and b/sound/weapons/melee/heavyblunt_hit1.ogg differ diff --git a/sound/weapons/melee/heavyblunt_hit2.ogg b/sound/weapons/melee/heavyblunt_hit2.ogg new file mode 100644 index 000000000000..ed2356b3d433 Binary files /dev/null and b/sound/weapons/melee/heavyblunt_hit2.ogg differ diff --git a/sound/weapons/melee/heavyblunt_hit3.ogg b/sound/weapons/melee/heavyblunt_hit3.ogg new file mode 100644 index 000000000000..55bed7988aef Binary files /dev/null and b/sound/weapons/melee/heavyblunt_hit3.ogg differ diff --git a/sound/weapons/melee/heavyblunt_pickup.ogg b/sound/weapons/melee/heavyblunt_pickup.ogg new file mode 100644 index 000000000000..0a498c8817cf Binary files /dev/null and b/sound/weapons/melee/heavyblunt_pickup.ogg differ diff --git a/sound/weapons/melee/knife_hit1.ogg b/sound/weapons/melee/knife_hit1.ogg new file mode 100644 index 000000000000..eb07f43e8103 Binary files /dev/null and b/sound/weapons/melee/knife_hit1.ogg differ diff --git a/sound/weapons/melee/knife_hit2.ogg b/sound/weapons/melee/knife_hit2.ogg new file mode 100644 index 000000000000..e331b0feef27 Binary files /dev/null and b/sound/weapons/melee/knife_hit2.ogg differ diff --git a/sound/weapons/melee/knife_pickup1.ogg b/sound/weapons/melee/knife_pickup1.ogg new file mode 100644 index 000000000000..fbcea960201b Binary files /dev/null and b/sound/weapons/melee/knife_pickup1.ogg differ diff --git a/sound/weapons/melee/knife_pickup2.ogg b/sound/weapons/melee/knife_pickup2.ogg new file mode 100644 index 000000000000..bcaf5c56a0c8 Binary files /dev/null and b/sound/weapons/melee/knife_pickup2.ogg differ diff --git a/sound/weapons/melee/pipe_hit.ogg b/sound/weapons/melee/pipe_hit.ogg new file mode 100644 index 000000000000..2f32b25c643e Binary files /dev/null and b/sound/weapons/melee/pipe_hit.ogg differ diff --git a/sound/weapons/melee/plastic_slam.ogg b/sound/weapons/melee/plastic_slam.ogg new file mode 100644 index 000000000000..aaeab669d9a9 Binary files /dev/null and b/sound/weapons/melee/plastic_slam.ogg differ diff --git a/sound/weapons/melee/powerfist_hit1.ogg b/sound/weapons/melee/powerfist_hit1.ogg new file mode 100644 index 000000000000..edde6357f95e Binary files /dev/null and b/sound/weapons/melee/powerfist_hit1.ogg differ diff --git a/sound/weapons/melee/powerfist_hit2.ogg b/sound/weapons/melee/powerfist_hit2.ogg new file mode 100644 index 000000000000..cee9d0b9488a Binary files /dev/null and b/sound/weapons/melee/powerfist_hit2.ogg differ diff --git a/sound/weapons/melee/powerfist_hit3.ogg b/sound/weapons/melee/powerfist_hit3.ogg new file mode 100644 index 000000000000..c46579acd37b Binary files /dev/null and b/sound/weapons/melee/powerfist_hit3.ogg differ diff --git a/sound/weapons/melee/powerfist_pickup.ogg b/sound/weapons/melee/powerfist_pickup.ogg new file mode 100644 index 000000000000..8c71c2794132 Binary files /dev/null and b/sound/weapons/melee/powerfist_pickup.ogg differ diff --git a/sound/weapons/melee/punch_1.ogg b/sound/weapons/melee/punch_1.ogg new file mode 100644 index 000000000000..c4d7fdf6cff4 Binary files /dev/null and b/sound/weapons/melee/punch_1.ogg differ diff --git a/sound/weapons/melee/punch_2.ogg b/sound/weapons/melee/punch_2.ogg new file mode 100644 index 000000000000..f6f0d1a7da31 Binary files /dev/null and b/sound/weapons/melee/punch_2.ogg differ diff --git a/sound/weapons/melee/punch_3.ogg b/sound/weapons/melee/punch_3.ogg new file mode 100644 index 000000000000..fae73ae1ca19 Binary files /dev/null and b/sound/weapons/melee/punch_3.ogg differ diff --git a/sound/weapons/melee/ripper_hit1.ogg b/sound/weapons/melee/ripper_hit1.ogg new file mode 100644 index 000000000000..e644bff17f9e Binary files /dev/null and b/sound/weapons/melee/ripper_hit1.ogg differ diff --git a/sound/weapons/melee/ripper_hit2.ogg b/sound/weapons/melee/ripper_hit2.ogg new file mode 100644 index 000000000000..ed903d2f8cf0 Binary files /dev/null and b/sound/weapons/melee/ripper_hit2.ogg differ diff --git a/sound/weapons/melee/ripper_hit3.ogg b/sound/weapons/melee/ripper_hit3.ogg new file mode 100644 index 000000000000..095b41d0fb68 Binary files /dev/null and b/sound/weapons/melee/ripper_hit3.ogg differ diff --git a/sound/weapons/melee/saw_loop.ogg b/sound/weapons/melee/saw_loop.ogg new file mode 100644 index 000000000000..58f93c590964 Binary files /dev/null and b/sound/weapons/melee/saw_loop.ogg differ diff --git a/sound/weapons/melee/saw_start.ogg b/sound/weapons/melee/saw_start.ogg new file mode 100644 index 000000000000..69c5857a9bbe Binary files /dev/null and b/sound/weapons/melee/saw_start.ogg differ diff --git a/sound/weapons/melee/shishkebab_hit1.ogg b/sound/weapons/melee/shishkebab_hit1.ogg new file mode 100644 index 000000000000..219d8a143ce7 Binary files /dev/null and b/sound/weapons/melee/shishkebab_hit1.ogg differ diff --git a/sound/weapons/melee/shishkebab_hit2.ogg b/sound/weapons/melee/shishkebab_hit2.ogg new file mode 100644 index 000000000000..ae7cee9e8132 Binary files /dev/null and b/sound/weapons/melee/shishkebab_hit2.ogg differ diff --git a/sound/weapons/melee/slam.ogg b/sound/weapons/melee/slam.ogg new file mode 100644 index 000000000000..1696dc8a50f9 Binary files /dev/null and b/sound/weapons/melee/slam.ogg differ diff --git a/sound/weapons/melee/stab_hit.ogg b/sound/weapons/melee/stab_hit.ogg new file mode 100644 index 000000000000..22f275745e60 Binary files /dev/null and b/sound/weapons/melee/stab_hit.ogg differ diff --git a/sound/weapons/melee/wooden_hit1.ogg b/sound/weapons/melee/wooden_hit1.ogg new file mode 100644 index 000000000000..fcb05d0675dd Binary files /dev/null and b/sound/weapons/melee/wooden_hit1.ogg differ diff --git a/sound/weapons/melee/wooden_hit2.ogg b/sound/weapons/melee/wooden_hit2.ogg new file mode 100644 index 000000000000..69d1bbcf600f Binary files /dev/null and b/sound/weapons/melee/wooden_hit2.ogg differ diff --git a/sound/weapons/melee/wooden_hit3.ogg b/sound/weapons/melee/wooden_hit3.ogg new file mode 100644 index 000000000000..3c7e322028aa Binary files /dev/null and b/sound/weapons/melee/wooden_hit3.ogg differ diff --git a/sound/weapons/melee/wooden_pickup.ogg b/sound/weapons/melee/wooden_pickup.ogg new file mode 100644 index 000000000000..66a53a4af043 Binary files /dev/null and b/sound/weapons/melee/wooden_pickup.ogg differ