Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods

modular_citadel/code/modules/arousal/organs/breasts.dm

@@ -15,10 +15,6 @@
 	can_climax				= TRUE
 	fluid_transfer_factor 	= 0.5
 
-/obj/item/organ/genital/breasts/Initialize()
-	. = ..()
-	reagents.add_reagent(fluid_id, fluid_max_volume)
-
 /obj/item/organ/genital/breasts/on_life()
 	if(QDELETED(src))
 		return
@@ -26,6 +22,14 @@
 		return
 	reagents.maximum_volume = fluid_max_volume
 	if(fluid_id && producing)
+		if(reagents.total_volume == 0) // Apparently, 0.015 gets rounded down to zero and no reagents are created if we don't start it with 0.1 in the tank.
+			fluid_rate = 0.1
+		else
+			fluid_rate = CUM_RATE
+		if(reagents.total_volume >= 5)
+			fluid_mult = 0.5
+		else
+			fluid_mult = 1
 		generate_milk()
 
 /obj/item/organ/genital/breasts/proc/generate_milk()

modular_citadel/code/modules/arousal/organs/genitals.dm

@@ -10,7 +10,7 @@
 	var/fluid_transfer_factor	= 0.0 //How much would a partner get in them if they climax using this?
 	var/size					= 2 //can vary between num or text, just used in icon_state strings
 	var/fluid_id				= null
-	var/fluid_max_volume		= 50
+	var/fluid_max_volume		= 15
 	var/fluid_efficiency		= 1
 	var/fluid_rate				= 1
 	var/fluid_mult				= 1

modular_citadel/code/modules/arousal/organs/testicles.dm

@@ -16,14 +16,18 @@
 	can_climax				= TRUE
 	var/sent_full_message	= TRUE //defaults to 1 since they're full to start
 
-/obj/item/organ/genital/testicles/Initialize()
-	. = ..()
-	reagents.add_reagent(fluid_id, fluid_max_volume)
-
 /obj/item/organ/genital/testicles/on_life()
 	if(QDELETED(src))
 		return
 	if(reagents && producing)
+		if(reagents.total_volume == 0) // Apparently, 0.015 gets rounded down to zero and no reagents are created if we don't start it with 0.1 in the tank.
+			fluid_rate = 0.1
+		else
+			fluid_rate = CUM_RATE
+		if(reagents.total_volume >= 5)
+			fluid_mult = 0.5
+		else
+			fluid_mult = 1
 		generate_cum()
 
 /obj/item/organ/genital/testicles/proc/generate_cum()

modular_citadel/code/modules/arousal/organs/womb.dm

@@ -9,14 +9,18 @@
 	fluid_id 		= "femcum"
 	producing		= TRUE
 
-/obj/item/organ/genital/womb/Initialize()
-	. = ..()
-	reagents.add_reagent(fluid_id, fluid_max_volume)
-
 /obj/item/organ/genital/womb/on_life()
 	if(QDELETED(src))
 		return
 	if(reagents && producing)
+		if(reagents.total_volume == 0) // Apparently, 0.015 gets rounded down to zero and no reagents are created if we don't start it with 0.1 in the tank.
+			fluid_rate = 0.1
+		else
+			fluid_rate = CUM_RATE
+		if(reagents.total_volume >= 5)
+			fluid_mult = 0.5
+		else
+			fluid_mult = 1
 		generate_femcum()
 
 /obj/item/organ/genital/womb/proc/generate_femcum()

modular_citadel/code/modules/client/loadout/__donator.dm

@@ -226,7 +226,7 @@
 /datum/gear/darksabre
 	name = "Dark Sabre"
 	category = SLOT_IN_BACKPACK
-	path = /obj/item/toy/sword/darksabre
+	path = /obj/item/toy/darksabre
 	ckeywhitelist = list("inferno707")
 
 datum/gear/darksabresheath

modular_citadel/code/modules/clothing/under/under.dm

@@ -5,26 +5,6 @@
 *//////////////////////////////////////////////////////////////////////////////////
 
 
-/obj/item/clothing/under/rank/security/skirt
-	name = "security skirt"
-	desc = "A tactical security skirt for officers complete with Nanotrasen belt buckle."
-	icon = 'modular_citadel/icons/obj/clothing/cit_clothes.dmi'
-	icon_state = "secskirt"
-	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-	item_state = "r_suit"
-	item_color = "secskirt"
-	body_parts_covered = CHEST|GROIN|ARMS
-
-/obj/item/clothing/under/rank/head_of_security/skirt
-	name = "head of security's skirt"
-	desc = "A security skirt decorated for those few with the dedication to achieve the position of Head of Security."
-	icon = 'modular_citadel/icons/obj/clothing/cit_clothes.dmi'
-	icon_state = "hosskirt"
-	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-	item_state = "gy_suit"
-	item_color = "hosskirt"
-	body_parts_covered = CHEST|GROIN|ARMS
-
 /obj/item/clothing/under/corporateuniform
 	name = "corporate uniform"
 	desc = "A comfortable, tight fitting jumpsuit made of premium materials. Not space-proof."

modular_citadel/code/modules/custom_loadout/custom_items.dm

@@ -49,7 +49,7 @@
 	item_color = "steele"
 	medaltype = "medal-silver"
 
-/obj/item/toy/sword/darksabre
+/obj/item/toy/darksabre
 	name = "Kiara's Sabre"
 	desc = "This blade looks as dangerous as its owner."
 	icon = 'icons/obj/custom.dmi'
@@ -58,9 +58,13 @@
 	item_state = "darksabre"
 	lefthand_file = 'modular_citadel/icons/mob/inhands/stunsword_left.dmi'
 	righthand_file = 'modular_citadel/icons/mob/inhands/stunsword_right.dmi'
-	w_class = WEIGHT_CLASS_SMALL
 	attack_verb = list("attacked", "struck", "hit")
 
+/obj/item/toy/darksabre/get_belt_overlay()
+	return mutable_appearance('icons/obj/custom.dmi', "darksheath-darksabre")
+
+/obj/item/toy/darksabre/get_worn_belt_overlay(icon_file)
+	return mutable_appearance(icon_file, "darksheath-darksabre")
 
 /obj/item/storage/belt/sabre/darksabre
 	name = "Ornate Sheathe"
@@ -69,32 +73,8 @@
 	alternate_worn_icon = 'icons/mob/custom_w.dmi'
 	icon_state = "darksheath"
 	item_state = "darksheath"
-	w_class = WEIGHT_CLASS_BULKY
-
-/obj/item/storage/belt/sabre/darksabre/ComponentInitialize()
-	. = ..()
-	GET_COMPONENT(STR, /datum/component/storage)
-	STR.max_items = 1
-	STR.rustle_sound = FALSE
-	STR.max_w_class = WEIGHT_CLASS_BULKY
-	STR.can_hold = typecacheof(list(
-		/obj/item/toy/sword/darksabre
-		))
-
-/obj/item/storage/belt/sabre/darksabre/update_icon()
-	icon_state = "darksheath"
-	item_state = "darksheath"
-	if(contents.len)
-		icon_state += "-darksabre"
-		item_state += "-darksabre"
-	if(loc && isliving(loc))
-		var/mob/living/L = loc
-		L.regenerate_icons()
-	..()
-
-/obj/item/storage/belt/sabre/darksabre/PopulateContents()
-	new /obj/item/toy/sword/darksabre(src)
-	update_icon()
+	fitting_swords = list(/obj/item/toy/darksabre)
+	starting_sword = /obj/item/toy/darksabre
 
 /obj/item/clothing/suit/armor/vest/darkcarapace
 	name = "Dark Armor"

modular_citadel/code/modules/jobs/job_types/captain.dm

@@ -4,7 +4,6 @@
 
 /datum/job/hop
 	minimal_player_age = 20
-	head_announce = list("Service")
 	exp_type_department = EXP_TYPE_SERVICE
 
 	access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_COURT, ACCESS_WEAPONS,

modular_citadel/code/modules/mob/cit_emotes.dm

@@ -185,22 +185,6 @@
 	emote_type = EMOTE_AUDIBLE
 	restraint_check = TRUE
 
-
-
-/datum/emote/living/dab/run_emote(mob/living/user, params)
-	if (ishuman(user))
-		var/def_zone = BODY_ZONE_CHEST
-		var/luck = (rand(1,100))
-		if(luck >= 65)
-			user.adjustStaminaLoss(70)
-		if(luck >= 80)
-			def_zone = pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM)
-			user.apply_damage(20, BRUTE, def_zone)
-		if(luck >= 95)
-			user.adjustBrainLoss(100)
-	. = ..()
-
-
 /datum/emote/living/mothsqueak
 	key = "msqueak"
 	key_third_person = "lets out a tiny squeak"

modular_citadel/code/modules/mob/living/carbon/human/species.dm

@@ -80,21 +80,23 @@
 		else
 			target.Move(target_shove_turf, shove_dir)
 			if(get_turf(target) == target_oldturf)
-				var/thoushallnotpass = FALSE
-				for(var/obj/O in target_shove_turf)
-					if(O.density)
-						shove_blocked = TRUE
+				if(target_shove_turf.density)
+					shove_blocked = TRUE
+				else
+					var/thoushallnotpass = FALSE
+					for(var/obj/O in target_shove_turf)
 						if(istype(O, /obj/structure/table))
 							target_table = O
-						else
+						else if(!O.CanPass(src, target_shove_turf))
+							shove_blocked = TRUE
 							thoushallnotpass = TRUE
-				if(thoushallnotpass)
-					target_table = null
+					if(thoushallnotpass)
+						target_table = null
 
 		if(target.is_shove_knockdown_blocked())
 			return
 
-		if(shove_blocked)
+		if(shove_blocked || target_table)
 			var/directional_blocked = FALSE
 			if(shove_dir in GLOB.cardinals) //Directional checks to make sure that we're not shoving through a windoor or something like that
 				var/target_turf = get_turf(target)

modular_citadel/code/modules/reagents/reagents/cit_reagents.dm

@@ -8,6 +8,7 @@
 	data = list("donor"=null,"viruses"=null,"donor_DNA"=null,"blood_type"=null,"resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null)
 	reagent_state = LIQUID
 	color = "#FFFFFF" // rgb: 255, 255, 255
+	can_synth = FALSE
 	nutriment_factor = 0.5 * REAGENTS_METABOLISM
 
 /datum/reagent/consumable/semen/reaction_turf(turf/T, reac_volume)
@@ -19,7 +20,6 @@
 	var/obj/effect/decal/cleanable/semen/S = locate() in T
 	if(!S)
 		S = new(T)
-	S.reagents.add_reagent("semen", reac_volume)
 	if(data["blood_DNA"])
 		S.add_blood(list(data["blood_DNA"] = data["blood_type"]))
 
@@ -52,6 +52,7 @@
 	data = list("donor"=null,"viruses"=null,"donor_DNA"=null,"blood_type"=null,"resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null)
 	reagent_state = LIQUID
 	color = "#AAAAAA77"
+	can_synth = FALSE
 	nutriment_factor = 0.5 * REAGENTS_METABOLISM
 
 /obj/effect/decal/cleanable/femcum
@@ -85,7 +86,6 @@
 	var/obj/effect/decal/cleanable/femcum/S = locate() in T
 	if(!S)
 		S = new(T)
-	S.reagents.add_reagent("femcum", reac_volume)
 	if(data["blood_DNA"])
 		S.add_blood(list(data["blood_DNA"] = data["blood_type"]))
 

modular_citadel/code/modules/vore/eating/belly_obj_vr.dm

@@ -47,7 +47,7 @@
 	var/tmp/next_process = 0					// Waiting for this SSbellies times_fired to process again.
 	var/tmp/list/items_preserved = list()		// Stuff that wont digest so we shouldn't process it again.
 	var/tmp/next_emote = 0						// When we're supposed to print our next emote, as a belly controller tick #
-	var/tmp/recent_sound = FALSE				// Prevent audio spam
+	var/tmp/recent_sound						// Prevent audio spam
 	var/tmp/last_hearcheck = 0
 	var/tmp/list/hearing_mobs
 
@@ -167,12 +167,13 @@
 	to_chat(owner,"<span class='notice'>[thing] slides into your [lowertext(name)].</span>")
 
 	//Sound w/ antispam flag setting
-	if(is_wet && !recent_sound)
-		for(var/mob/M in get_hearers_in_view(2, get_turf(owner)))
-			if(M.client && (M.client.prefs.cit_toggles & EATING_NOISES))
-				var/sound/devourments = GLOB.vore_sounds[vore_sound]
-				playsound(get_turf(owner),devourments,50,0,-5,0,ignore_walls = FALSE,channel=CHANNEL_PRED)
-				recent_sound = TRUE
+	if(is_wet && (world.time > recent_sound))
+		var/turf/source = get_turf(owner)
+		var/sound/eating = GLOB.vore_sounds[vore_sound]
+		for(var/mob/living/M in get_hearers_in_view(3, source))
+			if(M.client && M.client.prefs.cit_toggles & EATING_NOISES)
+				SEND_SOUND(M, eating)
+				recent_sound = (world.time + 20 SECONDS)
 
 	//Messages if it's a mob
 	if(isliving(thing))
@@ -187,7 +188,7 @@
 	var/atom/destination = drop_location()
 	//Don't bother if we don't have contents
 	if(!contents.len)
-		return 0
+		return FALSE
 
 	var/count = 0
 	for(var/thing in contents)
@@ -206,10 +207,10 @@
 			SEND_SIGNAL(L, COMSIG_ADD_MOOD_EVENT, "emptyprey", /datum/mood_event/emptyprey)
 		AM.forceMove(destination)  // Move the belly contents into the same location as belly's owner.
 		count++
-	for(var/mob/M in get_hearers_in_view(2, get_turf(owner)))
+	for(var/mob/living/M in get_hearers_in_view(2, get_turf(owner)))
 		if(M.client && (M.client.prefs.cit_toggles & EATING_NOISES))
 			var/sound/releasement = GLOB.release_sounds[release_sound]
-			playsound(get_turf(owner),releasement,50,0,-5,0,ignore_walls = FALSE,channel=CHANNEL_PRED)
+			SEND_SOUND(M, releasement)
 
 	//Clean up our own business
 	items_preserved.Cut()
@@ -233,10 +234,10 @@
 	M.forceMove(drop_location())  // Move the belly contents into the same location as belly's owner.
 	items_preserved -= M
 	if(!silent)
-		for(var/mob/H in get_hearers_in_view(2, get_turf(owner)))
+		for(var/mob/living/H in get_hearers_in_view(2, get_turf(owner)))
 			if(H.client && (H.client.prefs.cit_toggles & EATING_NOISES))
 				var/sound/releasement = GLOB.release_sounds[release_sound]
-				playsound(get_turf(owner),releasement,50,0,-5,0,ignore_walls = FALSE,channel=CHANNEL_PRED)
+				SEND_SOUND(H, releasement)
 
 	if(istype(M,/mob/living))
 		var/mob/living/ML = M
@@ -285,10 +286,6 @@
 		SEND_SIGNAL(prey, COMSIG_CLEAR_MOOD_EVENT, "emptyprey", /datum/mood_event/emptyprey)
 
 	prey.forceMove(src)
-	var/sound/preyloop = sound('sound/vore/prey/loop.ogg', repeat = TRUE)
-
-	if(is_wet)
-		prey.playsound_local(loc,preyloop,70,0, channel = CHANNEL_PREYLOOP)
 
 	owner.updateVRPanel()
 
@@ -317,10 +314,12 @@
 		M.cure_blind("belly_[REF(src)]")
 	target.nom_mob(content, target.owner)
 	if(!silent)
-		for(var/mob/M in get_hearers_in_view(5, get_turf(owner)))
-			if(M.client && (M.client.prefs.cit_toggles & EATING_NOISES))
-				var/sound/devourments = GLOB.vore_sounds[vore_sound]
-				playsound(get_turf(owner),devourments,50,0,-5,0,ignore_walls = FALSE,channel=CHANNEL_PRED)
+		var/turf/source = get_turf(owner)
+		var/sound/eating = GLOB.vore_sounds[vore_sound]
+		for(var/mob/living/M in get_hearers_in_view(3, source))
+			if(M.client && M.client.prefs.cit_toggles & EATING_NOISES)
+				SEND_SOUND(M, eating)
+
 	owner.updateVRPanel()
 	for(var/mob/living/M in contents)
 		M.updateVRPanel()
@@ -524,22 +523,25 @@
 	struggle_outer_message = "<span class='alert'>" + struggle_outer_message + "</span>"
 	struggle_user_message = "<span class='alert'>" + struggle_user_message + "</span>"
 
+	var/turf/source = get_turf(owner)
+	var/sound/struggle_snuggle = sound(get_sfx("struggle_sound"))
+	var/sound/struggle_rustle = sound(get_sfx("rustle"))
+
 	if(is_wet)
-		for(var/mob/M in get_hearers_in_view(2, get_turf(owner)))
-			if(M.client && (M.client.prefs.cit_toggles & EATING_NOISES))
-				playsound(get_turf(owner),"struggle_sound",35,0,-5,1,ignore_walls = FALSE,channel=CHANNEL_PRED)
-		R.stop_sound_channel(CHANNEL_PRED)
-		var/sound/prey_struggle = sound(get_sfx("prey_struggle"))
-		R.playsound_local(get_turf(R),prey_struggle,45,0)
+		for(var/mob/living/M in get_hearers_in_view(3, source))
+			if(M.client && M.client.prefs.cit_toggles & EATING_NOISES)
+				SEND_SOUND(M, struggle_snuggle)
 
 	else
-		for(var/mob/M in get_hearers_in_view(2, get_turf(owner)))
-			if(M.client && (M.client.prefs.cit_toggles & EATING_NOISES))
-				playsound(get_turf(owner),"rustle",35,0,-5,1,ignore_walls = FALSE,channel=CHANNEL_PRED)
+		for(var/mob/living/M in get_hearers_in_view(3, source))
+			if(M.client && M.client.prefs.cit_toggles & EATING_NOISES)
+				SEND_SOUND(M, struggle_rustle)
 
-	for(var/mob/M in get_hearers_in_view(3, get_turf(owner)))
+	var/list/watching = hearers(3, owner)
+	for(var/mob/living/M in watching)
 		if(M.client && (M.client.prefs.cit_toggles & EATING_NOISES)) //Might as well censor the normies here too.
 			M.show_message(struggle_outer_message, 1) // visible
+
 	to_chat(R,struggle_user_message)
 
 	if(escapable) //If the stomach has escapable enabled.

modular_citadel/code/modules/vore/eating/bellymodes_vr.dm

@@ -26,10 +26,13 @@
 		if(isbelly(M.loc))
 			if(world.time > M.next_preyloop)
 				if(is_wet)
+					if(!M.client)
+						continue
 					M.stop_sound_channel(CHANNEL_PREYLOOP) // sanity just in case
-					var/sound/preyloop = sound('sound/vore/prey/loop.ogg', repeat = TRUE)
-					M.playsound_local(get_turf(src),preyloop,80,0, channel = CHANNEL_PREYLOOP)
-					M.next_preyloop = world.time + 52 SECONDS
+					if(M.client.prefs.cit_toggles & DIGESTION_NOISES)
+						var/sound/preyloop = sound('sound/vore/prey/loop.ogg', repeat = TRUE)
+						M.playsound_local(get_turf(src),preyloop, 80,0, channel = CHANNEL_PREYLOOP)
+						M.next_preyloop = (world.time + 52 SECONDS)
 
 
 /////////////////////////// Exit Early ////////////////////////////
@@ -63,12 +66,12 @@
 			if(prob(25))
 				if((world.time - NORMIE_HEARCHECK) > last_hearcheck)
 					LAZYCLEARLIST(hearing_mobs)
-					for(var/mob/H in get_hearers_in_view(3, source))
+					for(var/mob/living/H in get_hearers_in_view(3, source))
 						if(!H.client || !(H.client.prefs.cit_toggles & DIGESTION_NOISES))
 							continue
 						LAZYADD(hearing_mobs, H)
 					last_hearcheck = world.time
-				for(var/mob/H in hearing_mobs)
+				for(var/mob/living/H in hearing_mobs)
 					if(!isbelly(H.loc))
 						H.playsound_local(source, null, 45, falloff = 0, S = pred_digest)
 					else if(H in contents)
@@ -100,12 +103,12 @@
 				owner.nutrition += 400 // so eating dead mobs gives you *something*.
 				if((world.time - NORMIE_HEARCHECK) > last_hearcheck)
 					LAZYCLEARLIST(hearing_mobs)
-					for(var/mob/H in get_hearers_in_view(3, source))
+					for(var/mob/living/H in get_hearers_in_view(3, source))
 						if(!H.client || !(H.client.prefs.cit_toggles & DIGESTION_NOISES))
 							continue
 						LAZYADD(hearing_mobs, H)
 					last_hearcheck = world.time
-				for(var/mob/H in hearing_mobs)
+				for(var/mob/living/H in hearing_mobs)
 					if(!isbelly(H.loc))
 						H.playsound_local(source, null, 45, falloff = 0, S = pred_death)
 					else if(H in contents)
@@ -135,12 +138,12 @@
 			if(prob(25))
 				if((world.time - NORMIE_HEARCHECK) > last_hearcheck)
 					LAZYCLEARLIST(hearing_mobs)
-					for(var/mob/H in get_hearers_in_view(3, source))
+					for(var/mob/living/H in get_hearers_in_view(3, source))
 						if(!H.client || !(H.client.prefs.cit_toggles & DIGESTION_NOISES))
 							continue
 						LAZYADD(hearing_mobs, H)
 					last_hearcheck = world.time
-				for(var/mob/H in hearing_mobs)
+				for(var/mob/living/H in hearing_mobs)
 					if(!isbelly(H.loc))
 						H.playsound_local(source, null, 45, falloff = 0, S = pred_digest)
 					else if(H in contents)
@@ -159,12 +162,12 @@
 		if(prob(35))
 			if((world.time - NORMIE_HEARCHECK) > last_hearcheck)
 				LAZYCLEARLIST(hearing_mobs)
-				for(var/mob/H in get_hearers_in_view(3, source))
+				for(var/mob/living/H in get_hearers_in_view(3, source))
 					if(!H.client || !(H.client.prefs.cit_toggles & DIGESTION_NOISES))
 						continue
 					LAZYADD(hearing_mobs, H)
 				last_hearcheck = world.time
-			for(var/mob/H in hearing_mobs)
+			for(var/mob/living/H in hearing_mobs)
 				if(!isbelly(H.loc))
 					H.playsound_local(source, null, 45, falloff = 0, S = pred_digest)
 				else if(H in contents)
@@ -179,12 +182,12 @@
 			if(prob(10))//Less often than gurgles. People might leave this on forever.
 				if((world.time - NORMIE_HEARCHECK) > last_hearcheck)
 					LAZYCLEARLIST(hearing_mobs)
-					for(var/mob/H in get_hearers_in_view(3, source))
+					for(var/mob/living/H in get_hearers_in_view(3, source))
 						if(!H.client || !(H.client.prefs.cit_toggles & DIGESTION_NOISES))
 							continue
 						LAZYADD(hearing_mobs, H)
 					last_hearcheck = world.time
-				for(var/mob/H in hearing_mobs)
+				for(var/mob/living/H in hearing_mobs)
 					if(!isbelly(H.loc))
 						H.playsound_local(source, null, 45, falloff = 0, S = pred_digest)
 					else if(H in contents)
@@ -221,12 +224,12 @@
 			if(prob(55)) //if you're hearing this, you're a vore ho anyway.
 				if((world.time - NORMIE_HEARCHECK) > last_hearcheck)
 					LAZYCLEARLIST(hearing_mobs)
-					for(var/mob/H in get_hearers_in_view(3, source))
+					for(var/mob/living/H in get_hearers_in_view(3, source))
 						if(!H.client || !(H.client.prefs.cit_toggles & DIGESTION_NOISES))
 							continue
 						LAZYADD(hearing_mobs, H)
 					last_hearcheck = world.time
-				for(var/mob/H in hearing_mobs)
+				for(var/mob/living/H in hearing_mobs)
 					if(!isbelly(H.loc))
 						H.playsound_local(source, null, 45, falloff = 0, S = pred_digest)
 					else if(H in contents)
@@ -254,12 +257,12 @@
 				M.visible_message("<span class='notice'>You watch as [owner]'s guts loudly rumble as it finishes off a meal.</span>")
 				if((world.time - NORMIE_HEARCHECK) > last_hearcheck)
 					LAZYCLEARLIST(hearing_mobs)
-					for(var/mob/H in get_hearers_in_view(3, source))
+					for(var/mob/living/H in get_hearers_in_view(3, source))
 						if(!H.client || !(H.client.prefs.cit_toggles & DIGESTION_NOISES))
 							continue
 						LAZYADD(hearing_mobs, H)
 					last_hearcheck = world.time
-				for(var/mob/H in hearing_mobs)
+				for(var/mob/living/H in hearing_mobs)
 					if(!isbelly(H.loc))
 						H.playsound_local(source, null, 45, falloff = 0, S = pred_death)
 					else if(H in contents)

modular_citadel/code/modules/vore/eating/living_vr.dm

@@ -60,18 +60,6 @@
 		B.can_taste = 1
 		return TRUE
 
-/*
-// Hide vore organs in contents
-//
-/datum/proc/view_variables_filter_contents(list/L)
-	return 0
-
-/mob/living/view_variables_filter_contents(list/L)
-	. = ..()
-	var/len_before = L.len
-	L -= vore_organs
-	. += len_before - L.len*/
-
 // Handle being clicked, perhaps with something to devour
 //
 
@@ -121,21 +109,12 @@
 /mob/living/proc/feed_grabbed_to_self(var/mob/living/user, var/mob/living/prey)
 	var/belly = user.vore_selected
 	return perform_the_nom(user, prey, user, belly)
-/*
-/mob/living/proc/eat_held_mob(var/mob/living/user, var/mob/living/prey, var/mob/living/pred)
-	var/belly
-	if(user != pred)
-		belly = input("Choose Belly") in pred.vore_organs
-	else
-		belly = pred.vore_selected
-	return perform_the_nom(user, prey, pred, belly)*/
 
 /mob/living/proc/feed_self_to_grabbed(var/mob/living/user, var/mob/living/pred)
 	var/belly = input("Choose Belly") in pred.vore_organs
 	return perform_the_nom(user, user, pred, belly)
 
 /mob/living/proc/feed_grabbed_to_other(var/mob/living/user, var/mob/living/prey, var/mob/living/pred)
-//	return//disabled until I can make that toggle work
 	var/belly = input("Choose Belly") in pred.vore_organs
 	return perform_the_nom(user, prey, pred, belly)
 
@@ -182,9 +161,13 @@
 
 	// If we got this far, nom successful! Announce it!
 	user.visible_message(success_msg)
-	for(var/mob/M in get_hearers_in_view(5, get_turf(user)))
+
+	// incredibly contentious eating noises time
+	var/turf/source = get_turf(user)
+	var/sound/eating = GLOB.vore_sounds[belly.vore_sound]
+	for(var/mob/living/M in get_hearers_in_view(3, source))
 		if(M.client && M.client.prefs.cit_toggles & EATING_NOISES)
-			playsound(get_turf(user),"[belly.vore_sound]",50,0,-5,0,ignore_walls = FALSE,channel=CHANNEL_PRED)
+			SEND_SOUND(M, eating)
 
 	// Actually shove prey into the belly.
 	belly.nom_mob(prey, user)
@@ -214,41 +197,7 @@
 
 //
 //End vore code.
-/*
-	//Handle case: /obj/item/holder
-		if(/obj/item/holder/micro)
-			var/obj/item/holder/H = I
 
-			if(!isliving(user)) return 0 // Return 0 to continue upper procs
-			var/mob/living/attacker = user  // Typecast to living
-
-			if (is_vore_predator(src))
-				for (var/mob/living/M in H.contents)
-					attacker.eat_held_mob(attacker, M, src)
-				return 1 //Return 1 to exit upper procs
-			else
-				log_attack("[attacker] attempted to feed [H.contents] to [src] ([src.type]) but it failed.")
-
- // I just can't imagine this not being complained about
-	//Handle case: /obj/item/radio/beacon
-		if(/obj/item/radio/beacon)
-			var/confirm = alert(user, "[src == user ? "Eat the beacon?" : "Feed the beacon to [src]?"]", "Confirmation", "Yes!", "Cancel")
-			if(confirm == "Yes!")
-				var/bellychoice = input("Which belly?","Select A Belly") in src.vore_organs
-				var/datum/belly/B = src.vore_organs[bellychoice]
-				src.visible_message("<span class='warning'>[user] is trying to stuff a beacon into [src]'s [bellychoice]!</span>","<span class='warning'>[user] is trying to stuff a beacon into you!</span>")
-				if(do_after(user,30,src))
-					user.drop_item()
-					I.loc = src
-					B.internal_contents += I
-					src.visible_message("<span class='warning'>[src] is fed the beacon!</span>","You're fed the beacon!")
-					playsound(get_turf(src), B.vore_sound,50,0,-6,0)
-					return 1
-				else
-					return 1 //You don't get to hit someone 'later'
-
-	return 0
-*/
 
 //
 // Our custom resist catches for /mob/living
@@ -272,7 +221,7 @@
 	if(isbelly(loc))
 		src.stop_sound_channel(CHANNEL_PREYLOOP) // sanity just in case
 		var/sound/preyloop = sound('sound/vore/prey/loop.ogg', repeat = TRUE)
-		src.playsound_local(get_turf(src),preyloop,80,0, channel = CHANNEL_PREYLOOP)
+		SEND_SOUND(src, preyloop)
 	else
 		to_chat(src, "<span class='alert'>You aren't inside anything, you clod.</span>")
 

modular_citadel/code/modules/vore/eating/vorepanel_vr.dm

@@ -57,7 +57,7 @@
 /datum/vore_look/proc/gen_vui(var/mob/living/user)
 	var/dat
 	dat += "Remember to toggle the vore mode, it's to the left of your combat toggle. Open mouth means you're voracious!<br>"
-	dat += "Remember that your prey is blind, use audible mode subtle messages to communicate to them with posts!<br>"
+	dat += "Remember that the prey is blind, use audible mode subtle messages to communicate to them with posts!<br>"
 	dat += "<HR>"
 	var/atom/userloc = user.loc
 	if (isbelly(userloc))
@@ -554,7 +554,7 @@
 	if(href_list["b_releasesoundtest"])
 		var/sound/releasetest = GLOB.release_sounds[selected.release_sound]
 		if(releasetest)
-			user << releasetest
+			SEND_SOUND(user, releasetest)
 
 	if(href_list["b_sound"])
 		var/choice = input(user,"Currently set to [selected.vore_sound]","Select Sound") as null|anything in GLOB.vore_sounds
@@ -567,7 +567,7 @@
 	if(href_list["b_soundtest"])
 		var/sound/voretest = GLOB.vore_sounds[selected.vore_sound]
 		if(voretest)
-			user << voretest
+			SEND_SOUND(user, voretest)
 
 	if(href_list["b_tastes"])
 		selected.can_taste = !selected.can_taste