More new sounds and fixes equip sounds (#9464)

code/modules/reagents/reagent_containers/dropper.dm

@@ -13,8 +13,8 @@
 	w_class = ITEMSIZE_TINY
 	slot_flags = SLOT_EARS
 	volume = 5
-	drop_sound = 'sound/items/drop/glass.ogg'
-	pickup_sound = 'sound/items/pickup/glass.ogg'
+	drop_sound = 'sound/items/drop/glass_small.ogg'
+	pickup_sound = 'sound/items/pickup/glass_small.ogg'
 
 /obj/item/reagent_containers/dropper/afterattack(var/obj/target, var/mob/user, var/flag)
 	if(!target.reagents || !flag)

code/modules/reagents/reagent_containers/food/drinks.dm

@@ -325,8 +325,8 @@ If you add a drink with no empty icon sprite, ensure it is flagged as NO_EMPTY_I
 	desc = "A plastic medicine cup. Like a shot glass for medicine."
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "medcup"
-	drop_sound = 'sound/items/drop/glass.ogg'
-	pickup_sound = 'sound/items/pickup/glass.ogg'
+	drop_sound = 'sound/items/drop/drinkglass.ogg'
+	pickup_sound = 'sound/items/pickup/drinkglass.ogg'
 	possible_transfer_amounts = null
 	volume = 15
 

code/modules/reagents/reagent_containers/food/drinks/bottle.dm

@@ -68,7 +68,7 @@
 		var/mob/living/L = against
 		L.IgniteMob()
 
-	playsound(src, "shatter", 70, 1)
+	playsound(src, "glass_break", 70, 1)
 	src.transfer_fingerprints_to(B)
 
 	qdel(src)
@@ -165,29 +165,22 @@
 
 //Keeping this here for now, I'll ask if I should keep it here.
 /obj/item/broken_bottle
-
 	name = "broken bottle"
 	desc = "A bottle with a sharp broken bottom."
 	icon = 'icons/obj/drinks.dmi'
 	icon_state = "broken_bottle"
-	drop_sound = 'sound/items/drop/glass.ogg'
-	pickup_sound = 'sound/items/pickup/glass.ogg'
 	force = 9
 	throwforce = 5
 	throw_speed = 3
 	throw_range = 5
 	item_state = "beer"
 	attack_verb = list("stabbed", "slashed", "attacked")
-	sharp = 1
-	edge = 0
+	sharp = TRUE
+	edge = FALSE
+	hitsound = 'sound/weapons/bladeslice.ogg'
 	var/icon/broken_outline = icon('icons/obj/drinks.dmi', "broken")
 	w_class = 2
 
-/obj/item/broken_bottle/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob, var/target_zone)
-	playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1)
-	return ..()
-
-
 /obj/item/reagent_containers/food/drinks/bottle/gin
 	name = "Griffeater gin"
 	desc = "A bottle of high quality gin, produced in the New London Space Station."

code/modules/reagents/reagent_containers/glass.dm

@@ -62,7 +62,7 @@
 	if(reagents.total_volume)
 		reagents.splash(src.loc, reagents.total_volume) // splashes the mob holding it or the turf it's on
 	audible_message(SPAN_WARNING("\The [src] shatters with a resounding crash!"), SPAN_WARNING("\The [src] breaks."))
-	playsound(src, "shatter", 70, 1)
+	playsound(src, "glass_break", 70, 1)
 	new /obj/item/material/shard(loc, "glass")
 	qdel(src)
 
@@ -102,8 +102,8 @@
 	item_state = "beaker"
 	center_of_mass = list("x" = 15,"y" = 11)
 	matter = list(MATERIAL_GLASS = 500)
-	drop_sound = 'sound/items/drop/glass.ogg'
-	pickup_sound = 'sound/items/pickup/glass.ogg'
+	drop_sound = 'sound/items/drop/drinkglass.ogg'
+	pickup_sound = 'sound/items/pickup/drinkglass.ogg'
 	fragile = 4
 
 /obj/item/reagent_containers/glass/beaker/Initialize()

code/modules/reagents/reagent_containers/spray.dm

@@ -31,7 +31,7 @@
 /obj/item/reagent_containers/spray/AltClick()
 	if(!usr || usr.stat || usr.lying || usr.restrained() || !Adjacent(usr))	return
 	safety = !safety
-	playsound(src.loc, 'sound/weapons/empty.ogg', 50, 1)
+	playsound(src.loc, 'sound/weapons/safety_click.ogg', 50, 1)
 	to_chat(usr, "<span class = 'notice'>You twist the locking cap on the end of the nozzle. \The [src] is now [safety ? "locked" : "unlocked"].</span>")
 
 
@@ -61,7 +61,7 @@
 		return
 
 	if(safety)
-		playsound(src.loc, 'sound/weapons/empty.ogg', 25, 1)
+		playsound(src.loc, 'sound/weapons/safety_click.ogg', 25, 1)
 		to_chat(user, "<span class='notice'>The safety is on!</span>")
 		return
 
@@ -159,7 +159,6 @@
 	possible_transfer_amounts = null
 	volume = 40
 	safety = 1
-	hitsound = "swing_hit"
 	reagents_to_add = list(/datum/reagent/capsaicin/condensed = 40)
 
 /obj/item/reagent_containers/spray/pepper/examine(mob/user)
@@ -172,7 +171,7 @@
 /obj/item/reagent_containers/spray/pepper/attack_self(var/mob/user)
 	safety = !safety
 	to_chat(user, "<span class = 'notice'>You switch the safety [safety ? "on" : "off"].</span>")
-	playsound(src.loc, 'sound/weapons/empty.ogg', 50, 1)
+	playsound(src.loc, 'sound/weapons/safety_click.ogg', 50, 1)
 
 /obj/item/reagent_containers/spray/waterflower
 	name = "water flower"

code/modules/reagents/reagent_containers/syringes.dm

@@ -36,8 +36,8 @@
 	var/visible_name = "a syringe"
 	var/time = 30
 	center_of_mass = null
-	drop_sound = 'sound/items/drop/glass.ogg'
-	pickup_sound = 'sound/items/pickup/glass.ogg'
+	drop_sound = 'sound/items/drop/glass_small.ogg'
+	pickup_sound = 'sound/items/pickup/glass_small.ogg'
 
 /obj/item/reagent_containers/syringe/Initialize()
 	. = ..()