Cig pack sounds (#91860)

code/__DEFINES/sound.dm

@@ -279,6 +279,11 @@ GLOBAL_LIST_EMPTY(sfx_datum_by_key)
 #define SFX_REGEN_MESH_END "regen_mesh_end"
 #define SFX_REGEN_MESH_PICKUP "regen_mesh_pickup"
 #define SFX_REGEN_MESH_DROP "regen_mesh_drop"
+#define SFX_CIG_PACK_DROP "cig_pack_drop"
+#define SFX_CIG_PACK_INSERT "cig_pack_insert"
+#define SFX_CIG_PACK_PICKUP "cig_pack_pickup"
+#define SFX_CIG_PACK_RUSTLE "cig_pack_rustle"
+#define SFX_CIG_PACK_THROW_DROP "cig_pack_throw_drop"
 
 // Standard is 44.1khz
 #define MIN_EMOTE_PITCH 40000

code/datums/storage/storage.dm

@@ -135,7 +135,10 @@
 	max_slots = src.max_slots,
 	max_specific_storage = src.max_specific_storage,
 	max_total_storage = src.max_total_storage,
-)
+	rustle_sound = src.rustle_sound,
+	remove_rustle_sound = src.remove_rustle_sound,
+	)
+
 	if(!istype(parent))
 		stack_trace("Storage datum ([type]) created without a [isnull(parent) ? "null parent" : "invalid parent ([parent.type])"]!")
 		qdel(src)
@@ -147,6 +150,8 @@
 	src.max_slots = max_slots
 	src.max_specific_storage = max_specific_storage
 	src.max_total_storage = max_total_storage
+	src.rustle_sound = rustle_sound
+	src.remove_rustle_sound = remove_rustle_sound
 
 /datum/storage/Destroy()
 
@@ -827,7 +832,7 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches)
 		to_chat(user, span_notice("You dump the contents of [parent] into [dest_object]."))
 
 		if(do_rustle)
-			playsound(parent, SFX_RUSTLE, 50, TRUE, -5)
+			playsound(parent, rustle_sound, 50, TRUE, -5)
 
 		for(var/obj/item/to_dump in real_location)
 			dest_object.atom_storage.attempt_insert(to_dump, user)

code/datums/storage/subtypes/others/fancy_storage.dm

@@ -39,6 +39,8 @@
 /datum/storage/cigarette_box
 	max_slots = 6
 	display_contents = FALSE
+	rustle_sound = SFX_CIG_PACK_INSERT
+	remove_rustle_sound = SFX_CIG_PACK_RUSTLE
 
 /datum/storage/cigarette_box/New(atom/parent, max_slots, max_specific_storage, max_total_storage)
 	. = ..()

code/game/atom/atom_storage.dm

@@ -10,13 +10,15 @@
 	list/canhold,
 	list/canthold,
 	storage_type = /datum/storage,
+	rustle_sound,
+	remove_rustle_sound
 )
 	RETURN_TYPE(/datum/storage)
 
 	if(atom_storage)
 		QDEL_NULL(atom_storage)
 
-	atom_storage = new storage_type(src, max_slots, max_specific_storage, max_total_storage)
+	atom_storage = new storage_type(src, max_slots, max_specific_storage, max_total_storage, rustle_sound, remove_rustle_sound)
 
 	if(canhold || canthold)
 		atom_storage.set_holdable(canhold, canthold)

code/game/objects/items/storage/fancy.dm

@@ -196,6 +196,10 @@
 	age_restricted = TRUE
 	contents_tag = "cigarette"
 	storage_type = /datum/storage/cigarette_box
+	drop_sound = SFX_CIG_PACK_DROP
+	pickup_sound = SFX_CIG_PACK_PICKUP
+	throw_drop_sound = SFX_CIG_PACK_THROW_DROP
+	sound_vary = TRUE
 
 	///for cigarette overlay
 	var/candy = FALSE
@@ -210,6 +214,8 @@
 	if(contents.len != 0 || !spawn_coupon)
 		return ..()
 
+	playsound(src, storage_type.rustle_sound, 50, TRUE)
+
 	balloon_alert(user, "ooh, free coupon")
 	var/obj/item/coupon/attached_coupon = new
 	user.put_in_hands(attached_coupon)

code/game/sound_keys.dm

@@ -812,6 +812,42 @@
 	key = SFX_REGEN_MESH_DROP
 	file_paths = list('sound/items/regenerative_mesh/regen_mesh_drop1.ogg')
 
+/datum/sound_effect/cig_pack_drop
+	key = SFX_CIG_PACK_DROP
+	file_paths = list(
+		'sound/items/cigs/cig_pack_drop1.ogg',
+		'sound/items/cigs/cig_pack_drop2.ogg',
+	)
+
+/datum/sound_effect/cig_pack_insert
+	key = SFX_CIG_PACK_INSERT
+	file_paths = list(
+		'sound/items/cigs/cig_pack_insert1.ogg',
+		'sound/items/cigs/cig_pack_insert2.ogg',
+		'sound/items/cigs/cig_pack_insert3.ogg',
+		'sound/items/cigs/cig_pack_insert4.ogg',
+	)
+
+/datum/sound_effect/cig_pack_pickup
+	key = SFX_CIG_PACK_PICKUP
+	file_paths = list(
+		'sound/items/cigs/cig_pack_pickup1.ogg',
+		'sound/items/cigs/cig_pack_pickup2.ogg',
+		'sound/items/cigs/cig_pack_pickup3.ogg',
+	)
+
+/datum/sound_effect/cig_pack_rustle
+	key = SFX_CIG_PACK_RUSTLE
+	file_paths = list(
+		'sound/items/handling/regenerative_mesh/regen_mesh_pickup1.ogg',
+		'sound/items/handling/regenerative_mesh/regen_mesh_pickup2.ogg',
+		'sound/items/handling/regenerative_mesh/regen_mesh_pickup3.ogg',
+	)
+
+/datum/sound_effect/cig_pack_throw_drop
+	key = SFX_CIG_PACK_THROW_DROP
+	file_paths = list('sound/items/cigs/cig_pack_throw_drop1.ogg')
+
 
 /* assoc lists go next */
 

code/modules/detectivework/evidence.dm

@@ -17,13 +17,13 @@
 	create_storage(
 		max_slots = 1,
 		max_specific_storage = WEIGHT_CLASS_NORMAL,
+		rustle_sound = 'sound/items/evidence_bag/evidence_bag_zip.ogg',
+		remove_rustle_sound = 'sound/items/evidence_bag/evidence_bag_unzip.ogg',
 	)
 	atom_storage.allow_quick_gather = TRUE
 	atom_storage.collection_mode = COLLECT_ONE
 	RegisterSignal(atom_storage, COMSIG_STORAGE_STORED_ITEM, PROC_REF(on_insert))
 	RegisterSignal(atom_storage, COMSIG_STORAGE_REMOVED_ITEM, PROC_REF(on_remove))
-	atom_storage.rustle_sound = 'sound/items/evidence_bag/evidence_bag_zip.ogg'
-	atom_storage.remove_rustle_sound = 'sound/items/evidence_bag/evidence_bag_unzip.ogg'
 
 /obj/item/evidencebag/update_desc(updates)
 	. = ..()

sound/items/cigs/attribution.txt

@@ -0,0 +1,5 @@
+cig_pack_drop[1,2].ogg - grungussusss, license: CC-BY-SA
+cig_pack_insert[1,...,4].ogg - grungussusss, license: CC-BY-SA
+cig_pack_pickup[1,2,3].ogg - grungussusss, license: CC-BY-SA
+cig_pack_rustle[1,...,6].ogg - grungussusss, license: CC-BY-SA
+cig_pack_throw_drop.ogg - grungussusss, license: CC-BY-SA