sound design

shiptest-ss13 · Oct 1, 2024 · 5f429b7 · 5f429b7
1 parent 63852fa
commit 5f429b7
Show file tree

Hide file tree

Showing 46 changed files with 19 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
diff --git a/sound/weapons/melee/blade_hit1.ogg b/sound/weapons/melee/blade_hit1.ogg
diff --git a/sound/weapons/melee/blade_hit2.ogg b/sound/weapons/melee/blade_hit2.ogg
diff --git a/sound/weapons/melee/blade_pickup.ogg b/sound/weapons/melee/blade_pickup.ogg
diff --git a/sound/weapons/melee/blade_pickup2.ogg b/sound/weapons/melee/blade_pickup2.ogg
diff --git a/sound/weapons/melee/general_grip.ogg b/sound/weapons/melee/general_grip.ogg
diff --git a/sound/weapons/melee/general_pickup.ogg b/sound/weapons/melee/general_pickup.ogg
diff --git a/sound/weapons/melee/genericblunt_hit.ogg b/sound/weapons/melee/genericblunt_hit.ogg
diff --git a/sound/weapons/melee/hatchet_hit.ogg b/sound/weapons/melee/hatchet_hit.ogg
diff --git a/sound/weapons/melee/heavy_pickup.ogg b/sound/weapons/melee/heavy_pickup.ogg
diff --git a/sound/weapons/melee/heavyaxe_hit1.ogg b/sound/weapons/melee/heavyaxe_hit1.ogg
diff --git a/sound/weapons/melee/heavyaxe_hit2.ogg b/sound/weapons/melee/heavyaxe_hit2.ogg
diff --git a/sound/weapons/melee/heavyblade_hit.ogg b/sound/weapons/melee/heavyblade_hit.ogg
diff --git a/sound/weapons/melee/heavyblunt_hit1.ogg b/sound/weapons/melee/heavyblunt_hit1.ogg
diff --git a/sound/weapons/melee/heavyblunt_hit2.ogg b/sound/weapons/melee/heavyblunt_hit2.ogg
diff --git a/sound/weapons/melee/heavyblunt_hit3.ogg b/sound/weapons/melee/heavyblunt_hit3.ogg
diff --git a/sound/weapons/melee/heavyblunt_pickup.ogg b/sound/weapons/melee/heavyblunt_pickup.ogg
diff --git a/sound/weapons/melee/knife_hit1.ogg b/sound/weapons/melee/knife_hit1.ogg
diff --git a/sound/weapons/melee/knife_hit2.ogg b/sound/weapons/melee/knife_hit2.ogg
diff --git a/sound/weapons/melee/knife_pickup1.ogg b/sound/weapons/melee/knife_pickup1.ogg
diff --git a/sound/weapons/melee/knife_pickup2.ogg b/sound/weapons/melee/knife_pickup2.ogg
diff --git a/sound/weapons/melee/pipe_hit.ogg b/sound/weapons/melee/pipe_hit.ogg
diff --git a/sound/weapons/melee/plastic_slam.ogg b/sound/weapons/melee/plastic_slam.ogg
diff --git a/sound/weapons/melee/powerfist_hit1.ogg b/sound/weapons/melee/powerfist_hit1.ogg
diff --git a/sound/weapons/melee/powerfist_hit2.ogg b/sound/weapons/melee/powerfist_hit2.ogg
diff --git a/sound/weapons/melee/powerfist_hit3.ogg b/sound/weapons/melee/powerfist_hit3.ogg
diff --git a/sound/weapons/melee/powerfist_pickup.ogg b/sound/weapons/melee/powerfist_pickup.ogg
diff --git a/sound/weapons/melee/punch_1.ogg b/sound/weapons/melee/punch_1.ogg
diff --git a/sound/weapons/melee/punch_2.ogg b/sound/weapons/melee/punch_2.ogg
diff --git a/sound/weapons/melee/punch_3.ogg b/sound/weapons/melee/punch_3.ogg
diff --git a/sound/weapons/melee/ripper_hit1.ogg b/sound/weapons/melee/ripper_hit1.ogg
diff --git a/sound/weapons/melee/ripper_hit2.ogg b/sound/weapons/melee/ripper_hit2.ogg
diff --git a/sound/weapons/melee/ripper_hit3.ogg b/sound/weapons/melee/ripper_hit3.ogg
diff --git a/sound/weapons/melee/saw_loop.ogg b/sound/weapons/melee/saw_loop.ogg
diff --git a/sound/weapons/melee/saw_start.ogg b/sound/weapons/melee/saw_start.ogg
diff --git a/sound/weapons/melee/shishkebab_hit1.ogg b/sound/weapons/melee/shishkebab_hit1.ogg
diff --git a/sound/weapons/melee/shishkebab_hit2.ogg b/sound/weapons/melee/shishkebab_hit2.ogg
diff --git a/sound/weapons/melee/slam.ogg b/sound/weapons/melee/slam.ogg
diff --git a/sound/weapons/melee/stab_hit.ogg b/sound/weapons/melee/stab_hit.ogg
diff --git a/sound/weapons/melee/wooden_hit1.ogg b/sound/weapons/melee/wooden_hit1.ogg
diff --git a/sound/weapons/melee/wooden_hit2.ogg b/sound/weapons/melee/wooden_hit2.ogg
diff --git a/sound/weapons/melee/wooden_hit3.ogg b/sound/weapons/melee/wooden_hit3.ogg
diff --git a/sound/weapons/melee/wooden_pickup.ogg b/sound/weapons/melee/wooden_pickup.ogg