Revert "Pouring sounds"

code/datums/elements/basic_eating.dm

@@ -74,8 +74,7 @@
 
 /datum/element/basic_eating/proc/finish_eating(mob/living/eater, atom/target)
 	if(drinking)
-		////playsound(eater.loc,'sound/items/drink.ogg', rand(10,50), TRUE) // monkestation edit original
-		playsound(eater.loc,get_drink_sound(eater), rand(10,50), TRUE) // monkestation edit: synthesized drink sounds
+		playsound(eater.loc,'sound/items/drink.ogg', rand(10,50), TRUE)
 	else
 		playsound(eater.loc,'sound/items/eatfood.ogg', rand(10,50), TRUE)
 	SEND_SIGNAL(eater, COMSIG_LIVING_ATE, target)

code/modules/reagents/reagent_containers/cups/_cup.dm

@@ -87,8 +87,7 @@
 		contained_bladder.consume_act(reagents, gulp_size * 0.2)
 	reagents.trans_to(target_mob, gulp_size, transfered_by = user, methods = INGEST)
 	checkLiked(fraction, target_mob)
-	////playsound(target_mob.loc,'sound/items/drink.ogg', rand(10,50), TRUE) // monkestation edit original
-	playsound(target_mob.loc,get_drink_sound(target_mob), rand(10,50), TRUE) // monkestation edit: synthesized drink sounds
+	playsound(target_mob.loc,'sound/items/drink.ogg', rand(10,50), TRUE)
 	if(!iscarbon(target_mob))
 		return
 	var/mob/living/carbon/carbon_drinker = target_mob
@@ -135,7 +134,7 @@
 			contained_bladder.consume_act(reagents, gulp_size * 0.2)
 		reagents.trans_to(chugger, gulp_size, transfered_by = chugger, methods = INGEST)
 		checkLiked(fraction, chugger)
-		playsound(chugger.loc,get_drink_sound(chugger), rand(10,50), TRUE)
+		playsound(chugger.loc,'sound/items/drink.ogg', rand(10,50), TRUE)
 		if(!iscarbon(chugger))
 			continue
 		var/mob/living/carbon/carbon_drinker = chugger
@@ -178,7 +177,6 @@
 		var/trans = reagents.trans_to(target, amount_per_transfer_from_this, transfered_by = user)
 		if(trans)
 			to_chat(user, span_notice("You transfer [trans] unit\s of the solution to [target]."))
-			after_pour(trans, target, user) // monkestation addition: pouring sounds
 
 	else if(target.is_drainable()) //A dispenser. Transfer FROM it TO us.
 		if(!target.reagents.total_volume)

code/modules/reagents/reagent_containers/dropper.dm

@@ -47,7 +47,6 @@
 											span_userdanger("[user] tries to squirt something into your eyes, but fails!"))
 
 					to_chat(user, span_notice("You transfer [trans] unit\s of the solution."))
-					after_pour(trans, safe_thing, user) // monkestation addition: pouring sounds
 					update_appearance()
 					return
 			else if(isalien(target)) //hiss-hiss has no eyes!
@@ -68,8 +67,6 @@
 
 		trans = src.reagents.trans_to(target, amount_per_transfer_from_this, transfered_by = user)
 		to_chat(user, span_notice("You transfer [trans] unit\s of the solution."))
-		after_pour(trans, target, user) // monkestation addition: pouring sounds
-
 		update_appearance()
 		target.update_appearance()
 

monkestation/code/modules/reagents/reagent_containers/cups/_cup.dm

@@ -1,56 +1,3 @@
 /obj/item/reagent_containers/cup/Initialize(mapload, vol)
 	. = ..()
 	AddElement(/datum/element/trash_if_empty/reagent_container/if_prefilled)
-
-/obj/item/reagent_containers/cup
-	var/static/list/pouring_sounds_categorized = list(
-		"0_10" = list(
-			'monkestation/sound/chemistry/transfer/beakerpour_0-10-1.ogg',
-			'monkestation/sound/chemistry/transfer/beakerpour_0-10-2.ogg',
-			'monkestation/sound/chemistry/transfer/beakerpour_0-10-3.ogg',
-			'monkestation/sound/chemistry/transfer/beakerpour_0-10-4.ogg',
-			'monkestation/sound/chemistry/transfer/beakerpour_0-10-5.ogg',
-			'monkestation/sound/chemistry/transfer/beakerpour_0-10-6.ogg',
-		),
-		"10_25" = list(
-			'monkestation/sound/chemistry/transfer/beakerpour_10-25-1.ogg',
-			'monkestation/sound/chemistry/transfer/beakerpour_10-25-2.ogg',
-			'monkestation/sound/chemistry/transfer/beakerpour_10-25-3.ogg',
-			'monkestation/sound/chemistry/transfer/beakerpour_10-25-5.ogg',
-			'monkestation/sound/chemistry/transfer/beakerpour_10-25-6.ogg',
-		),
-		"25_50" = list(
-			'monkestation/sound/chemistry/transfer/beakerpour_25-50-1.ogg',
-			'monkestation/sound/chemistry/transfer/beakerpour_25-50-2.ogg',
-			'monkestation/sound/chemistry/transfer/beakerpour_25-50-3.ogg',
-		),
-		"50_inf" = list(
-			'monkestation/sound/chemistry/transfer/beakerpour_50-inf-1.ogg',
-			'monkestation/sound/chemistry/transfer/beakerpour_50-inf-2.ogg',
-			'monkestation/sound/chemistry/transfer/beakerpour_50-inf-3.ogg',
-			'monkestation/sound/chemistry/transfer/beakerpour_50-inf-4.ogg',
-			'monkestation/sound/chemistry/transfer/beakerpour_50-inf-5.ogg',
-		),
-	)
-	var/static/list/rare_pouring_sound = list(
-		"0_10" = 'monkestation/sound/chemistry/transfer/beakerpour_0-10-sparkle.ogg',
-		"10_25" = 'monkestation/sound/chemistry/transfer/beakerpour_10-25-sparkle.ogg',
-		"25_50" = 'monkestation/sound/chemistry/transfer/beakerpour_25-50-sparkle.ogg',
-		"50_inf" = 'monkestation/sound/chemistry/transfer/beakerpour_50-inf-sparkle.ogg',
-	)
-
-
-/obj/item/reagent_containers/cup/proc/after_pour(trans, atom/transed_to, mob/user)
-	var/sound = get_pouring_sound(trans)
-	playsound(get_turf(src), sound, 60, TRUE, use_reverb = TRUE)
-
-/obj/item/reagent_containers/cup/proc/get_pouring_sound(trans)
-	var/pour_amount = "0_10"
-	if(trans >= 50)
-		pour_amount = "50_inf"
-	else if(trans >= 25)
-		pour_amount = "25_50"
-	else if(trans >= 10)
-		pour_amount = "10_25"
-
-	return prob(1) ? rare_pouring_sound[pour_amount] : pouring_sounds_categorized[pour_amount]

tgstation.dme

@@ -5812,7 +5812,6 @@
 #include "monkestation\code\datums\components\wound_converter.dm"
 #include "monkestation\code\datums\diseases\advance\symptoms\clockwork.dm"
 #include "monkestation\code\datums\elements\area_locked.dm"
-#include "monkestation\code\datums\elements\basic_eating.dm"
 #include "monkestation\code\datums\elements\trash_if_empty.dm"
 #include "monkestation\code\datums\elements\uncompressed_storage.dm"
 #include "monkestation\code\datums\ert\moff_inspectors.dm"
@@ -7370,7 +7369,6 @@
 #include "monkestation\code\modules\reagents\reagent_containers\blood_pack.dm"
 #include "monkestation\code\modules\reagents\reagent_containers\condiment.dm"
 #include "monkestation\code\modules\reagents\reagent_containers\drinks.dm"
-#include "monkestation\code\modules\reagents\reagent_containers\dropper.dm"
 #include "monkestation\code\modules\reagents\reagent_containers\sunsetglass.dm"
 #include "monkestation\code\modules\reagents\reagent_containers\cups\_cup.dm"
 #include "monkestation\code\modules\reagents\reagent_containers\cups\bottle.dm"