Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156

modular_citadel/code/modules/arousal/genitals.dm

@@ -11,7 +11,7 @@
 	var/fluid_id = null
 	var/fluid_max_volume = 50
 	var/fluid_efficiency = 1
-	var/fluid_rate = 1
+	var/fluid_rate = CUM_RATE
 	var/fluid_mult = 1
 	var/aroused_state = FALSE //Boolean used in icon_state strings
 	var/aroused_amount = 50 //This is a num from 0 to 100 for arousal percentage for when to use arousal state icons.
@@ -117,9 +117,15 @@
 		generate_fluid()
 
 /obj/item/organ/genital/proc/generate_fluid()
+	var/amount = fluid_rate
+	if(!reagents.total_volume && amount < 0.1) // 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.
+		amount += 0.1
+	var/multiplier = fluid_mult
+	if(reagents.total_volume >= 5)
+		multiplier *= 0.5
 	if(reagents.total_volume < reagents.maximum_volume)
 		reagents.isolate_reagent(fluid_id)//remove old reagents if it changed and just clean up generally
-		reagents.add_reagent(fluid_id, (fluid_mult * fluid_rate))//generate the cum
+		reagents.add_reagent(fluid_id, (amount * multiplier))//generate the cum
 		return TRUE
 	return FALSE
 

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

@@ -7,4 +7,4 @@
 	slot = ORGAN_SLOT_WOMB
 	genital_flags = GENITAL_INTERNAL|GENITAL_FUID_PRODUCTION
 	fluid_id = "femcum"
-	linked_organ_slot = ORGAN_SLOT_VAGINA
+	linked_organ_slot = ORGAN_SLOT_VAGINA

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
@@ -434,3 +434,11 @@ datum/gear/darksabresheath
 	category = SLOT_NECK
 	path = /obj/item/bedsheet/captain
 	ckeywhitelist = list("tikibomb")
+
+/datum/gear/borgplush
+	name = "Robot Plush"
+	category = SLOT_IN_BACKPACK
+	/obj/item/toy/plush/borgplushie
+	ckeywhitelist = list("nicholaiavenicci")
+
+

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

@@ -23,11 +23,6 @@
 	category = SLOT_IN_BACKPACK
 	path = /obj/item/toy/plush/lampplushie
 
-/datum/gear/plushrng
-	name = "Random plushie"
-	category = SLOT_IN_BACKPACK
-	path = /obj/item/toy/plush/random
-
 /datum/gear/tennis
 	name = "Classic Tennis Ball"
 	category = SLOT_IN_BACKPACK
@@ -84,8 +79,24 @@
 	path = /obj/item/toy/katana
 	cost = 3
 
-//datum/gear/lumeyes
-//	name = "Luminescent eye auto surgeon"
-//	category = SLOT_IN_BACKPACK
-//	path = /obj/item/autosurgeon/gloweyes
-//	cost = 4
+/datum/gear/box
+	name = "Spare box"
+	category = SLOT_IN_BACKPACK
+	path = /obj/item/storage/box
+	cost = 2
+
+/datum/gear/crowbar
+	name = "Pocket Crowbar"
+	category = SLOT_IN_BACKPACK
+	path = /obj/item/crowbar
+	cost = 2
+
+/datum/gear/tapeplayer
+	name = "Taperecorder"
+	category = SLOT_IN_BACKPACK
+	path = /obj/item/taperecorder
+
+/datum/gear/tape
+	name = "Spare cassette tape"
+	category = SLOT_IN_BACKPACK
+	path = /obj/item/tape/random

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

@@ -5,7 +5,8 @@
 *//////////////////////////////////////////////////////////////////////////////////
 //  <3 Nienhaus && Joan.
 // I made the Voy and DS9 stuff tho. - Poojy
-
+// Armor lists for even Heads of Staff is Nulled out do round start armor as well most armor going onto the suit itself rather then a armor slot - Trilby
+///////////////////////////////////////////////////////////////////////////////////
 
 
 /obj/item/clothing/under/rank/trek
@@ -22,7 +23,7 @@
 	desc = "The uniform worn by command officers in the mid 2260s."
 	icon_state = "trek_command"
 	item_state = "trek_command"
-	armor = list("melee" = 10, "bullet" = 10, "laser" = 10,"energy" = 10, "bomb" = 0, "bio" = 10, "rad" = 10, "fire" = 0, "acid" = 0) // Considering only staff heads get to pick it
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) 
 
 /obj/item/clothing/under/rank/trek/engsec
 	name = "Operations Uniform"
@@ -104,7 +105,7 @@
 		/obj/item/reagent_containers/glass/bottle/vial,/obj/item/reagent_containers/glass/beaker,
 		/obj/item/reagent_containers/pill,/obj/item/storage/pill_bottle, /obj/item/restraints/handcuffs,/obj/item/hypospray
 		)
-	armor = list("melee" = 10, "bullet" = 5, "laser" = 5,"energy" = 5, "bomb" = 5, "bio" = 5, "rad" = 10, "fire" = 10, "acid" = 0)
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
 
 /obj/item/clothing/suit/storage/trek/ds9/admiral // Only for adminuz
 	name = "Admiral Overcoat"
@@ -135,7 +136,6 @@
 /obj/item/clothing/suit/storage/fluff/fedcoat
 	name = "Federation Uniform Jacket"
 	desc = "A uniform jacket from the United Federation. Set phasers to awesome."
-
 	icon = 'modular_citadel/icons/obj/clothing/trek_item_icon.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi'
 	icon_state = "fedcoat"
@@ -160,7 +160,7 @@
 				/obj/item/reagent_containers/glass/beaker,
 				/obj/item/storage/pill_bottle,
 				/obj/item/taperecorder)
-	armor = list("melee" = 10, "bullet" = 5, "laser" = 5,"energy" = 5, "bomb" = 5, "bio" = 5, "rad" = 10, "fire" = 10, "acid" = 0)
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
 	var/unbuttoned = 0
 
 	verb/toggle()
@@ -214,7 +214,7 @@
 		/obj/item/reagent_containers/glass/bottle/vial,/obj/item/reagent_containers/glass/beaker,
 		/obj/item/reagent_containers/pill,/obj/item/storage/pill_bottle, /obj/item/restraints/handcuffs,/obj/item/hypospray
 		)
-	armor = list("melee" = 10, "bullet" = 5, "laser" = 5,"energy" = 5, "bomb" = 5, "bio" = 5, "rad" = 10, "fire" = 10, "acid" = 0)
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
 
 	//Variants
 /obj/item/clothing/suit/storage/fluff/modernfedcoat/medsci
@@ -231,6 +231,7 @@
 
 /obj/item/clothing/head/caphat/formal/fedcover
 	name = "Federation Officer's Cap"
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
 	desc = "An officer's cap that demands discipline from the one who wears it."
 	icon = 'modular_citadel/icons/obj/clothing/trek_item_icon.dmi'
 	icon_state = "fedcapofficer"

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,10 +80,23 @@
 		else
 			target.Move(target_shove_turf, shove_dir)
 			if(get_turf(target) == target_oldturf)
-				target_table = locate(/obj/structure/table) in target_shove_turf.contents
-				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 if(!O.CanPass(src, target_shove_turf))
+							shove_blocked = TRUE
+							thoushallnotpass = TRUE
+					if(thoushallnotpass)
+						target_table = null
 
-		if(shove_blocked && !target.is_shove_knockdown_blocked())
+		if(target.is_shove_knockdown_blocked())
+			return
+
+		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/mob/living/carbon/human/species_types/jellypeople.dm

@@ -15,7 +15,6 @@
 	say_mod = "says"
 	hair_color = "mutcolor"
 	hair_alpha = 160 //a notch brighter so it blends better.
-	liked_food = MEAT
 	coldmod = 3
 	heatmod = 1
 	burnmod = 1

modular_citadel/code/modules/mob/living/status_procs.dm

@@ -1,10 +0,0 @@
-/mob/living/Knockdown(amount, updating = TRUE, ignore_canknockdown = FALSE, override_hardstun, override_stamdmg) //Can't go below remaining duration
-	if(((status_flags & CANKNOCKDOWN) && !HAS_TRAIT(src, TRAIT_STUNIMMUNE)) || ignore_canknockdown)
-		if(absorb_stun(isnull(override_hardstun)? amount : override_hardstun, ignore_canknockdown))
-			return
-		var/datum/status_effect/incapacitating/knockdown/K = IsKnockdown()
-		if(K)
-			K.duration = max(world.time + (isnull(override_hardstun)? amount : override_hardstun), K.duration)
-		else if((amount || override_hardstun) > 0)
-			K = apply_status_effect(STATUS_EFFECT_KNOCKDOWN, amount, updating, override_hardstun, override_stamdmg)
-		return K

modular_citadel/code/modules/projectiles/gun.dm

@@ -9,13 +9,3 @@
 		return 0
 	else
 		return ..()
-
-/obj/item/gun/proc/getinaccuracy(mob/living/user)
-	if(!iscarbon(user))
-		return 0
-	else
-		var/mob/living/carbon/holdingdude = user
-		if(istype(holdingdude) && holdingdude.combatmode)
-			return max((holdingdude.lastdirchange + weapon_weight * 25) - world.time,0)
-		else
-			return weapon_weight * 25

modular_citadel/code/modules/projectiles/guns/ballistic/flechette.dm

@@ -1,117 +0,0 @@
-//////Flechette Launcher//////
-
-///projectiles///
-
-/obj/item/projectile/bullet/cflechetteap	//shreds armor
-	name = "flechette (armor piercing)"
-	damage = 8
-	armour_penetration = 80
-
-/obj/item/projectile/bullet/cflechettes		//shreds flesh and forces bleeding
-	name = "flechette (serrated)"
-	damage = 15
-	dismemberment = 10
-	armour_penetration = -80
-
-/obj/item/projectile/bullet/cflechettes/on_hit(atom/target, blocked = FALSE)
-	if((blocked != 100) && iscarbon(target))
-		var/mob/living/carbon/C = target
-		C.bleed(10)
-	return ..()
-
-///ammo casings (CASELESS AMMO CASINGS WOOOOOOOO)///
-
-/obj/item/ammo_casing/caseless/flechetteap
-	name = "flechette (armor piercing)"
-	desc = "A flechette made with a tungsten alloy."
-	projectile_type = /obj/item/projectile/bullet/cflechetteap
-	caliber = "flechette"
-	throwforce = 1
-	throw_speed = 3
-
-/obj/item/ammo_casing/caseless/flechettes
-	name = "flechette (serrated)"
-	desc = "A serrated flechette made of a special alloy intended to deform drastically upon penetration of human flesh."
-	projectile_type = /obj/item/projectile/bullet/cflechettes
-	caliber = "flechette"
-	throwforce = 2
-	throw_speed = 3
-	embedding = list("embedded_pain_multiplier" = 0, "embed_chance" = 40, "embedded_fall_chance" = 10)
-
-///magazine///
-
-/obj/item/ammo_box/magazine/flechette
-	name = "flechette magazine (armor piercing)"
-	icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
-	icon_state = "flechettemag"
-	ammo_type = /obj/item/ammo_casing/caseless/flechetteap
-	caliber = "flechette"
-	max_ammo = 40
-	multiple_sprites = 2
-
-/obj/item/ammo_box/magazine/flechette/s
-	name = "flechette magazine (serrated)"
-	ammo_type = /obj/item/ammo_casing/caseless/flechettes
-
-///the gun itself///
-
-/obj/item/gun/ballistic/automatic/flechette
-	name = "\improper CX Flechette Launcher"
-	desc = "A flechette launching machine pistol with an unconventional bullpup frame."
-	icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
-	icon_state = "flechettegun"
-	item_state = "gun"
-	w_class = WEIGHT_CLASS_NORMAL
-	slot_flags = 0
-	/obj/item/firing_pin/implant/pindicate
-	mag_type = /obj/item/ammo_box/magazine/flechette/
-	fire_sound = 'sound/weapons/gunshot_smg.ogg'
-	can_suppress = 0
-	burst_size = 5
-	fire_delay = 1
-	casing_ejector = 0
-	spread = 10
-	recoil = 0.05
-
-/obj/item/gun/ballistic/automatic/flechette/update_icon()
-	..()
-	if(magazine)
-		cut_overlays()
-		add_overlay("flechettegun-magazine")
-	else
-		cut_overlays()
-	icon_state = "[initial(icon_state)][chambered ? "" : "-e"]"
-
-///unique variant///
-
-/obj/item/projectile/bullet/cflechetteshredder
-	name = "flechette (shredder)"
-	damage = 5
-	dismemberment = 40
-
-/obj/item/ammo_casing/caseless/flechetteshredder
-	name = "flechette (shredder)"
-	desc = "A serrated flechette made of a special alloy that forms a monofilament edge."
-	projectile_type = /obj/item/projectile/bullet/cflechettes
-
-/obj/item/ammo_box/magazine/flechette/shredder
-	name = "flechette magazine (shredder)"
-	icon_state = "shreddermag"
-	ammo_type = /obj/item/ammo_casing/caseless/flechetteshredder
-
-/obj/item/gun/ballistic/automatic/flechette/shredder
-	name = "\improper CX Shredder"
-	desc = "A flechette launching machine pistol made of ultra-light CFRP optimized for firing serrated monofillament flechettes."
-	w_class = WEIGHT_CLASS_SMALL
-	mag_type = /obj/item/ammo_box/magazine/flechette/shredder
-	spread = 15
-	recoil = 0.1
-
-/obj/item/gun/ballistic/automatic/flechette/shredder/update_icon()
-	..()
-	if(magazine)
-		cut_overlays()
-		add_overlay("shreddergun-magazine")
-	else
-		cut_overlays()
-	icon_state = "[initial(icon_state)][chambered ? "" : "-e"]"

modular_citadel/code/modules/projectiles/guns/ballistic/magweapon.dm

@@ -86,7 +86,7 @@
 /obj/item/ammo_box/magazine/mmag/small
 	name = "magpistol magazine (non-lethal disabler)"
 	icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
-	icon_state = "nlmagmag"
+	icon_state = "smallmagmag"
 	ammo_type = /obj/item/ammo_casing/caseless/anlmags
 	caliber = "mags"
 	max_ammo = 15

modular_citadel/code/modules/projectiles/guns/ballistic/magweapon_energy.dm

@@ -56,7 +56,7 @@
 /obj/item/ammo_box/magazine/mmag_e/small
 	name = "magpistol magazine (non-lethal disabler)"
 	icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
-	icon_state = "nlmagmag"
+	icon_state = "smallmagmag"
 	ammo_type = /obj/item/ammo_casing/caseless/mag_e/anlmags
 	caliber = "mag_e"
 	max_ammo = 16

modular_citadel/code/modules/projectiles/guns/ballistic/rifles.dm

@@ -123,8 +123,8 @@
 	item_state = "gun"
 	w_class = WEIGHT_CLASS_NORMAL
 	slot_flags = 0
-	/obj/item/firing_pin/implant/pindicate
-	mag_type = /obj/item/ammo_box/magazine/flechette/
+	pin = /obj/item/firing_pin/implant/pindicate
+	mag_type = /obj/item/ammo_box/magazine/flechette
 	fire_sound = 'sound/weapons/gunshot_smg.ogg'
 	can_suppress = 0
 	burst_size = 5
@@ -134,12 +134,9 @@
 	recoil = 0.05
 
 /obj/item/gun/ballistic/automatic/flechette/update_icon()
-	..()
+	cut_overlays()
 	if(magazine)
-		cut_overlays()
 		add_overlay("flechettegun-magazine")
-	else
-		cut_overlays()
 	icon_state = "[initial(icon_state)][chambered ? "" : "-e"]"
 
 ///unique variant///
@@ -163,17 +160,13 @@
 	name = "\improper CX Shredder"
 	desc = "A flechette launching machine pistol made of ultra-light CFRP optimized for firing serrated monofillament flechettes."
 	w_class = WEIGHT_CLASS_SMALL
-	mag_type = /obj/item/ammo_box/magazine/flechette/shredder
 	spread = 15
 	recoil = 0.1
 
 /obj/item/gun/ballistic/automatic/flechette/shredder/update_icon()
-	..()
+	cut_overlays()
 	if(magazine)
-		cut_overlays()
 		add_overlay("shreddergun-magazine")
-	else
-		cut_overlays()
 	icon_state = "[initial(icon_state)][chambered ? "" : "-e"]"
 
 /*/////////////////////////////////////////////////////////////

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_DNA(list(data["blood_DNA"] = data["blood_type"]))
 
@@ -50,6 +50,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
@@ -82,7 +83,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_DNA(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