High shovel (#31755)

* High shovel

* High spear...

* Fixes sound code

* Fixes file path

* Removes var

Co-authored-by: kanef <kanef9x@protonmail.com>

code/datums/gamemode/factions/bloodcult/bloodcult_items.dm

@@ -965,7 +965,7 @@ var/list/arcane_tomes = list()
 		playsound(loc, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1)
 		qdel(src)
 	else
-		playsound(loc, 'sound/items/trayhit1.ogg', 70, 1)
+		playsound(loc, "trayhit", 70, 1)
 
 /obj/item/weapon/melee/soulblade/Cross(var/atom/movable/mover, var/turf/target, var/height=1.5, var/air_group = 0)
 	if(istype(mover, /obj/item/projectile))

code/game/objects/items/weapons/butterfly.dm

@@ -108,7 +108,7 @@
 	desc = "A small box that rapidly assembles shaudy, barely working wind-up toys."
 	icon = 'icons/obj/butterfly.dmi'
 	icon_state = "Bflyknife_toy"
-	hitsound = "sound/items/trayhit1.ogg"
+	hitsound = "trayhit"
 	sharpness = 0
 	sharpness_flags = 0
 	w_class = W_CLASS_SMALL

code/game/objects/items/weapons/kitchen.dm

@@ -530,12 +530,8 @@
 		M.Knockdown(1)
 		M.Stun(1)
 		user.take_organ_damage(2)
-		if(prob(50))
-			playsound(M, 'sound/items/trayhit1.ogg', 50, 1)
-			return
-		else
-			playsound(M, 'sound/items/trayhit2.ogg', 50, 1) //sound playin'
-			return //it always returns, but I feel like adding an extra return just for safety's sakes. EDIT; Oh well I won't :3
+		playsound(M, "trayhit", 50, 1) //sound playin'
+		return //it always returns, but I feel like adding an extra return just for safety's sakes. EDIT; Oh well I won't :3
 
 	var/mob/living/carbon/human/H = M      ///////////////////////////////////// /Let's have this ready for later.
 
@@ -563,16 +559,10 @@
 			M.take_organ_damage(3)
 		else
 			M.take_organ_damage(5)
-		if(prob(50))
-			playsound(M, 'sound/items/trayhit1.ogg', 50, 1)
-			for(var/mob/O in viewers(M, null))
-				O.show_message(text("<span class='danger'>[] slams [] with the tray!</span>", user, M), 1)
-			return
-		else
-			playsound(M, 'sound/items/trayhit2.ogg', 50, 1)  //we applied the damage, we played the sound, we showed the appropriate messages. Time to return and stop the proc
-			for(var/mob/O in viewers(M, null))
-				O.show_message(text("<span class='danger'>[] slams [] with the tray!</span>", user, M), 1)
-			return
+		playsound(M, "trayhit", 50, 1)  //we applied the damage, we played the sound, we showed the appropriate messages. Time to return and stop the proc
+		for(var/mob/O in viewers(M, null))
+			O.show_message(text("<span class='danger'>[] slams [] with the tray!</span>", user, M), 1)
+		return
 
 
 
@@ -591,14 +581,9 @@
 			if (istype(location, /turf/simulated))     //Addin' blood! At least on the floor and item :v
 				location.add_blood(H)
 
-		if(prob(50))
-			playsound(M, 'sound/items/trayhit1.ogg', 50, 1)
-			for(var/mob/O in viewers(M, null))
-				O.show_message(text("<span class='danger'>[] slams [] with the tray!</span>", user, M), 1)
-		else
-			playsound(M, 'sound/items/trayhit2.ogg', 50, 1)  //sound playin'
-			for(var/mob/O in viewers(M, null))
-				O.show_message(text("<span class='danger'>[] slams [] with the tray!</span>", user, M), 1)
+		playsound(M, "trayhit", 50, 1)  //sound playin'
+		for(var/mob/O in viewers(M, null))
+			O.show_message(text("<span class='danger'>[] slams [] with the tray!</span>", user, M), 1)
 		if(prob(10))
 			M.Stun(rand(1,3))
 			M.take_organ_damage(3)
@@ -615,14 +600,9 @@
 			if (istype(location, /turf/simulated))
 				location.add_blood(H)
 
-		if(prob(50))
-			playsound(M, 'sound/items/trayhit1.ogg', 50, 1)
-			for(var/mob/O in viewers(M, null))
-				O.show_message(text("<span class='danger'>[] slams [] in the face with the tray!</span>", user, M), 1)
-		else
-			playsound(M, 'sound/items/trayhit2.ogg', 50, 1)  //sound playin' again
-			for(var/mob/O in viewers(M, null))
-				O.show_message(text("<span class='danger'>[] slams [] in the face with the tray!</span>", user, M), 1)
+		playsound(M, "trayhit", 50, 1)  //sound playin' again
+		for(var/mob/O in viewers(M, null))
+			O.show_message(text("<span class='danger'>[] slams [] in the face with the tray!</span>", user, M), 1)
 		if(prob(30))
 			M.Stun(rand(2,4))
 			M.take_organ_damage(4)
@@ -761,8 +741,5 @@
 				step(I, pick(alldirs))
 
 /obj/item/weapon/tray/proc/whoops()
-	if(prob(50))
-		playsound(src, 'sound/items/trayhit1.ogg', 35, 1)
-	else
-		playsound(src, 'sound/items/trayhit2.ogg', 35, 1)
+	playsound(src, "trayhit", 35, 1)
 	send_items_flying()

code/game/objects/items/weapons/twohanded.dm

@@ -190,6 +190,19 @@
 		var/obj/structure/headpole/H = new (get_turf(src), W, src)
 		user.drop_item(W, H, force_drop = 1)
 
+/obj/item/weapon/spear/attack(var/mob/living/M, var/mob/user)
+	var/obj/item/I
+	if(user.zone_sel.selecting == "l_hand")
+		I = M.get_held_item_by_index(GRASP_LEFT_HAND)
+	else if(user.zone_sel.selecting == "r_hand")
+		I = M.get_held_item_by_index(GRASP_RIGHT_HAND)
+	if(I && istype(I,src.type) && user.a_intent == I_HELP)
+		playsound(get_turf(user), 'sound/weapons/Genhit.ogg', 50, 1)
+		visible_message("<span class='bad'>[user] high spears [M], but it feels too similar to doing it with a shovel, and isn't good.</span>",\
+						"<span class='bad'>You high spear [M], but it feels too similar to doing it with a shovel, and isn't good.</span>")
+	else
+		..()
+
 /obj/item/weapon/spear/wooden
 	name = "steel spear"
 	desc = "An ancient weapon of an ancient design, with a smooth wooden handle and a sharp steel blade."

code/game/objects/structures/stool_bed_chair_nest/chairs.dm

@@ -581,7 +581,7 @@
 	..()
 
 /obj/item/folding_chair/on_attack(atom/attacked, mob/user)
-	hitsound = pick('sound/items/trayhit1.ogg', 'sound/items/trayhit2.ogg')
+	hitsound = "trayhit"
 	..()
 
 /obj/item/folding_chair/attack_self(mob/user)

code/game/objects/structures/tables_racks.dm

@@ -356,10 +356,7 @@
 		M.adjustBrainLoss(5)
 		M.Knockdown(1)
 		M.Stun(1)
-		if (prob(50))
-			playsound(M, 'sound/items/trayhit1.ogg', 50, 1)
-		else
-			playsound(M, 'sound/items/trayhit2.ogg', 50, 1)
+		playsound(M, "trayhit", 50, 1)
 		M.visible_message("<span class='danger'>[user] bangs \his head on \the [src].</span>", "<span class='danger'>You bang your head on \the [src].</span>", "You hear a bang.")
 		return
 	return ..()

code/game/sound.dm

@@ -38,6 +38,7 @@ var/list/jingle_sound = list('sound/items/jinglebell1.ogg', 'sound/items/jingleb
 var/list/disappear_sound = list('sound/effects/disappear_1.ogg', 'sound/effects/disappear_2.ogg', 'sound/effects/disappear_3.ogg')
 var/list/pd_wail_sound = list('sound/voice/pdwail1.ogg', 'sound/voice/pdwail2.ogg', 'sound/voice/pdwail3.ogg')
 var/list/procgun_sound = list('sound/weapons/procgun1.ogg', 'sound/weapons/procgun2.ogg')
+var/list/trayhit_sound = list('sound/items/trayhit1.ogg', 'sound/items/trayhit2.ogg')
 //var/list/gun_sound = list('sound/weapons/Gunshot.ogg', 'sound/weapons/Gunshot2.ogg','sound/weapons/Gunshot3.ogg','sound/weapons/Gunshot4.ogg')
 
 //gas_modified controls if a sound is affected by how much gas there is in the atmosphere of the source
@@ -242,5 +243,7 @@ var/const/SURROUND_CAP = 7
 				soundin = pick(pd_wail_sound)
 			if ("procgun_sound")
 				soundin = pick(procgun_sound)
+			if ("trayhit")
+				soundin = pick(trayhit_sound)
 			//if ("gunshot") soundin = pick(gun_sound)
 	return soundin

code/modules/mining/mine_items.dm

@@ -397,6 +397,18 @@ proc/move_mining_shuttle()
 	toolspeed = 0.4
 	diggables = DIG_SOIL //soil only
 
+/obj/item/weapon/pickaxe/shovel/attack(var/mob/living/M, var/mob/user)
+	var/obj/item/I
+	if(user.zone_sel.selecting == "l_hand")
+		I = M.get_held_item_by_index(GRASP_LEFT_HAND)
+	else if(user.zone_sel.selecting == "r_hand")
+		I = M.get_held_item_by_index(GRASP_RIGHT_HAND)
+	if(I && istype(I,src.type) && user.a_intent == I_HELP)
+		playsound(get_turf(user), "trayhit", 50, 1)
+		visible_message("<span class='notice'>[user] high shovels [M].</span>", "<span class='notice'>You high shovel [M].</span>")
+	else
+		..()
+
 /obj/item/weapon/pickaxe/shovel/spade
 	name = "spade"
 	desc = "A small tool for digging and moving dirt."

code/modules/mob/living/carbon/combat.dm

@@ -154,7 +154,7 @@
 		if(!throwing)
 			isTackling = FALSE	//Safety from throw_at being a jerk
 		else
-			playsound(src, 'sound/items/trayhit1.ogg', 75, 1)
+			playsound(src, "trayhit", 75, 1)
 			var/tPain = rand(5,15)
 			adjustBruteLoss(tPain)
 			Knockdown(tPain/2)

code/modules/mob/living/simple_animal/hostile/viscerator.dm

@@ -129,7 +129,7 @@
 	maxHealth = 45
 	melee_damage_lower = 0
 	melee_damage_upper = 1 //Aaahhh my toe
-	attack_sound = "sound/items/trayhit2.ogg"
+	attack_sound = "trayhit"
 	speak_emote = list("whirrs")
 	emote_hear = list("whirrs")
 	emote_see = list("whirrs")