Big Bastard Incidental Sound Port

2026-07-21 03:56:47 +01:00 · 2020-03-15 11:38:44 -07:00
parent 08a9fcf0f2
commit 8d2b41ad2c
179 changed files with 380 additions and 29 deletions
@@ -92,6 +92,8 @@
 	var/icon/default_worn_icon	//Default on-mob icon
 	var/worn_layer				//Default on-mob layer

+	var/drop_sound = 'sound/items/drop/device.ogg' // drop sound - this is the default
+
 /obj/item/New()
 	..()
 	if(embed_chance < 0)
@@ -274,6 +276,11 @@
 /obj/item/proc/moved(mob/user as mob, old_loc as turf)
 	return

+/obj/item/throw_impact(atom/hit_atom)
+	..()
+	if(drop_sound)
+		playsound(src, drop_sound, 50, 0, preference = /datum/client_preference/drop_sounds)
+
 // apparently called whenever an item is removed from a slot, container, or anything else.
 /obj/item/proc/dropped(mob/user as mob)
 	..()
@@ -1054,6 +1054,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 			var/mob/M = loc
 			M.put_in_hands(id)
 			to_chat(usr, "<span class='notice'>You remove the ID from the [name].</span>")
+			playsound(loc, 'sound/machines/id_swipe.ogg', 100, 1)
 		else
 			id.loc = get_turf(src)
 		id = null
@@ -1260,6 +1261,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	if (cartridge.radio)
 		cartridge.radio.hostpda = null
 	to_chat(usr, "<span class='notice'>You remove \the [cartridge] from the [name].</span>")
+	playsound(loc, 'sound/machines/id_swipe.ogg', 100, 1)
 	cartridge = null

 /obj/item/device/pda/proc/id_check(mob/user as mob, choice as num)//To check for IDs; 1 for in-pda use, 2 for out of pda use.
@@ -10,6 +10,7 @@
 	var/heal_brute = 0
 	var/heal_burn = 0
 	var/apply_sounds
+	drop_sound = 'sound/items/drop/box.ogg'

 	var/upgrade_to	// The type path this stack can be upgraded to.

@@ -143,6 +144,7 @@
 	origin_tech = list(TECH_BIO = 1)
 	no_variants = FALSE
 	apply_sounds = list('sound/effects/rip1.ogg','sound/effects/rip2.ogg')
+	drop_sound = 'sound/items/drop/gloves.ogg'

 	upgrade_to = /obj/item/stack/medical/advanced/bruise_pack

@@ -212,6 +214,7 @@
 	origin_tech = list(TECH_BIO = 1)
 	no_variants = FALSE
 	apply_sounds = list('sound/effects/ointment.ogg')
+	drop_sound = 'sound/items/drop/herb.ogg'

 /obj/item/stack/medical/ointment/attack(mob/living/carbon/M as mob, mob/user as mob)
 	if(..())
@@ -354,6 +357,7 @@
 	icon_state = "splint"
 	amount = 5
 	max_amount = 5
+	drop_sound = 'sound/items/drop/hat.ogg'

 	var/list/splintable_organs = list(BP_HEAD, BP_L_HAND, BP_R_HAND, BP_L_ARM, BP_R_ARM, BP_L_FOOT, BP_R_FOOT, BP_L_LEG, BP_R_LEG, BP_GROIN, BP_TORSO)	//List of organs you can splint, natch.

@@ -16,6 +16,7 @@
 	icon_state = "sheet-glass"
 	var/is_reinforced = 0
 	default_type = "glass"
+	drop_sound = 'sound/items/drop/glass.ogg'

 /obj/item/stack/material/glass/attack_self(mob/user as mob)
 	construct_window(user)
@@ -4,6 +4,7 @@
 	singular_name = "human skin piece"
 	icon_state = "sheet-hide"
 	no_variants = FALSE
+	drop_sound = 'sound/items/drop/clothing.ogg'

 /obj/item/stack/material/animalhide/human
 	amount = 50
@@ -17,6 +17,7 @@
 	randpixel = 7
 	w_class = ITEMSIZE_NORMAL
 	max_amount = 60
+	drop_sound = 'sound/items/drop/axe.ogg'

 /obj/item/stack/tile/New()
 	..()
@@ -37,6 +38,7 @@
 	flags = 0
 	origin_tech = list(TECH_BIO = 1)
 	no_variants = FALSE
+	drop_sound = 'sound/items/drop/herb.ogg'
 /*
 * Wood
 */
@@ -51,6 +53,7 @@
 	throw_range = 20
 	flags = 0
 	no_variants = FALSE
+	drop_sound = 'sound/items/drop/wooden.ogg'

 /obj/item/stack/tile/wood/sif
 	name = "alien wood tile"
@@ -80,6 +83,7 @@
 	throw_range = 20
 	flags = 0
 	no_variants = FALSE
+	drop_sound = 'sound/items/drop/clothing.ogg'

 /obj/item/stack/tile/carpet/teal
 	name = "teal carpet"
@@ -26,6 +26,7 @@
 	throw_speed = 4
 	throw_range = 20
 	force = 0
+	drop_sound = 'sound/items/drop/gloves.ogg'


 /*
@@ -36,6 +37,7 @@
 	desc = "A translucent balloon. There's nothing in it."
 	icon = 'icons/obj/toy.dmi'
 	icon_state = "waterballoon-e"
+	drop_sound = 'sound/items/drop/rubber.ogg'

 /obj/item/toy/balloon/New()
 	var/datum/reagents/R = new/datum/reagents(10)
@@ -99,6 +101,7 @@
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "syndballoon"
 	w_class = ITEMSIZE_LARGE
+	drop_sound = 'sound/items/drop/rubber.ogg'

 /obj/item/toy/nanotrasenballoon
 	name = "criminal balloon"
@@ -110,6 +113,7 @@
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "ntballoon"
 	w_class = ITEMSIZE_LARGE
+	drop_sound = 'sound/items/drop/rubber.ogg'

 /*
 * Fake telebeacon
@@ -147,6 +151,7 @@
 	w_class = ITEMSIZE_SMALL
 	attack_verb = list("attacked", "struck", "hit")
 	var/bullets = 5
+	drop_sound = 'sound/items/drop/gun.ogg'

 	examine(mob/user)
 		if(..(user, 2) && bullets)
@@ -239,6 +244,7 @@
 	icon_state = "foamdart"
 	w_class = ITEMSIZE_TINY
 	slot_flags = SLOT_EARS
+	drop_sound = 'sound/items/drop/food.ogg'

 /obj/effect/foam_dart_dummy
 	name = ""
@@ -256,6 +262,7 @@
 	desc = "A cheap, plastic replica of an energy sword. Realistic sounds! Ages 8 and up."
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "esword"
+	drop_sound = 'sound/items/drop/gun.ogg'
 	var/lcolor
 	var/rainbow = FALSE
 	item_icons = list(
@@ -344,6 +351,7 @@
 	icon = 'icons/obj/toy.dmi'
 	icon_state = "snappop"
 	w_class = ITEMSIZE_TINY
+	drop_sound = null

 	throw_impact(atom/hit_atom)
 		..()
@@ -378,6 +386,7 @@
 	name = "water flower"
 	desc = "A seemingly innocent sunflower...with a twist."
 	icon = 'icons/obj/device.dmi'
+	drop_sound = 'sound/items/drop/food.ogg'
 	icon_state = "sunflower"
 	item_state = "sunflower"
 	var/empty = 0
@@ -448,6 +457,7 @@
 	desc = "A genuine Admiral Krush Bosun's Whistle, for the aspiring ship's captain! Suitable for ages 8 and up, do not swallow."
 	icon = 'icons/obj/toy.dmi'
 	icon_state = "bosunwhistle"
+	drop_sound = 'sound/items/drop/card.ogg'
 	var/cooldown = 0
 	w_class = ITEMSIZE_TINY
 	slot_flags = SLOT_EARS | SLOT_HOLSTER
@@ -465,6 +475,7 @@
 	icon = 'icons/obj/toy.dmi'
 	icon_state = "ripleytoy"
 	var/cooldown = 0
+	drop_sound = 'sound/mecha/mechstep.ogg'

 //all credit to skasi for toy mech fun ideas
 /obj/item/toy/prize/attack_self(mob/user as mob)
@@ -546,6 +557,7 @@
 	icon_state = "nuketoy"
 	var/cooldown = 0
 	var/toysay = "What the fuck did you do?"
+	drop_sound = 'sound/items/drop/accessory.ogg'

 /obj/item/toy/figure/New()
 	..()
@@ -879,14 +891,14 @@
 	var/searching = FALSE
 	var/opened = FALSE	// has this been slit open? this will allow you to store an object in a plushie.
 	var/obj/item/stored_item	// Note: Stored items can't be bigger than the plushie itself.
-	
+
 /obj/structure/plushie/examine(mob/user)
 	..()
 	if(opened)
 		to_chat(user, "<i>You notice an incision has been made on [src].</i>")
 		if(in_range(user, src) && stored_item)
 			to_chat(user, "<i>You can see something in there...</i>")
-			
+
 /obj/structure/plushie/attack_hand(mob/user)
 	user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)

@@ -900,7 +912,7 @@
 			return
 		else
 			searching = FALSE
-			
+
 	if(user.a_intent == I_HELP)
 		user.visible_message("<span class='notice'><b>\The [user]</b> hugs [src]!</span>","<span class='notice'>You hug [src]!</span>")
 	else if (user.a_intent == I_HURT)
@@ -927,7 +939,7 @@
 		if(stored_item)
 			to_chat(user, "There is already something in here.")
 			return
-	
+
 		if(!(I.w_class > w_class))
 			to_chat(user, "You place [I] inside [src].")
 			user.drop_from_inventory(I, src)
@@ -970,6 +982,7 @@
 	desc = "A small toy plushie. It's very cute."
 	icon = 'icons/obj/toy.dmi'
 	icon_state = "nymphplushie"
+	drop_sound = 'sound/items/drop/plushie.ogg'
 	w_class = ITEMSIZE_TINY
 	var/last_message = 0
 	var/pokephrase = "Uww!"
@@ -1007,6 +1020,7 @@
 		user.visible_message("<span class='warning'><b>\The [user]</b> attempts to strangle [src]!</span>","<span class='warning'>You attempt to strangle [src]!</span>")
 	else
 		user.visible_message("<span class='notice'><b>\The [user]</b> pokes [src].</span>","<span class='notice'>You poke [src].</span>")
+		playsound(src, 'sound/items/drop/plushie.ogg', 25, 0)
 		visible_message("[src] says, \"[pokephrase]\"")
 	last_message = world.time

@@ -1030,7 +1044,7 @@
 		user.visible_message("<span class='notice'>[user] makes \the [I] kiss \the [src]!.</span>", \
 		"<span class='notice'>You make \the [I] kiss \the [src]!.</span>")
 		return
-		
+

 	if(istype(I, /obj/item/device/threadneedle) && opened)
 		to_chat(user, "You sew the hole underneath [src].")
@@ -1053,7 +1067,7 @@
 		stored_item = I
 		to_chat(user, "You placed [I] into [src].")
 		return
-		
+
 	return ..()

 /obj/item/toy/plushie/nymph
@@ -1488,6 +1502,7 @@
 	icon_state = "inflatable"
 	icon = 'icons/obj/clothing/belts.dmi'
 	slot_flags = SLOT_BELT
+	drop_sound = 'sound/items/drop/rubber.ogg'

 /obj/item/toy/xmastree
 	name = "Miniature Christmas tree"
@@ -1497,3 +1512,4 @@
 	w_class = ITEMSIZE_TINY
 	force = 1
 	throwforce = 1
+	drop_sound = 'sound/items/drop/box.ogg'
@@ -6,6 +6,7 @@
 	icon = 'icons/obj/trash.dmi'
 	w_class = ITEMSIZE_SMALL
 	desc = "This is rubbish."
+	drop_sound = 'sound/items/drop/wrapper.ogg'

 /obj/item/trash/raisins
 	name = "\improper 4no raisins"
@@ -38,6 +39,7 @@
 /obj/item/trash/unajerky
 	name = "Moghes Imported Sissalik Jerky"
 	icon_state = "unathitinred"
+	drop_sound = 'sound/items/drop/soda.ogg'

 /obj/item/trash/syndi_cakes
 	name = "syndi cakes"
@@ -66,6 +68,7 @@
 /obj/item/trash/tray
 	name = "tray"
 	icon_state = "tray"
+	drop_sound = 'sound/items/trayhit1.ogg'

 /obj/item/trash/candle
 	name = "candle"
@@ -34,6 +34,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	origin_tech = list(TECH_MATERIAL = 1)
 	slot_flags = SLOT_EARS
 	attack_verb = list("burnt", "singed")
+	drop_sound = null

 /obj/item/weapon/flame/match/process()
 	if(isliving(loc))
@@ -90,6 +91,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	var/ignitermes = "USER lights NAME with FLAME"
 	var/brand
 	blood_sprite_state = null //Can't bloody these
+	drop_sound = 'sound/items/cigs_lighters/cig_snuff.ogg'

 /obj/item/clothing/mask/smokable/Initialize()
 	. = ..()
@@ -158,6 +160,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 /obj/item/clothing/mask/smokable/proc/light(var/flavor_text = "[usr] lights the [name].")
 	if(!src.lit)
 		src.lit = 1
+		playsound(src, 'sound/items/cigs_lighters/cig_light.ogg', 75, 1, -1)
 		damtype = "fire"
 		if(reagents.get_reagent_amount("phoron")) // the phoron explodes when exposed to fire
 			var/datum/effect/effect/system/reagents_explosion/e = new()
@@ -182,6 +185,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 /obj/item/clothing/mask/smokable/proc/die(var/nomessage = 0)
 	var/turf/T = get_turf(src)
 	set_light(0)
+	playsound(src.loc, 'sound/items/cigs_lighters/cig_snuff.ogg', 50, 1)
 	STOP_PROCESSING(SSobj, src)
 	if (type_butt)
 		var/obj/item/butt = new type_butt(T)
@@ -203,6 +207,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 			var/mob/living/M = loc
 			if (!nomessage)
 				to_chat(M, "<span class='notice'>Your [name] goes out, and you empty the ash.</span>")
+				playsound(src.loc, 'sound/items/cigs_lighters/cig_snuff.ogg', 50, 1)
 			lit = 0
 			icon_state = initial(icon_state)
 			item_state = initial(item_state)
@@ -225,6 +230,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 			to_chat(H, "<span class='warning'>\The [blocked] is in the way!</span>")
 			return 1
 		to_chat(H, "<span class='notice'>You take a drag on your [name].</span>")
+		playsound(src, 'sound/items/cigs_lighters/inhale.ogg', 50, 0, -1)
 		smoke(5)
 		return 1
 	return ..()
@@ -313,6 +319,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	if(lit == 1)
 		if(user.a_intent == I_HURT)
 			user.visible_message("<span class='notice'>[user] drops and treads on the lit [src], putting it out instantly.</span>")
+			playsound(src.loc, 'sound/items/cigs_lighters/cig_snuff.ogg', 50, 1)
 			die(1)
 		else
 			user.visible_message("<span class='notice'>[user] puts out \the [src].</span>")
@@ -406,6 +413,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	if(lit == 1)
 		if(user.a_intent == I_HURT)
 			user.visible_message("<span class='notice'>[user] empties the lit [src] on the floor!.</span>")
+			playsound(src.loc, 'sound/items/cigs_lighters/cig_snuff.ogg', 50, 1)
 			die(1)
 		else
 			user.visible_message("<span class='notice'>[user] puts out \the [src].</span>")
@@ -8,6 +8,7 @@
 	slot_flags = SLOT_EARS
 	var/colour = "red"
 	var/open = 0
+	drop_sound = 'sound/items/drop/glass.ogg'

 /obj/item/weapon/lipstick/purple
 	name = "purple lipstick"
@@ -12,6 +12,7 @@
 	force = 10
 	matter = list(DEFAULT_WALL_MATERIAL = 90)
 	attack_verb = list("slammed", "whacked", "bashed", "thunked", "battered", "bludgeoned", "thrashed")
+	drop_sound = 'sound/items/drop/gascan.ogg'

 	var/spray_particles = 3
 	var/spray_amount = 10	//units of liquid per particle
@@ -13,6 +13,7 @@
 	icon = 'icons/obj/items.dmi'
 	icon_state = "gift1"
 	item_state = "gift1"
+	drop_sound = 'sound/items/drop/box.ogg'

 /obj/item/weapon/a_gift/New()
 	..()
@@ -26,6 +27,7 @@

 /obj/item/weapon/gift/attack_self(mob/user as mob)
 	user.drop_item()
+	playsound(src.loc, 'sound/items/package_unwrap.ogg', 50,1)
 	if(src.gift)
 		user.put_in_active_hand(gift)
 		src.gift.add_fingerprint(user)
@@ -11,6 +11,7 @@
 	throw_range = 5
 	origin_tech = list(TECH_MATERIAL = 1)
 	matter = list(DEFAULT_WALL_MATERIAL = 500)
+	drop_sound = 'sound/items/drop/accessory.ogg'
 	var/elastic
 	var/dispenser = 0
 	var/breakouttime = 1200 //Deciseconds = 120s = 2 minutes
@@ -20,6 +20,7 @@
 	var/associated_account_number = 0

 	var/list/files = list(  )
+	drop_sound = 'sound/items/drop/card.ogg'

 /obj/item/weapon/card/data
 	name = "data disk"
@@ -103,6 +103,7 @@
 	force_divisor = 0.7 // 10 when wielded with weight 15 (wood)
 	dulled_divisor = 0.75	// Still a club
 	thrown_force_divisor = 1 // as above
+	drop_sound = 'sound/items/drop/wooden.ogg'

 /obj/item/weapon/material/kitchen/rollingpin/attack(mob/living/M as mob, mob/living/user as mob)
 	if ((CLUMSY in user.mutations) && prob(50))
@@ -9,6 +9,7 @@
 	attack_verb = list("patted", "tapped")
 	force_divisor = 0.25 // 15 when wielded with hardness 60 (steel)
 	thrown_force_divisor = 0.25 // 5 when thrown with weight 20 (steel)
+	drop_sound = 'sound/items/drop/knife.ogg'

 /obj/item/weapon/material/butterfly/update_force()
 	if(active)
@@ -65,6 +66,7 @@
 	matter = list(DEFAULT_WALL_MATERIAL = 12000)
 	origin_tech = list(TECH_MATERIAL = 1)
 	attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
+	drop_sound = 'sound/items/drop/knife.ogg'

 /obj/item/weapon/material/knife/suicide_act(mob/user)
 	var/datum/gender/TU = gender_datums[user.get_visible_gender()]
@@ -21,6 +21,7 @@
 	origin_tech = list(TECH_MATERIAL = 2, TECH_COMBAT = 1)
 	attack_verb = list("chopped", "torn", "cut")
 	applies_material_colour = 0
+	drop_sound = 'sound/items/drop/axe.ogg'

 /obj/item/weapon/material/knife/machete/hatchet/unathiknife
 	name = "duelling knife"
@@ -9,6 +9,7 @@
 	edge = 1
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	hitsound = 'sound/weapons/bladeslice.ogg'
+	drop_sound = 'sound/items/drop/sword.ogg'

 /obj/item/weapon/material/sword/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
 	if(unique_parry_check(user, attacker, damage_source) && prob(50))
@@ -95,6 +95,7 @@
 	attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
 	applies_material_colour = 0
 	can_cleave = TRUE
+	drop_sound = 'sound/items/drop/axe.ogg'

 /obj/item/weapon/material/twohanded/fireaxe/update_held_icon()
 	var/mob/living/M = loc
@@ -16,11 +16,8 @@
 	max_storage_space = INVENTORY_STANDARD_SPACE
 	var/flippable = 0
 	var/side = 0 //0 = right, 1 = left
+	drop_sound = 'sound/items/drop/backpack.ogg'

-/obj/item/weapon/storage/backpack/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	if (src.use_sound)
-		playsound(src.loc, src.use_sound, 50, 1, -5)
-	..()

 /obj/item/weapon/storage/backpack/equipped(var/mob/user, var/slot)
 	if (slot == slot_back && src.use_sound)
@@ -23,6 +23,7 @@
 	display_contents_with_number = 0 // UNStABLE AS FuCK, turn on when it stops crashing clients
 	use_to_pickup = 1
 	slot_flags = SLOT_BELT
+	drop_sound = 'sound/items/drop/backpack.ogg'

 // -----------------------------
 //          Trash bag
@@ -33,6 +34,7 @@
 	icon = 'icons/obj/janitor.dmi'
 	icon_state = "trashbag0"
 	item_state_slots = list(slot_r_hand_str = "trashbag", slot_l_hand_str = "trashbag")
+	drop_sound = 'sound/items/drop/wrapper.ogg'

 	w_class = ITEMSIZE_LARGE
 	max_w_class = ITEMSIZE_SMALL
@@ -59,6 +61,7 @@
 	desc = "It's a very flimsy, very noisy alternative to a bag."
 	icon = 'icons/obj/trash.dmi'
 	icon_state = "plasticbag"
+	drop_sound = 'sound/items/drop/wrapper.ogg'

 	w_class = ITEMSIZE_LARGE
 	max_w_class = ITEMSIZE_SMALL
@@ -9,6 +9,7 @@
 	slot_flags = SLOT_BELT
 	attack_verb = list("whipped", "lashed", "disciplined")
 	sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/seromi/belt.dmi')
+	drop_sound = 'sound/items/drop/leather.ogg'

 	var/show_above_suit = 0

@@ -7,6 +7,8 @@
 	w_class = ITEMSIZE_NORMAL
 	var/mob/affecting = null
 	var/deity_name = "Christ"
+	use_sound = 'sound/bureaucracy/bookopen.ogg'
+	drop_sound = 'sound/bureaucracy/bookclose.ogg'

 /obj/item/weapon/storage/bible/booze
 	name = "bible"
@@ -28,6 +28,8 @@
 	var/foldable = /obj/item/stack/material/cardboard	// BubbleWrap - if set, can be folded (when empty) into a sheet of cardboard
 	max_w_class = ITEMSIZE_SMALL
 	max_storage_space = INVENTORY_BOX_SPACE
+	use_sound = 'sound/items/storage/box.ogg'
+	drop_sound = 'sound/items/drop/box.ogg'

 // BubbleWrap - A box can be folded up to make card
 /obj/item/weapon/storage/box/attack_self(mob/user as mob)
@@ -50,6 +52,7 @@
 		return
 	// Now make the cardboard
 	to_chat(user, "<span class='notice'>You fold [src] flat.</span>")
+	playsound(src.loc, 'sound/items/storage/boxfold.ogg', 30, 1)
 	new foldable(get_turf(src))
 	qdel(src)

@@ -407,10 +410,15 @@

 /obj/item/weapon/storage/box/matches/attackby(obj/item/weapon/flame/match/W as obj, mob/user as mob)
 	if(istype(W) && !W.lit && !W.burnt)
-		W.lit = 1
-		W.damtype = "burn"
-		W.icon_state = "match_lit"
-		START_PROCESSING(SSobj, W)
+		if(prob(25))
+			playsound(src.loc, 'sound/items/cigs_lighters/matchstick_lit.ogg', 25, 0, -1)
+			user.visible_message("<span class='notice'>[user] manages to light the match on the matchbox.</span>")
+			W.lit = 1
+			W.damtype = "burn"
+			W.icon_state = "match_lit"
+			START_PROCESSING(SSprocessing, W)
+		else
+			playsound(src.loc, 'sound/items/cigs_lighters/matchstick_hit.ogg', 25, 0, -1)
 	W.update_icon()
 	return

@@ -8,6 +8,8 @@
 	w_class = ITEMSIZE_LARGE
 	max_w_class = ITEMSIZE_NORMAL
 	max_storage_space = ITEMSIZE_COST_NORMAL * 4
+	use_sound = 'sound/items/storage/briefcase.ogg'
+	drop_sound = 'sound/items/drop/backpack.ogg'

 /obj/item/weapon/storage/briefcase/clutch
 	name = "clutch purse"
@@ -15,7 +15,12 @@
 	throw_speed = 2
 	throw_range = 8
 	max_storage_space = ITEMSIZE_COST_SMALL * 7 // 14
+<<<<<<< HEAD
 //	var/list/icon_variety // VOREStation edit
+=======
+	var/list/icon_variety
+	drop_sound = 'sound/items/drop/box.ogg'
+>>>>>>> 22e28f2... Merge pull request #6804 from Cerebulon/bigsounds

 /obj/item/weapon/storage/firstaid/Initialize()
 	. = ..()
@@ -173,13 +178,14 @@
 	desc = "It's an airtight container for storing medication."
 	icon_state = "pill_canister"
 	icon = 'icons/obj/chemical.dmi'
+	drop_sound = 'sound/items/drop/pillbottle.ogg'
 	item_state_slots = list(slot_r_hand_str = "contsolid", slot_l_hand_str = "contsolid")
 	w_class = ITEMSIZE_SMALL
 	can_hold = list(/obj/item/weapon/reagent_containers/pill,/obj/item/weapon/dice,/obj/item/weapon/paper)
 	allow_quick_gather = 1
 	allow_quick_empty = 1
 	use_to_pickup = 1
-	use_sound = null
+	use_sound = 'sound/items/storage/pillbottle.ogg'
 	max_storage_space = ITEMSIZE_COST_TINY * 14
 	max_w_class = ITEMSIZE_TINY
 	var/wrapper_color
@@ -26,6 +26,7 @@
 	w_class = ITEMSIZE_NORMAL
 	max_w_class = ITEMSIZE_SMALL
 	max_storage_space = ITEMSIZE_SMALL * 7
+	use_sound = 'sound/items/storage/briefcase.ogg'

 	examine(mob/user)
 		if(..(user, 1))
@@ -141,8 +141,8 @@
 	is_seeing -= user

 /obj/item/weapon/storage/proc/open(mob/user as mob)
-	if (src.use_sound && !isobserver(user))
-		playsound(src.loc, src.use_sound, 50, 1, -5)
+	if (use_sound)
+		playsound(src.loc, src.use_sound, 50, 0, -5)

 	orient2hud(user)
 	if (user.s_active)
@@ -14,6 +14,8 @@
 	max_storage_space = ITEMSIZE_COST_SMALL * 7 //enough to hold all starting contents
 	origin_tech = list(TECH_COMBAT = 1)
 	attack_verb = list("robusted")
+	use_sound = 'sound/items/storage/toolbox.ogg'
+	drop_sound = 'sound/items/drop/metalboots.ogg'

 /obj/item/weapon/storage/toolbox/emergency
 	name = "emergency toolbox"
@@ -30,6 +30,7 @@
 	icon_state = "retractor"
 	matter = list(DEFAULT_WALL_MATERIAL = 10000, "glass" = 5000)
 	origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1)
+	drop_sound = 'sound/items/drop/scrap.ogg'

 /*
 * Hemostat
@@ -41,6 +42,7 @@
 	matter = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 2500)
 	origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1)
 	attack_verb = list("attacked", "pinched")
+	drop_sound = 'sound/items/drop/scrap.ogg'

 /*
 * Cautery
@@ -52,6 +54,7 @@
 	matter = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 2500)
 	origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1)
 	attack_verb = list("burnt")
+	drop_sound = 'sound/items/drop/scrap.ogg'

 /*
 * Surgical Drill
@@ -66,6 +69,7 @@
 	w_class = ITEMSIZE_NORMAL
 	origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1)
 	attack_verb = list("drilled")
+	drop_sound = 'sound/items/drop/accessory.ogg'

 	suicide_act(mob/user)
 		var/datum/gender/TU = gender_datums[user.get_visible_gender()]
@@ -91,6 +95,7 @@
 	origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1)
 	matter = list(DEFAULT_WALL_MATERIAL = 10000, "glass" = 5000)
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
+	drop_sound = 'sound/items/drop/knife.ogg'

 	suicide_act(mob/user)
 		var/datum/gender/TU = gender_datums[user.get_visible_gender()]
@@ -145,6 +150,7 @@
 	desc = "For heavy duty cutting."
 	icon_state = "saw3"
 	hitsound = 'sound/weapons/circsawhit.ogg'
+	drop_sound = 'sound/items/drop/accessory.ogg'
 	force = 15.0
 	w_class = ITEMSIZE_NORMAL
 	throwforce = 9.0
@@ -176,6 +182,7 @@
 	icon_state = "bone-gel"
 	force = 0
 	throwforce = 1.0
+	drop_sound = 'sound/items/drop/bottle.ogg'

 /obj/item/weapon/surgical/FixOVein
 	name = "FixOVein"
@@ -185,6 +192,7 @@
 	throwforce = 1.0
 	origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 3)
 	var/usage_amount = 10
+	drop_sound = 'sound/items/drop/accessory.ogg'

 /obj/item/weapon/surgical/bonesetter
 	name = "bone setter"
@@ -195,6 +203,7 @@
 	throw_speed = 3
 	throw_range = 5
 	attack_verb = list("attacked", "hit", "bludgeoned")
+	drop_sound = 'sound/items/drop/scrap.ogg'

 /obj/item/weapon/surgical/bone_clamp
 	name = "bone clamp"
@@ -8,6 +8,17 @@
 /*
 * Classic Baton
 */
+
+/obj/item/weapon/melee
+	name = "weapon"
+	desc = "Murder device."
+	icon = 'icons/obj/weapons.dmi'
+	icon_state = "baton"
+	item_state = "classic_baton"
+	slot_flags = SLOT_BELT
+	force = 10
+	drop_sound = 'sound/items/drop/metalweapon.ogg'
+
 /obj/item/weapon/melee/classic_baton
 	name = "police baton"
 	desc = "A wooden truncheon for beating criminal scum."
@@ -10,6 +10,7 @@ var/list/global/tank_gauge_cache = list()
 	sprite_sheets = list(
 		SPECIES_TESHARI = 'icons/mob/species/seromi/back.dmi'
 		)
+	drop_sound = 'sound/items/drop/gascan.ogg'

 	var/gauge_icon = "indicator_tank"
 	var/last_gauge_pressure
@@ -4,6 +4,7 @@
 	icon = 'icons/obj/bureaucracy.dmi'
 	icon_state = "taperoll"
 	w_class = ITEMSIZE_TINY
+	drop_sound = 'sound/items/drop/box.ogg'

 	toolspeed = 2 //It is now used in surgery as a not awful, but probably dangerous option, due to speed.

@@ -141,6 +142,7 @@
 	w_class = ITEMSIZE_TINY
 	plane = MOB_PLANE
 	anchored = FALSE
+	drop_sound = null

 	var/obj/item/weapon/stuck = null

@@ -17,6 +17,7 @@
 	matter = list(DEFAULT_WALL_MATERIAL = 50)
 	attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked")
 	usesound = 'sound/items/crowbar.ogg'
+	drop_sound = 'sound/items/drop/sword.ogg'
 	toolspeed = 1

 /obj/item/weapon/tool/crowbar/is_crowbar()
@@ -15,6 +15,7 @@
 	throw_range = 5
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	usesound = 'sound/items/screwdriver.ogg'
+	drop_sound = 'sound/items/drop/scrap.ogg'
 	matter = list(DEFAULT_WALL_MATERIAL = 75)
 	attack_verb = list("stabbed")
 	sharp  = 1
@@ -37,6 +37,7 @@
 	var/burned_fuel_for = 0 // Keeps track of how long the welder's been on, used to gradually empty the welder if left one, without RNG.
 	var/always_process = FALSE // If true, keeps the welder on the process list even if it's off.  Used for when it needs to regenerate fuel.
 	toolspeed = 1
+	drop_sound = 'sound/items/drop/scrap.ogg'

 /obj/item/weapon/weldingtool/Initialize()
 	. = ..()
@@ -17,6 +17,7 @@
 	attack_verb = list("pinched", "nipped")
 	hitsound = 'sound/items/wirecutter.ogg'
 	usesound = 'sound/items/wirecutter.ogg'
+	drop_sound = 'sound/items/drop/knife.ogg'
 	sharp = 1
 	edge = 1
 	toolspeed = 1
@@ -15,6 +15,7 @@
 	attack_verb = list("bashed", "battered", "bludgeoned", "whacked")
 	usesound = 'sound/items/ratchet.ogg'
 	toolspeed = 1
+	drop_sound = 'sound/items/drop/sword.ogg'

 /obj/item/weapon/tool/wrench/is_wrench()
 	return TRUE
@@ -8,6 +8,7 @@
 	attack_verb = list("whipped")
 	hitsound = 'sound/weapons/towelwhip.ogg'
 	desc = "A soft cotton towel."
+	drop_sound = 'sound/items/drop/clothing.ogg'

 /obj/item/weapon/towel/attack_self(mob/living/user as mob)
 	user.visible_message(text("<span class='notice'>[] uses [] to towel themselves off.</span>", user, src))
@@ -14,6 +14,7 @@
 	matter = list(DEFAULT_WALL_MATERIAL = 3000)
 	var/list/carrying = list() // List of things on the tray. - Doohl
 	var/max_carry = 10
+	drop_sound = 'sound/items/trayhit1.ogg'

 /obj/item/weapon/tray/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
 	user.setClickCooldown(user.get_attack_speed(src))
@@ -9,6 +9,7 @@
 	throw_range = 4
 	throwforce = 10
 	w_class = ITEMSIZE_SMALL
+	drop_sound = 'sound/items/drop/sword.ogg'

 	suicide_act(mob/user)
 		var/datum/gender/T = gender_datums[user.get_visible_gender()]
@@ -9,6 +9,7 @@
 	var/obj/item/weapon/nozzle = null //Attached welder, or other spray device.
 	var/nozzle_type = /obj/item/weapon/weldingtool/tubefed
 	var/nozzle_attached = 0
+	drop_sound = 'sound/items/drop/backpack.ogg'

 /obj/item/weapon/weldpack/Initialize()
 	. = ..()
@@ -16,6 +16,7 @@ LINEN BINS
 	throw_speed = 1
 	throw_range = 2
 	w_class = ITEMSIZE_SMALL
+	drop_sound = 'sound/items/drop/clothing.ogg'

 /obj/item/weapon/bedsheet/attack_self(mob/user as mob)
 	user.drop_item()
@@ -3,6 +3,7 @@
 	desc = "A folded membrane which rapidly expands into a large cubical shape on activation."
 	icon = 'icons/obj/inflatable.dmi'
 	icon_state = "folded_wall"
+	drop_sound = 'sound/items/drop/rubber.ogg'
 	w_class = ITEMSIZE_NORMAL
 	var/deploy_path = /obj/structure/inflatable

@@ -288,6 +288,7 @@

 /obj/structure/bed/roller/Move()
 	..()
+	playsound(src, 'sound/effects/roll.ogg', 100, 1)
 	if(has_buckled_mobs())
 		for(var/A in buckled_mobs)
 			var/mob/living/L = A
@@ -144,6 +144,7 @@

 /obj/structure/bed/chair/office/Move()
 	..()
+	playsound(src, 'sound/effects/roll.ogg', 100, 1)
 	if(has_buckled_mobs())
 		for(var/A in buckled_mobs)
 			var/mob/living/occupant = A
@@ -93,6 +93,8 @@

 /obj/structure/bed/chair/wheelchair/Move()
 	..()
+	cut_overlays()
+	playsound(src, 'sound/effects/roll.ogg', 75, 1)
 	if(has_buckled_mobs())
 		for(var/A in buckled_mobs)
 			var/mob/living/occupant = A
@@ -384,6 +384,7 @@
 		return

 	to_chat(usr, "<span class='notice'>You start washing your hands.</span>")
+	playsound(loc, 'sound/effects/sink_long.ogg', 75, 1)

 	busy = 1
 	sleep(40)
@@ -406,6 +407,7 @@
 	if (istype(RG) && RG.is_open_container())
 		RG.reagents.add_reagent("water", min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this))
 		user.visible_message("<span class='notice'>[user] fills \the [RG] using \the [src].</span>","<span class='notice'>You fill \the [RG] using \the [src].</span>")
+		playsound(loc, 'sound/effects/sink.ogg', 75, 1)
 		return 1

 	else if (istype(O, /obj/item/weapon/melee/baton))