Merge branch 'master' into Filet-o-fish

modular_citadel/code/modules/antagonists/cit_crewobjectives.dm

@@ -0,0 +1,35 @@
+/datum/controller/subsystem/ticker/proc/generate_crew_objectives()
+	for(var/datum/mind/crewMind in SSticker.minds)
+		if(prob(5) && !issilicon(crewMind.current) && !jobban_isbanned(crewMind, "Syndicate") && GLOB.miscreants_allowed && ROLE_MISCREANT in crewMind.current.client.prefs.be_special)
+			generate_miscreant_objectives(crewMind)
+		else
+			if(CONFIG_GET(flag/allow_crew_objectives))
+				generate_individual_objectives(crewMind)
+	return
+
+/datum/controller/subsystem/ticker/proc/generate_individual_objectives(var/datum/mind/crewMind)
+	if(!(CONFIG_GET(flag/allow_crew_objectives)))
+		return
+	if(!crewMind)
+		return
+	if(!crewMind.current || !crewMind.objectives || crewMind.special_role)
+		return
+	if(!crewMind.assigned_role)
+		return
+	var/list/validobjs = crewobjjobs["[ckey(crewMind.assigned_role)]"]
+	if(!validobjs || !validobjs.len)
+		return
+	var/selectedObj = pick(validobjs)
+	var/datum/objective/crew/newObjective = new selectedObj
+	if(!newObjective)
+		return
+	newObjective.owner = crewMind
+	crewMind.objectives += newObjective
+	to_chat(crewMind, "<B>As a part of Nanotrasen's anti-tide efforts, you have been assigned an optional objective. It will be checked at the end of the shift. <font color=red>Performing traitorous acts in pursuit of your objective may result in termination of your employment.</font></B>")
+	to_chat(crewMind, "<B>Your optional objective:</B> [newObjective.explanation_text]")
+
+/datum/objective/crew/
+	var/jobs = ""
+	explanation_text = "Yell on the development discussion channel on Citadels discord if this ever shows up. Something just broke here, dude"
+
+/datum/objective/crew/proc/setup()

modular_citadel/code/modules/antagonists/cit_miscreants.dm

@@ -0,0 +1,52 @@
+/datum/controller/subsystem/ticker/proc/generate_miscreant_objectives(var/datum/mind/crewMind)
+	if(!GLOB.miscreants_allowed)
+		return
+	if(!crewMind)
+		return
+	if(!crewMind.current || !crewMind.objectives || crewMind.special_role)
+		return
+	if(!crewMind.assigned_role)
+		return
+	if(!(ROLE_MISCREANT in crewMind.current.client.prefs.be_special))
+		return
+	if(jobban_isbanned(crewMind, "Syndicate"))
+		return
+	var/list/objectiveTypes = miscreantobjlist
+	if(!objectiveTypes.len)
+		return
+	var/selectedType = pick(objectiveTypes)
+	var/datum/objective/miscreant/newObjective = new selectedType
+	if(!newObjective)
+		return
+	newObjective.owner = crewMind
+	crewMind.objectives += newObjective
+	crewMind.special_role = "miscreant"
+	to_chat(crewMind, "<B><font size=3 color=red>You are a Miscreant.</font></B>")
+	to_chat(crewMind, "<B>Pursuing your objective is entirely optional, as the completion of your objective is unable to be tracked. Performing traitorous acts not directly related to your objective may result in permanent termination of your employment.</B>")
+	to_chat(crewMind, "<B>Your objective:</B> [newObjective.explanation_text]")
+
+/datum/objective/miscreant
+	explanation_text = "Something broke. Horribly. Dear god, im so sorry. Yell about this in the development discussion channel of citadels discord."
+
+/*				Goon's Miscreant Objectives				*/
+
+
+/datum/objective/miscreant/incompetent
+	explanation_text = "Be as useless and incompetent as possible without getting killed."
+
+/datum/objective/miscreant/litterbug
+	explanation_text = "Make a huge mess wherever you go."
+
+/datum/objective/miscreant/creepy
+	explanation_text = "Sneak around looking as suspicious as possible without actually doing anything illegal."
+
+/datum/objective/miscreant/whiny
+	explanation_text = "Complain incessantly about every minor issue you find."
+
+/*				Citadel's Miscreant Objectives				*/
+
+/datum/objective/miscreant/immersions
+	explanation_text = "Act as uncharacteristic as you possibly can." // corrected from "Act as out of character as you can" people thought it meant to just ooc in ic
+
+/datum/objective/miscreant/cargonia
+	explanation_text = "Attempt to establish independence of your department."

modular_citadel/code/modules/antagonists/crew_objectives/cit_crewobjectives_cargo.dm

@@ -0,0 +1,81 @@
+/*				CARGO OBJECTIVES				*/
+
+/datum/objective/crew/petsplosion
+	explanation_text = "Ensure there are at least (If you see this, yell on citadels discord in the development discussion channel) pets on the station by the end of the shift. Interpret this as you wish."
+	jobs = "quartermaster,cargotechnician"
+
+/datum/objective/crew/petsplosion/New()
+	. = ..()
+	target_amount = rand(10,30)
+	update_explanation_text()
+
+/datum/objective/crew/petsplosion/update_explanation_text()
+	. = ..()
+	explanation_text = "Ensure there are at least [target_amount] pets on the station by the end of the shift. Interpret this as you wish."
+
+/datum/objective/crew/petsplosion/check_completion()
+	var/petcount = target_amount
+	for(var/mob/living/simple_animal/pet/P in GLOB.mob_list)
+		if(!(P.stat == DEAD))
+			if(P.z == SSmapping.station_start || SSshuttle.emergency.shuttle_areas[get_area(P)])
+				petcount--
+	for(var/mob/living/carbon/human/H in GLOB.mob_list)
+		if(!(H.stat == DEAD))
+			if(H.z == SSmapping.station_start || SSshuttle.emergency.shuttle_areas[get_area(H)])
+				if(istype(H.wear_neck, /obj/item/clothing/neck/petcollar))
+					petcount--
+	if(petcount <= 0)
+		return TRUE
+	else
+		return FALSE
+
+/datum/objective/crew/points //ported from old hippie
+	explanation_text = "Make sure the station has at least (Something broke, report this to the development discussion channel of citadels discord) supply points at the end of the shift."
+	jobs = "quartermaster,cargotechnician"
+
+/datum/objective/crew/points/New()
+	. = ..()
+	target_amount = rand(25000,100000)
+	update_explanation_text()
+
+/datum/objective/crew/points/update_explanation_text()
+	. = ..()
+	explanation_text = "Make sure the station has at least [target_amount] supply points at the end of the shift."
+
+/datum/objective/crew/points/check_completion()
+	if(SSshuttle.points >= target_amount)
+		return TRUE
+	else
+		return FALSE
+
+/datum/objective/crew/bubblegum
+	explanation_text = "Ensure Bubblegum is dead at the end of the shift."
+	jobs = "shaftminer"
+
+/datum/objective/crew/bubblegum/check_completion()
+	for(var/mob/living/simple_animal/hostile/megafauna/bubblegum/B in GLOB.mob_list)
+		if(!(B.stat == DEAD))
+			return FALSE
+	return TRUE
+
+/datum/objective/crew/fatstacks //ported from old hippie
+	explanation_text = "Have at least (something broke, report this to the development discussion channel of citadels discord) mining points on your ID at the end of the shift."
+	jobs = "shaftminer"
+
+/datum/objective/crew/fatstacks/New()
+	. = ..()
+	target_amount = rand(15000,50000)
+	update_explanation_text()
+
+/datum/objective/crew/fatstacks/update_explanation_text()
+	. = ..()
+	explanation_text = "Have at least [target_amount] mining points on your ID at the end of the shift."
+
+/datum/objective/crew/fatstacks/check_completion()
+	if(owner && owner.current)
+		var/mob/living/carbon/human/H = owner.current
+		var/obj/item/card/id/theID = H.get_idcard()
+		if(istype(theID))
+			if(theID.mining_points >= target_amount)
+				return TRUE
+	return FALSE

modular_citadel/code/modules/antagonists/crew_objectives/cit_crewobjectives_civilian.dm

@@ -0,0 +1,249 @@
+/*				CIVILIAN OBJECTIVES			*/
+
+/datum/objective/crew/druglordbot //ported from old Hippie with adjustments
+	var/targetchem = "none"
+	var/datum/reagent/chempath
+	explanation_text = "Have at least (somethin broke here) harvested plants containing (report this on the development discussion channel of citadel's discord) when the shift ends."
+	jobs = "botanist"
+
+/datum/objective/crew/druglordbot/New()
+	. = ..()
+	target_amount = rand(3,20)
+	var/blacklist = list(/datum/reagent/drug, /datum/reagent/drug/menthol, /datum/reagent/medicine, /datum/reagent/medicine/adminordrazine, /datum/reagent/medicine/adminordrazine/nanites, /datum/reagent/medicine/mine_salve, /datum/reagent/medicine/syndicate_nanites, /datum/reagent/medicine/strange_reagent, /datum/reagent/medicine/miningnanites, /datum/reagent/medicine/changelingadrenaline, /datum/reagent/medicine/changelinghaste)
+	var/drugs = typesof(/datum/reagent/drug) - blacklist
+	var/meds = typesof(/datum/reagent/medicine) - blacklist
+	var/chemlist = drugs + meds
+	chempath = pick(chemlist)
+	targetchem = initial(chempath.id)
+	update_explanation_text()
+
+/datum/objective/crew/druglordbot/update_explanation_text()
+	. = ..()
+	explanation_text = "Have at least [target_amount] harvested plants containing [initial(chempath.name)] when the shift ends."
+
+/datum/objective/crew/druglordbot/check_completion()
+	var/pillcount = target_amount
+	if(owner && owner.current)
+		if(owner.current.contents)
+			for(var/obj/item/reagent_containers/food/snacks/grown/P in owner.current.get_contents())
+				if(P.reagents.has_reagent(targetchem))
+					pillcount--
+	if(pillcount <= 0)
+		return TRUE
+	else
+		return FALSE
+
+/datum/objective/crew/foodhoard
+	var/datum/crafting_recipe/food/targetfood
+	var/obj/item/reagent_containers/food/foodpath
+	explanation_text = "Personally deliver at least (yo something broke) (report this to the developer discussion channel in citadels discord)s to Centcom."
+	jobs = "cook"
+
+/datum/objective/crew/foodhoard/New()
+	. = ..()
+	target_amount = rand(2,10)
+	var/blacklist = list(/datum/crafting_recipe/food, /datum/crafting_recipe/food/cak)
+	var/possiblefoods = typesof(/datum/crafting_recipe/food) - blacklist
+	targetfood = pick(possiblefoods)
+	foodpath = initial(targetfood.result)
+	update_explanation_text()
+
+/datum/objective/crew/foodhoard/update_explanation_text()
+	. = ..()
+	explanation_text = "Personally deliver at least [target_amount] [initial(foodpath.name)]s to Centcom."
+
+/datum/objective/crew/foodhoard/check_completion()
+	if(owner && owner.current && owner.current.check_contents_for(foodpath) && SSshuttle.emergency.shuttle_areas[get_area(owner.current)])
+		return TRUE
+	else
+		return FALSE
+
+/datum/objective/crew/responsibility
+	explanation_text = "Make sure nobody dies with alcohol poisoning."
+	jobs = "bartender"
+
+/datum/objective/crew/responsibility/check_completion()
+	for(var/mob/living/carbon/human/H in GLOB.mob_list)
+		if(H.stat == DEAD && H.drunkenness >= 80)
+			if(H.z == SSmapping.station_start || SSshuttle.emergency.shuttle_areas[get_area(H)])
+				return FALSE
+	return TRUE
+
+/datum/objective/crew/clean //ported from old Hippie
+	var/list/areas = list()
+	var/hardmode = FALSE
+	explanation_text = "Ensure sure that (Yo, something broke. Yell about this in citadels devlopmeent discussion channel.) remain spotless at the end of the shift."
+	jobs = "janitor"
+
+/datum/objective/crew/clean/New()
+	. = ..()
+	if(prob(1))
+		hardmode = TRUE
+	var/list/blacklistnormal = list(typesof(/area/space) - typesof(/area/lavaland) - typesof(/area/mine) - typesof(/area/ai_monitored/turret_protected) - typesof(/area/tcommsat))
+	var/list/blacklisthard = list(typesof(/area/lavaland) - typesof(/area/mine))
+	var/list/possibleareas = list()
+	if(hardmode)
+		possibleareas = GLOB.teleportlocs - /area - blacklisthard
+	else
+		possibleareas = GLOB.teleportlocs - /area - blacklistnormal
+	for(var/i in 1 to rand(1,6))
+		areas |= pick_n_take(possibleareas)
+	update_explanation_text()
+
+/datum/objective/crew/clean/update_explanation_text()
+	. = ..()
+	explanation_text = "Ensure that the"
+	for(var/i in 1 to areas.len)
+		var/area/A = areas[i]
+		explanation_text += " [A]"
+		if(i != areas.len && areas.len >= 3)
+			explanation_text += ","
+		if(i == areas.len - 1)
+			explanation_text += "and"
+	explanation_text += " [(areas.len ==1) ? "is completely" : "are [(areas.len == 2) ? "completely" : "all"]"] clean at the end of the shift."
+	if(hardmode)
+		explanation_text += " Chop-chop."
+
+/datum/objective/crew/clean/check_completion()
+	for(var/area/A in areas)
+		for(var/obj/effect/decal/cleanable/C in area_contents(A))
+			if(C && C.alpha >= 150)
+				return FALSE
+	return TRUE
+
+/datum/objective/crew/slipster //ported from old Hippie with adjustments
+	explanation_text = "Slip at least (Yell on citadel's development discussion channel if you see this) different people with your PDA, and have it on you at the end of the shift."
+	jobs = "clown"
+
+/datum/objective/crew/slipster/New()
+	. = ..()
+	target_amount = rand(5, 20)
+	update_explanation_text()
+
+/datum/objective/crew/slipster/update_explanation_text()
+	. = ..()
+	explanation_text = "Slip at least [target_amount] different people with your PDA, and have it on you at the end of the shift."
+
+/datum/objective/crew/slipster/check_completion()
+	var/list/uniqueslips = list()
+	if(owner && owner.current)
+		for(var/obj/item/device/pda/clown/PDA in owner.current.get_contents())
+			for(var/mob/living/carbon/human/H in PDA.slipvictims)
+				uniqueslips |= H
+	if(uniqueslips.len >= target_amount)
+		return TRUE
+	else
+		return FALSE
+
+/datum/objective/crew/vow //ported from old Hippie
+	explanation_text = "Never break your vow of silence."
+	jobs = "mime"
+
+/datum/objective/crew/vow/check_completion()
+	if(owner && owner.current)
+		var/list/say_log = owner.current.logging[INDIVIDUAL_SAY_LOG]
+		if(say_log.len > 0)
+			return FALSE
+	return TRUE
+
+/datum/objective/crew/nullrod
+	explanation_text = "Don't lose your holy rod."
+	jobs = "chaplain"
+
+/datum/objective/crew/nullrod/check_completion()
+	if(owner && owner.current)
+		for(var/nullrodtypes in typesof(/obj/item/nullrod))
+			if(owner.current.check_contents_for(nullrodtypes))
+				return TRUE
+		if(owner.current.getorgan(/obj/item/organ/genital/penis))
+			return TRUE
+	return FALSE
+
+/datum/objective/crew/reporter //ported from old hippie
+	var/charcount = 100
+	explanation_text = "Publish at least (Yo something broke) articles containing at least (Report this to Citadels development channel) characters."
+	jobs = "curator"
+
+/datum/objective/crew/reporter/New()
+	. = ..()
+	target_amount = rand(2,10)
+	charcount = rand(20,250)
+	update_explanation_text()
+
+/datum/objective/crew/reporter/update_explanation_text()
+	. = ..()
+	explanation_text = "Publish at least [target_amount] articles containing at least [charcount] characters."
+
+/datum/objective/crew/reporter/check_completion()
+	if(owner && owner.current)
+		var/ownername = "[ckey(owner.current.real_name)][ckey(owner.assigned_role)]"
+		for(var/datum/newscaster/feed_channel/chan in GLOB.news_network.network_channels)
+			for(var/datum/newscaster/feed_message/msg in chan.messages)
+				if(ckey(msg.returnAuthor()) == ckey(ownername))
+					if(length(msg.returnBody()) >= charcount)
+						target_amount--
+	if(target_amount <= 0)
+		return TRUE
+	else
+		return FALSE
+
+/datum/objective/crew/pwrgame //ported from Goon with adjustments
+	var/obj/item/clothing/targettidegarb
+	explanation_text = "Get your grubby hands on a (Dear god something broke. Report this to Citadel's development dicussion channel)."
+	jobs = "assistant"
+
+/datum/objective/crew/pwrgame/New()
+	. = ..()
+	var/list/muhvalids = list(/obj/item/clothing/mask/gas, /obj/item/clothing/head/welding, /obj/item/clothing/head/ushanka, /obj/item/clothing/gloves/color/yellow, /obj/item/clothing/mask/gas/owl_mask)
+	if(prob(10))
+		muhvalids += list(/obj/item/clothing/suit/space)
+	targettidegarb = pick(muhvalids)
+	update_explanation_text()
+
+/datum/objective/crew/pwrgame/update_explanation_text()
+	. = ..()
+	explanation_text = "Get your grubby hands on a [initial(targettidegarb.name)]."
+/* DM is not a sane language in any way, shape, or form. If anyone wants to try to get this bit functioning proper, I hold no responsibility for broken keyboards.
+	if(owner && owner.current)
+		var/mob/living/carbon/human/H = owner.current
+		if(H && H.dna && H.dna.species && H.dna.species.id)
+			explanation_text = "Get your "
+			if(H.dna.species.id == "avian")
+				explanation_text += "scratchy claws "
+			else if(H.dna.species.id == "mammal")
+				explanation_text += "dirty paws "
+			else if(H.dna.species.id == "aquatic")
+				explanation_text += "fishy hands "
+			else if(H.dna.species.id == "xeno")
+				explanation_text += "weird claws "
+			else if(H.dna.species.id == "guilmon")
+				explanation_text += "digital claws "
+			else if(H.dna.species.id == "lizard")
+				explanation_text += "slimy claws "
+			else if(H.dna.species.id == "datashark")
+				explanation_text += "glitchy hands "
+			else if(H.dna.species.id == "insect")
+				explanation_text += "gross grabbers "
+			else
+				explanation_text += "grubby hands "
+			explanation_text += "on a space suit." replace this if you're making this monstrosity work	*/
+
+/datum/objective/crew/pwrgame/check_completion()
+	if(owner && owner.current)
+		for(var/tidegarbtypes in typesof(targettidegarb))
+			if(owner.current.check_contents_for(tidegarbtypes))
+				return TRUE
+	return FALSE
+
+/datum/objective/crew/promotion //ported from Goon
+	explanation_text = "Have a non-assistant ID registered to you at the end of the shift."
+	jobs = "assistant"
+
+/datum/objective/crew/promotion/check_completion()
+	if(owner && owner.current)
+		var/mob/living/carbon/human/H = owner.current
+		var/obj/item/card/id/theID = H.get_idcard()
+		if(istype(theID))
+			if(!(H.get_assignment() == "Assistant") && !(H.get_assignment() == "No id") && !(H.get_assignment() == "No job"))
+				return TRUE
+	return FALSE

modular_citadel/code/modules/antagonists/crew_objectives/cit_crewobjectives_command.dm

@@ -0,0 +1,33 @@
+/*				COMMAND OBJECTIVES				*/
+
+/datum/objective/crew/caphat //Ported from Goon
+	explanation_text = "Don't lose your hat."
+	jobs = "captain"
+
+/datum/objective/crew/caphat/check_completion()
+	if(owner && owner.current && owner.current.check_contents_for(/obj/item/clothing/head/caphat))
+		return TRUE
+	else
+		return FALSE
+
+/datum/objective/crew/datfukkendisk //Ported from old Hippie
+	explanation_text = "Defend the nuclear authentication disk at all costs, and be the one to personally deliver it to Centcom."
+	jobs = "captain" //give this to other heads at your own risk.
+
+/datum/objective/crew/datfukkendisk/check_completion()
+	if(owner && owner.current && owner.current.check_contents_for(/obj/item/disk/nuclear) && SSshuttle.emergency.shuttle_areas[get_area(owner.current)])
+		return TRUE
+	else
+		return FALSE
+
+/datum/objective/crew/ian //Ported from old Hippie
+	explanation_text = "Defend Ian at all costs, and ensure he gets delivered to Centcom at the end of the shift."
+	jobs = "headofpersonnel"
+
+/datum/objective/crew/ian/check_completion()
+	if(owner && owner.current)
+		for(var/mob/living/simple_animal/pet/dog/corgi/Ian/goodboy in GLOB.mob_list)
+			if(goodboy.stat != DEAD && SSshuttle.emergency.shuttle_areas[get_area(goodboy)])
+				return TRUE
+		return FALSE
+	return FALSE

modular_citadel/code/modules/antagonists/crew_objectives/cit_crewobjectives_engineering.dm

@@ -0,0 +1,34 @@
+/*				ENGINEERING OBJECTIVES				*/
+
+/datum/objective/crew/integrity //ported from old Hippie
+	explanation_text = "Ensure the station's integrity rating is at least (Yo something broke, yell on the development discussion channel of citadels discord about this)% when the shift ends."
+	jobs = "chiefengineer,stationengineer"
+
+/datum/objective/crew/integrity/New()
+	. = ..()
+	target_amount = rand(60,95)
+	update_explanation_text()
+
+/datum/objective/crew/integrity/update_explanation_text()
+	. = ..()
+	explanation_text = "Ensure the station's integrity rating is at least [target_amount]% when the shift ends."
+
+/datum/objective/crew/integrity/check_completion()
+	var/datum/station_state/end_state = new /datum/station_state()
+	end_state.count()
+	var/station_integrity = min(PERCENT(GLOB.start_state.score(end_state)), 100)
+	if(!SSticker.mode.station_was_nuked && station_integrity >= target_amount)
+		return TRUE
+	else
+		return FALSE
+
+/datum/objective/crew/poly
+	explanation_text = "Make sure Poly keeps his headset, and stays alive until the end of the shift."
+	jobs = "chiefengineer"
+
+/datum/objective/crew/poly/check_completion()
+	for(var/mob/living/simple_animal/parrot/Poly/dumbbird in GLOB.mob_list)
+		if(!(dumbbird.stat == DEAD) && dumbbird.ears)
+			if(istype(dumbbird.ears, /obj/item/device/radio/headset))
+				return TRUE
+	return FALSE

modular_citadel/code/modules/antagonists/crew_objectives/cit_crewobjectives_medical.dm

@@ -0,0 +1,86 @@
+/*				MEDICAL OBJECTIVES				*/
+
+/datum/objective/crew/morgue //Ported from old Hippie
+	explanation_text = "Ensure there are no corpses on the station outside of the morgue when the shift ends."
+	jobs = "chiefmedicalofficer,geneticist,medicaldoctor"
+
+/datum/objective/crew/morgue/check_completion()
+	for(var/mob/living/carbon/human/H in GLOB.mob_list)
+		if(H.stat == DEAD && H.z == SSmapping.station_start)
+			if(get_area(H) != /area/medical/morgue)
+				return FALSE
+	return TRUE
+
+/datum/objective/crew/chems //Ported from old Hippie
+	var/targetchem = "none"
+	var/datum/reagent/chempath
+	explanation_text = "Have (yell about this in the development discussion channel of citadel's discord, something broke) in your bloodstream when the shift ends."
+	jobs = "chiefmedicalofficer,chemist"
+
+/datum/objective/crew/chems/New()
+	. = ..()
+	var/blacklist = list(/datum/reagent/drug, /datum/reagent/drug/nicotine, /datum/reagent/drug/menthol, /datum/reagent/medicine, /datum/reagent/medicine/adminordrazine, /datum/reagent/medicine/adminordrazine/nanites, /datum/reagent/medicine/mine_salve, /datum/reagent/medicine/omnizine, /datum/reagent/medicine/syndicate_nanites, /datum/reagent/medicine/earthsblood, /datum/reagent/medicine/strange_reagent, /datum/reagent/medicine/miningnanites, /datum/reagent/medicine/changelingadrenaline, /datum/reagent/medicine/changelinghaste)
+	var/drugs = typesof(/datum/reagent/drug) - blacklist
+	var/meds = typesof(/datum/reagent/medicine) - blacklist
+	var/chemlist = drugs + meds
+	chempath = pick(chemlist)
+	targetchem = initial(chempath.id)
+	update_explanation_text()
+
+/datum/objective/crew/chems/update_explanation_text()
+	. = ..()
+	explanation_text = "Have [initial(chempath.name)] in your bloodstream when the shift ends."
+
+/datum/objective/crew/chems/check_completion()
+	if(owner.current)
+		if(!owner.current.stat == DEAD && owner.current.reagents)
+			if(owner.current.reagents.has_reagent(targetchem))
+				return TRUE
+	else
+		return FALSE
+
+/datum/objective/crew/druglordchem //ported from old Hippie with adjustments
+	var/targetchem = "none"
+	var/datum/reagent/chempath
+	var/chemamount = 0
+	explanation_text = "Have at least (somethin broke here) pills containing at least (like really broke) units of(report this on the development discussion channel of citadel's discord) when the shift ends."
+	jobs = "chemist"
+
+/datum/objective/crew/druglordchem/New()
+	. = ..()
+	target_amount = rand(5,50)
+	chemamount = rand(1,20)
+	var/blacklist = list(/datum/reagent/drug, /datum/reagent/drug/nicotine, /datum/reagent/drug/menthol)
+	var/drugs = typesof(/datum/reagent/drug) - blacklist
+	var/chemlist = drugs
+	chempath = pick(chemlist)
+	targetchem = initial(chempath.id)
+	update_explanation_text()
+
+/datum/objective/crew/druglordchem/update_explanation_text()
+	. = ..()
+	explanation_text = "Have at least [target_amount] pills containing at least [chemamount] units of [initial(chempath.name)] when the shift ends."
+
+/datum/objective/crew/druglordchem/check_completion()
+	var/pillcount = target_amount
+	if(owner.current)
+		if(owner.current.contents)
+			for(var/obj/item/reagent_containers/pill/P in owner.current.get_contents())
+				if(P.reagents.has_reagent(targetchem, chemamount))
+					pillcount--
+	if(pillcount <= 0)
+		return TRUE
+	else
+		return FALSE
+
+/datum/objective/crew/noinfections
+	explanation_text = "Make sure there are no crew members with harmful diseases at the end of the shift."
+	jobs = "virologist"
+
+/datum/objective/crew/noinfections/check_completion()
+	for(var/mob/living/carbon/human/H in GLOB.mob_list)
+		if(!H.stat == DEAD)
+			if(H.z == SSmapping.station_start || SSshuttle.emergency.shuttle_areas[get_area(H)])
+				if(H.check_virus() == 2)
+					return FALSE
+	return TRUE

modular_citadel/code/modules/antagonists/crew_objectives/cit_crewobjectives_science.dm

@@ -0,0 +1,45 @@
+/*				SCIENCE OBJECTIVES				*/
+
+/datum/objective/crew/cyborgs //Ported from old Hippie
+	explanation_text = "Ensure there are at least (Yo something broke here, yell on citadel's development discussion channel about this) functioning cyborgs when the shift ends."
+	jobs = "researchdirector,roboticist"
+
+/datum/objective/crew/cyborgs/New()
+	. = ..()
+	target_amount = rand(3,10)
+	update_explanation_text()
+
+/datum/objective/crew/cyborgs/update_explanation_text()
+	. = ..()
+	explanation_text = "Ensure there are at least [target_amount] functioning cyborgs when the shift ends."
+
+/datum/objective/crew/cyborgs/check_completion()
+	var/borgcount = target_amount
+	for(var/mob/living/silicon/robot/R in GLOB.alive_mob_list)
+		if(!(R.stat == DEAD))
+			borgcount--
+	if(borgcount <= 0)
+		return TRUE
+	else
+		return FALSE
+
+/datum/objective/crew/research //inspired by old hippie's research level objective. should hopefully be compatible with techwebs when that gets finished. hopefully. should be easy to update in the event that it is incompatible with techwebs.
+	var/datum/design/targetdesign
+	explanation_text = "Make sure the research required to produce a (something broke, yell on citadel's development discussion channel about this) is available on the R&D server by the end of the shift."
+	jobs = "researchdirector,scientist"
+
+/datum/objective/crew/research/New()
+	. = ..()
+	targetdesign = pick(subtypesof(/datum/design))
+	update_explanation_text()
+
+/datum/objective/crew/research/update_explanation_text()
+	. = ..()
+	explanation_text = "Make sure the research required to produce a [initial(targetdesign.name)] is available on the R&D server by the end of the shift."
+
+/datum/objective/crew/research/check_completion()
+	for(var/obj/machinery/rnd/server/S in GLOB.machines)
+		if(S && S.stored_research)
+			if(S.stored_research.researched_designs[initial(targetdesign.id)])
+				return TRUE
+	return FALSE

modular_citadel/code/modules/antagonists/crew_objectives/cit_crewobjectives_security.dm

@@ -0,0 +1,23 @@
+/*				SECURITY OBJECTIVES				*/
+
+/datum/objective/crew/enjoyyourstay
+	explanation_text = "Enforce Space Law to the best of your ability."
+	jobs = "headofsecurity,securityofficer,warden,detective"
+
+/datum/objective/crew/enjoyyourstay/check_completion()
+	if(owner && owner.current)
+		if(owner.current.stat != DEAD)
+			return TRUE
+	return FALSE
+
+/datum/objective/crew/justicecrew
+	explanation_text = "Ensure there are no innocent crew members in the brig when the shift ends."
+	jobs = "lawyer"
+
+/datum/objective/crew/justicecrew/check_completion()
+	if(owner && owner.current)
+		for(var/datum/mind/M in SSticker.minds)
+			if(M.current && isliving(M.current))
+				if(!M.special_role && !(M.assigned_role == "Security Officer") && !(M.assigned_role == "Detective") && !(M.assigned_role == "Head of Security") && !(M.assigned_role == "Lawyer") && !(M.assigned_role == "Warden") && get_area(M.current) != typesof(/area/security))
+					return FALSE
+		return TRUE

modular_citadel/code/modules/arousal/arousal.dm

@@ -0,0 +1,544 @@
+//Mob vars
+/mob/living
+	var/arousalloss = 0			//How aroused the mob is.
+	var/min_arousal = 0			//The lowest this mobs arousal will get. default = 0
+	var/max_arousal = 100		//The highest this mobs arousal will get. default = 100
+	var/arousal_rate = 1		//The base rate that arousal will increase in this mob.
+	var/arousal_loss_rate = 1	//How easily arousal can be relieved for this mob.
+	var/canbearoused = FALSE	//Mob-level disabler for arousal. Starts off and can be enabled as features are added for different mob types.
+	var/mb_cd_length = 100		//5 second cooldown for masturbating because fuck spam.
+	var/mb_cd_timer = 0			//The timer itself
+
+/mob/living/carbon/human
+	canbearoused = TRUE
+
+	var/saved_underwear = ""//saves their underwear so it can be toggled later
+	var/saved_undershirt = ""
+
+/mob/living/carbon/human/New()
+	..()
+	saved_underwear = underwear
+	saved_undershirt = undershirt
+
+//Species vars
+/datum/species
+	var/arousal_gain_rate = 1 //Rate at which this species becomes aroused
+	var/arousal_lose_rate = 1 //Multiplier for how easily arousal can be relieved
+	var/list/cum_fluids = list("semen")
+	var/list/milk_fluids = list("milk")
+	var/list/femcum_fluids = list("femcum")
+
+//Mob procs
+/mob/living/proc/handle_arousal()
+
+
+/mob/living/carbon/handle_arousal()
+	if(canbearoused && dna)
+		var/datum/species/S
+		S = dna.species
+		if(S && SSmobs.times_fired%36==2 && getArousalLoss() < max_arousal)//Totally stolen from breathing code. Do this every 36 ticks.
+			adjustArousalLoss(arousal_rate * S.arousal_gain_rate)
+			if(dna.features["exhibitionist"])
+				var/amt_nude = 0
+				if(is_chest_exposed() && (gender == FEMALE || getorganslot("breasts")))
+					amt_nude++
+				if(is_groin_exposed())
+					if(getorganslot("penis"))
+						amt_nude++
+					if(getorganslot("vagina"))
+						amt_nude++
+				var/mob/living/M
+				var/watchers = 0
+				for(M in view(world.view, src))
+					if(M.client && !M.stat && !M.eye_blind && (locate(src) in viewers(world.view,M)))
+						watchers++
+				if(watchers && amt_nude)
+					adjustArousalLoss((amt_nude * watchers) + S.arousal_gain_rate)
+
+
+/mob/living/proc/getArousalLoss()
+	return arousalloss
+
+/mob/living/proc/adjustArousalLoss(amount, updating_arousal=1)
+	if(status_flags & GODMODE || !canbearoused)
+		return 0
+	arousalloss = CLAMP(arousalloss + amount, min_arousal, max_arousal)
+	if(updating_arousal)
+		updatearousal()
+
+/mob/living/proc/setArousalLoss(amount, updating_arousal=1)
+	if(status_flags & GODMODE || !canbearoused)
+		return 0
+	arousalloss = CLAMP(amount, min_arousal, max_arousal)
+	if(updating_arousal)
+		updatearousal()
+
+/mob/living/proc/getPercentAroused()
+	return ((100 / max_arousal) * arousalloss)
+
+/mob/living/proc/isPercentAroused(percentage)//returns true if the mob's arousal (measured in a percent of 100) is greater than the arg percentage.
+	if(!isnum(percentage) || percentage > 100 || percentage < 0)
+		CRASH("Provided percentage is invalid")
+	if(getPercentAroused() >= percentage)
+		return TRUE
+	return FALSE
+
+//H U D//
+/mob/living/proc/updatearousal()
+	update_arousal_hud()
+
+/mob/living/proc/update_arousal_hud()
+	return 0
+
+/datum/species/proc/update_arousal_hud(mob/living/carbon/human/H)
+	return 0
+
+/mob/living/carbon/human/update_arousal_hud()
+	if(!client || !hud_used)
+		return 0
+	if(dna.species.update_arousal_hud())
+		return 0
+	if(!canbearoused)
+		hud_used.arousal.icon_state = ""
+		return 0
+	else
+		if(hud_used.arousal)
+			if(stat == DEAD)
+				hud_used.arousal.icon_state = "arousal0"
+				return 1
+			if(getArousalLoss() == max_arousal)
+				hud_used.arousal.icon_state = "arousal100"
+				return 1
+			if(getArousalLoss() >= (max_arousal / 100) * 90)//M O D U L A R ,   W O W
+				hud_used.arousal.icon_state = "arousal90"
+				return 1
+			if(getArousalLoss() >= (max_arousal / 100) * 80)//M O D U L A R ,   W O W
+				hud_used.arousal.icon_state = "arousal80"
+				return 1
+			if(getArousalLoss() >= (max_arousal / 100) * 70)//M O D U L A R ,   W O W
+				hud_used.arousal.icon_state = "arousal70"
+				return 1
+			if(getArousalLoss() >= (max_arousal / 100) * 60)//M O D U L A R ,   W O W
+				hud_used.arousal.icon_state = "arousal60"
+				return 1
+			if(getArousalLoss() >= (max_arousal / 100) * 50)//M O D U L A R ,   W O W
+				hud_used.arousal.icon_state = "arousal50"
+				return 1
+			if(getArousalLoss() >= (max_arousal / 100) * 40)//M O D U L A R ,   W O W
+				hud_used.arousal.icon_state = "arousal40"
+				return 1
+			if(getArousalLoss() >= (max_arousal / 100) * 30)//M O D U L A R ,   W O W
+				hud_used.arousal.icon_state = "arousal30"
+				return 1
+			if(getArousalLoss() >= (max_arousal / 100) * 20)//M O D U L A R ,   W O W
+				hud_used.arousal.icon_state = "arousal10"
+				return 1
+			if(getArousalLoss() >= (max_arousal / 100) * 10)//M O D U L A R ,   W O W
+				hud_used.arousal.icon_state = "arousal10"
+				return 1
+			else
+				hud_used.arousal.icon_state = "arousal0"
+
+/obj/screen/arousal
+	name = "arousal"
+	icon_state = "arousal0"
+	icon = 'modular_citadel/icons/obj/genitals/hud.dmi'
+	screen_loc = ui_arousal
+
+/obj/screen/arousal/Click()
+	if(!isliving(usr))
+		return 0
+	var/mob/living/M = usr
+	if(M.canbearoused)
+		M.mob_climax()
+		return 1
+	else
+		to_chat(M, "<span class='warning'>Arousal is disabled. Feature is unavailable.</span>")
+
+
+
+/mob/living/proc/mob_climax()//This is just so I can test this shit without being forced to add actual content to get rid of arousal. Will be a very basic proc for a while.
+	set name = "Masturbate"
+	set category = "IC"
+	if(canbearoused && !restrained() && !stat)
+		if(mb_cd_timer <= world.time)
+			//start the cooldown even if it fails
+			mb_cd_timer = world.time + mb_cd_length
+			if(getArousalLoss() >= ((max_arousal / 100) * 33))//33% arousal or greater required
+				src.visible_message("<span class='danger'>[src] starts masturbating!</span>", \
+								"<span class='userdanger'>You start masturbating.</span>")
+				if(do_after(src, 30, target = src))
+					src.visible_message("<span class='danger'>[src] relieves themself!</span>", \
+								"<span class='userdanger'>You have relieved yourself.</span>")
+					setArousalLoss(min_arousal)
+					/*
+					switch(gender)
+						if(MALE)
+							PoolOrNew(/obj/effect/decal/cleanable/semen, loc)
+						if(FEMALE)
+							PoolOrNew(/obj/effect/decal/cleanable/femcum, loc)
+					*/
+			else
+				to_chat(src, "<span class='notice'>You aren't aroused enough for that.</span>")
+
+
+//These are various procs that we'll use later, split up for readability instead of having one, huge proc.
+//For all of these, we assume the arguments given are proper and have been checked beforehand.
+/mob/living/carbon/human/proc/mob_masturbate(obj/item/organ/genital/G, mb_time = 30) //Masturbation, keep it gender-neutral
+	var/total_fluids = 0
+	var/datum/reagents/fluid_source = null
+
+	if(G.producing) //Can it produce its own fluids, such as breasts?
+		fluid_source = G.reagents
+	else
+		if(!G.linked_organ)
+			to_chat(src, "<span class='warning'>Your [G.name] is unable to produce it's own fluids, it's missing the organs for it.</span>")
+			return
+		fluid_source = G.linked_organ.reagents
+	total_fluids = fluid_source.total_volume
+	if(mb_time)
+		src.visible_message("<span class='danger'>[src] starts to [G.masturbation_verb] [p_their()] [G.name].</span>", \
+							"<span class='green'>You start to [G.masturbation_verb] your [G.name].</span>", \
+							"<span class='green'>You start to [G.masturbation_verb] your [G.name].</span>")
+
+	if(do_after(src, mb_time, target = src))
+		if(total_fluids > 5)
+			fluid_source.reaction(src.loc, TOUCH, 1, 0)
+			fluid_source.clear_reagents()
+		src.visible_message("<span class='danger'>[src] orgasms, cumming[istype(src.loc, /turf/open/floor) ? " onto [src.loc]" : ""]!</span>", \
+							"<span class='green'>You cum[istype(src.loc, /turf/open/floor) ? " onto [src.loc]" : ""].</span>", \
+							"<span class='green'>You have relieved yourself.</span>")
+		if(G.can_climax)
+			setArousalLoss(min_arousal)
+
+
+/mob/living/carbon/human/proc/mob_climax_outside(obj/item/organ/genital/G, mb_time = 30) //This is used for forced orgasms and other hands-free climaxes
+	var/total_fluids = 0
+	var/datum/reagents/fluid_source = null
+	var/unable_to_come = FALSE
+
+	if(G.producing) //Can it produce its own fluids, such as breasts?
+		fluid_source = G.reagents
+		total_fluids = fluid_source.total_volume
+	else
+		if(!G.linked_organ)
+			unable_to_come = TRUE
+		else
+			fluid_source = G.linked_organ.reagents
+			total_fluids = fluid_source.total_volume
+
+	if(unable_to_come)
+		src.visible_message("<span class='danger'>[src] shudders, their [G.name] unable to cum.</span>", \
+							"<span class='userdanger'>Your [G.name] cannot cum, giving no relief.</span>", \
+							"<span class='userdanger'>Your [G.name] cannot cum, giving no relief.</span>")
+	else
+		total_fluids = fluid_source.total_volume
+		if(mb_time) //as long as it's not instant, give a warning
+			src.visible_message("<span class='danger'>[src] looks like they're about to cum.</span>", \
+								"<span class='green'>You feel yourself about to orgasm.</span>", \
+								"<span class='green'>You feel yourself about to orgasm.</span>")
+		if(do_after(src, mb_time, target = src))
+			if(total_fluids > 5)
+				fluid_source.reaction(src.loc, TOUCH, 1, 0)
+			fluid_source.clear_reagents()
+			src.visible_message("<span class='danger'>[src] orgasms[istype(src.loc, /turf/open/floor) ? ", spilling onto [src.loc]" : ""], using [p_their()] [G.name]!</span>", \
+								"<span class='green'>You climax[istype(src.loc, /turf/open/floor) ? ", spilling onto [src.loc]" : ""] with your [G.name].</span>", \
+								"<span class='green'>You climax using your [G.name].</span>")
+			if(G.can_climax)
+				setArousalLoss(min_arousal)
+
+
+/mob/living/carbon/human/proc/mob_climax_partner(obj/item/organ/genital/G, mob/living/L, spillage = TRUE, mb_time = 30) //Used for climaxing with any living thing
+	var/total_fluids = 0
+	var/datum/reagents/fluid_source = null
+
+	if(G.producing) //Can it produce its own fluids, such as breasts?
+		fluid_source = G.reagents
+	else
+		if(!G.linked_organ)
+			to_chat(src, "<span class='warning'>Your [G.name] is unable to produce it's own fluids, it's missing the organs for it.</span>")
+			return
+		fluid_source = G.linked_organ.reagents
+	total_fluids = fluid_source.total_volume
+	if(mb_time) //Skip warning if this is an instant climax.
+		src.visible_message("[src] is about to climax with [L]!", \
+							"You're about to climax with [L]!", \
+							"<span class='danger'>You're preparing to climax with someone!</span>")
+	if(spillage)
+		if(do_after(src, mb_time, target = src) && in_range(src, L))
+			fluid_source.trans_to(L, total_fluids*G.fluid_transfer_factor)
+			total_fluids -= total_fluids*G.fluid_transfer_factor
+			if(total_fluids > 5)
+				fluid_source.reaction(L.loc, TOUCH, 1, 0)
+			fluid_source.clear_reagents()
+			src.visible_message("<span class='danger'>[src] climaxes with [L][spillage ? ", overflowing and spilling":""], using [p_their()] [G.name]!</span>", \
+								"<span class='green'>You orgasm with [L][spillage ? ", spilling out of them":""], using your [G.name].</span>", \
+								"<span class='green'>You have climaxed with someone[spillage ? ", spilling out of them":""], using your [G.name].</span>")
+			if(G.can_climax)
+				setArousalLoss(min_arousal)
+	else //knots and other non-spilling orgasms
+		if(do_after(src, mb_time, target = src) && in_range(src, L))
+			fluid_source.trans_to(L, total_fluids)
+			total_fluids = 0
+			src.visible_message("<span class='danger'>[src] climaxes with [L], [p_their()] [G.name] spilling nothing!</span>", \
+								"<span class='green'>You ejaculate with [L], your [G.name] spilling nothing.</span>", \
+								"<span class='green'>You have climaxed inside someone, your [G.name] spilling nothing.</span>")
+			if(G.can_climax)
+				setArousalLoss(min_arousal)
+
+
+/mob/living/carbon/human/proc/mob_fill_container(obj/item/organ/genital/G, obj/item/reagent_containers/container, mb_time = 30) //For beaker-filling, beware the bartender
+	var/total_fluids = 0
+	var/datum/reagents/fluid_source = null
+
+	if(G.producing) //Can it produce its own fluids, such as breasts?
+		fluid_source = G.reagents
+	else
+		if(!G.linked_organ)
+			to_chat(src, "<span class='warning'>Your [G.name] is unable to produce it's own fluids, it's missing the organs for it.</span>")
+			return
+		fluid_source = G.linked_organ.reagents
+	total_fluids = fluid_source.total_volume
+
+	//if(!container) //Something weird happened
+	//	to_chat(src, "<span class='warning'>You need a container to do this!</span>")
+	//	return
+
+	src.visible_message("<span class='danger'>[src] starts to [G.masturbation_verb] their [G.name] over [container].</span>", \
+						"<span class='userdanger'>You start to [G.masturbation_verb] your [G.name] over [container].</span>", \
+						"<span class='userdanger'>You start to [G.masturbation_verb] your [G.name] over something.</span>")
+	if(do_after(src, mb_time, target = src) && in_range(src, container))
+		fluid_source.trans_to(container, total_fluids)
+		src.visible_message("<span class='danger'>[src] uses [p_their()] [G.name] to fill [container]!</span>", \
+							"<span class='green'>You used your [G.name] to fill [container].</span>", \
+							"<span class='green'>You have relieved some pressure.</span>")
+		if(G.can_climax)
+			setArousalLoss(min_arousal)
+
+/mob/living/carbon/human/proc/pick_masturbate_genitals()
+	var/obj/item/organ/genital/ret_organ
+	var/list/genitals_list = list()
+	var/list/worn_stuff = get_equipped_items()
+
+	for(var/obj/item/organ/genital/G in internal_organs)
+		if(G.can_masturbate_with) //filter out what you can't masturbate with
+			if(G.is_exposed(worn_stuff)) //Nude or through_clothing
+				genitals_list += G
+	if(genitals_list.len)
+		ret_organ = input(src, "with what?", "Masturbate", null)  as null|obj in genitals_list
+		return ret_organ
+	return null //error stuff
+
+
+/mob/living/carbon/human/proc/pick_climax_genitals()
+	var/obj/item/organ/genital/ret_organ
+	var/list/genitals_list = list()
+	var/list/worn_stuff = get_equipped_items()
+
+	for(var/obj/item/organ/genital/G in internal_organs)
+		if(G.can_climax) //filter out what you can't masturbate with
+			if(G.is_exposed(worn_stuff)) //Nude or through_clothing
+				genitals_list += G
+	if(genitals_list.len)
+		ret_organ = input(src, "with what?", "Climax", null)  as null|obj in genitals_list
+		return ret_organ
+	return null //error stuff
+
+
+/mob/living/carbon/human/proc/pick_partner()
+	var/list/partners = list()
+	if(src.pulling)
+		partners += src.pulling //Yes, even objects for now
+	if(src.pulledby)
+		partners += src.pulledby
+	//Now we got both of them, let's check if they're proper
+	for(var/I in partners)
+		if(isliving(I))
+			if(iscarbon(I))
+				var/mob/living/carbon/C = I
+				if(!C.exposed_genitals.len) //Nothing through_clothing
+					if(!C.is_groin_exposed()) //No pants undone
+						if(!C.is_chest_exposed()) //No chest exposed
+							partners -= I //Then not proper, remove them
+		else
+			partners -= I //No fucking objects
+	//NOW the list should only contain correct partners
+	if(!partners.len)
+		return null //No one left.
+	return input(src, "With whom?", "Sexual partner", null) in partners //pick one, default to null
+
+/mob/living/carbon/human/proc/pick_climax_container()
+	var/obj/item/reagent_containers/SC = null
+	var/list/containers_list = list()
+
+	for(var/obj/item/reagent_containers/container in held_items)
+		if(container.is_open_container() || istype(container, /obj/item/reagent_containers/food/snacks))
+			containers_list += container
+
+	if(containers_list.len)
+		SC = input(src, "Into or onto what?(Cancel for nowhere)", null)  as null|obj in containers_list
+		if(SC)
+			if(in_range(src, SC))
+				return SC
+	return null //If nothing correct, give null.
+
+
+//Here's the main proc itself
+/mob/living/carbon/human/mob_climax(forced_climax=FALSE) //Forced is instead of the other proc, makes you cum if you have the tools for it, ignoring restraints
+	if(mb_cd_timer > world.time)
+		if(!forced_climax) //Don't spam the message to the victim if forced to come too fast
+			to_chat(src, "<span class='warning'>You need to wait [round((mb_cd_timer - world.time)/(20))] seconds before you can do that again!</span>")
+		return
+	mb_cd_timer = (world.time + mb_cd_length)
+
+
+	if(canbearoused && has_dna())
+		if(stat==2)
+			to_chat(src, "<span class='warning'>You can't do that while dead!</span>")
+			return
+		if(forced_climax) //Something forced us to cum, this is not a masturbation thing and does not progress to the other checks
+			for(var/obj/item/organ/O in internal_organs)
+				if(istype(O, /obj/item/organ/genital))
+					var/obj/item/organ/genital/G = O
+					if(!G.can_climax) //Skip things like wombs and testicles
+						continue
+					var/mob/living/partner
+					var/check_target
+					var/list/worn_stuff = get_equipped_items()
+
+					if(G.is_exposed(worn_stuff))
+						if(src.pulling) //Are we pulling someone? Priority target, we can't be making option menus for this, has to be quick
+							if(isliving(src.pulling)) //Don't fuck objects
+								check_target = src.pulling
+						if(src.pulledby && !check_target) //prioritise pulled over pulledby
+							if(isliving(src.pulledby))
+								check_target = src.pulledby
+						//Now we should have a partner, or else we have to come alone
+						if(check_target)
+							if(iscarbon(check_target)) //carbons can have clothes
+								var/mob/living/carbon/C = check_target
+								if(C.exposed_genitals.len || C.is_groin_exposed() || C.is_chest_exposed()) //Are they naked enough?
+									partner = C
+							else //A cat is fine too
+								partner = check_target
+						if(partner) //Did they pass the clothing checks?
+							mob_climax_partner(G, partner, mb_time = 0) //Instant climax due to forced
+							continue //You've climaxed once with this organ, continue on
+					//not exposed OR if no partner was found while exposed, climax alone
+					mob_climax_outside(G, mb_time = 0) //removed climax timer for sudden, forced orgasms
+			//Now all genitals that could climax, have.
+			//Since this was a forced climax, we do not need to continue with the other stuff
+			return
+		//If we get here, then this is not a forced climax and we gotta check a few things.
+
+		if(stat==1) //No sleep-masturbation, you're unconscious.
+			to_chat(src, "<span class='warning'>You must be conscious to do that!</span>")
+			return
+		if(getArousalLoss() < 33) //flat number instead of percentage
+			to_chat(src, "<span class='warning'>You aren't aroused enough for that!</span>")
+			return
+
+		//Ok, now we check what they want to do.
+		var/choice = input(src, "Select sexual activity", "Sexual activity:") in list("Masturbate", "Climax alone", "Climax with partner", "Fill container")
+
+		switch(choice)
+			if("Masturbate")
+				if(restrained(TRUE)) //TRUE ignores grabs
+					to_chat(src, "<span class='warning'>You can't do that while restrained!</span>")
+					return
+				var/free_hands = get_num_arms()
+				if(!free_hands)
+					to_chat(src, "<span class='warning'>You need at least one free arm.</span>")
+					return
+				for(var/helditem in held_items)//how many hands are free
+					if(isobj(helditem))
+						free_hands--
+				if(free_hands <= 0)
+					to_chat(src, "<span class='warning'>You're holding too many things.</span>")
+					return
+				//We got hands, let's pick an organ
+				var/obj/item/organ/genital/picked_organ
+				picked_organ = pick_masturbate_genitals()
+				if(picked_organ)
+					mob_masturbate(picked_organ)
+					return
+				else //They either lack organs that can masturbate, or they didn't pick one.
+					to_chat(src, "<span class='warning'>You cannot masturbate without choosing genitals.</span>")
+					return
+
+			if("Climax alone")
+				if(restrained(TRUE)) //TRUE ignores grabs
+					to_chat(src, "<span class='warning'>You can't do that while restrained!</span>")
+					return
+				var/free_hands = get_num_arms()
+				if(!free_hands)
+					to_chat(src, "<span class='warning'>You need at least one free arm.</span>")
+					return
+				for(var/helditem in held_items)//how many hands are free
+					if(isobj(helditem))
+						free_hands--
+				if(free_hands <= 0)
+					to_chat(src, "<span class='warning'>You're holding too many things.</span>")
+					return
+				//We got hands, let's pick an organ
+				var/obj/item/organ/genital/picked_organ
+				picked_organ = pick_climax_genitals()
+				if(picked_organ)
+					mob_climax_outside(picked_organ)
+					return
+				else //They either lack organs that can masturbate, or they didn't pick one.
+					to_chat(src, "<span class='warning'>You cannot climax without choosing genitals.</span>")
+					return
+
+			if("Climax with partner")
+				//We need no hands, we can be restrained and so on, so let's pick an organ
+				var/obj/item/organ/genital/picked_organ
+				picked_organ = pick_climax_genitals()
+				if(picked_organ)
+					var/mob/living/partner = pick_partner() //Get someone
+					if(partner)
+						var/spillage = input(src, "Would your fluids spill outside?", "Choose overflowing option", "Yes") as anything in list("Yes", "No")
+						if(spillage == "Yes")
+							mob_climax_partner(picked_organ, partner, TRUE)
+						else
+							mob_climax_partner(picked_organ, partner, FALSE)
+						return
+					else
+						to_chat(src, "<span class='warning'>You cannot do this alone.</span>")
+						return
+				else //They either lack organs that can masturbate, or they didn't pick one.
+					to_chat(src, "<span class='warning'>You cannot climax without choosing genitals.</span>")
+					return
+
+			if("Fill container")
+				//We'll need hands and no restraints.
+				if(restrained(TRUE)) //TRUE ignores grabs
+					to_chat(src, "<span class='warning'>You can't do that while restrained!</span>")
+					return
+				var/free_hands = get_num_arms()
+				if(!free_hands)
+					to_chat(src, "<span class='warning'>You need at least one free arm.</span>")
+					return
+				for(var/helditem in held_items)//how many hands are free
+					if(isobj(helditem))
+						free_hands--
+				if(free_hands <= 0)
+					to_chat(src, "<span class='warning'>You're holding too many things.</span>")
+					return
+				//We got hands, let's pick an organ
+				var/obj/item/organ/genital/picked_organ
+				picked_organ = pick_climax_genitals() //Gotta be climaxable, not just masturbation, to fill with fluids.
+				if(picked_organ)
+					//Good, got an organ, time to pick a container
+					var/obj/item/reagent_containers/fluid_container = pick_climax_container()
+					if(fluid_container)
+						mob_fill_container(picked_organ, fluid_container)
+						return
+					else
+						to_chat(src, "<span class='warning'>You cannot do this without anything to fill.</span>")
+						return
+				else //They either lack organs that can climax, or they didn't pick one.
+					to_chat(src, "<span class='warning'>You cannot fill anything without choosing genitals.</span>")
+					return
+			else //Somehow another option was taken, maybe something interrupted the selection or it was cancelled
+				return //Just end it in that case.

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

@@ -0,0 +1,65 @@
+/obj/item/organ/genital/breasts
+	name 					= "breasts"
+	desc 					= "Female milk producing organs."
+	icon_state 				= "breasts"
+	icon 					= 'modular_citadel/icons/obj/genitals/breasts.dmi'
+	zone 					= "chest"
+	slot 					= "breasts"
+	w_class 				= 3
+	size 					= BREASTS_SIZE_DEF
+	fluid_id				= "milk"
+	var/amount				= 2
+	producing				= TRUE
+	shape					= "pair"
+	can_masturbate_with		= TRUE
+	masturbation_verb 		= "massage"
+	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
+	if(!reagents || !owner)
+		return
+	reagents.maximum_volume = fluid_max_volume
+	if(fluid_id && producing)
+		generate_milk()
+
+/obj/item/organ/genital/breasts/proc/generate_milk()
+	if(owner.stat == DEAD)
+		return FALSE
+	reagents.isolate_reagent(fluid_id)
+	reagents.add_reagent(fluid_id, (fluid_mult * fluid_rate))
+
+/obj/item/organ/genital/breasts/update_appearance()
+	var/string = "breasts_[lowertext(shape)]_[size]"
+	icon_state = sanitize_text(string)
+	var/lowershape = lowertext(shape)
+	switch(lowershape)
+		if("pair")
+			desc = "You see a pair of breasts."
+		else
+			desc = "You see some breasts, they seem to be quite exotic."
+	if (size)
+		desc += " You estimate that they're [uppertext(size)]-cups."
+	else
+		desc += " You wouldn't measure them in cup sizes."
+	if(producing && aroused_state)
+		desc += " They're leaking [fluid_id]."
+	if(owner)
+		if(owner.dna.species.use_skintones && owner.dna.features["genitals_use_skintone"])
+			if(ishuman(owner)) // Check before recasting type, although someone fucked up if you're not human AND have use_skintones somehow...
+				var/mob/living/carbon/human/H = owner // only human mobs have skin_tone, which we need.
+				color = "#[skintone2hex(H.skin_tone)]"
+		else
+			color = "#[owner.dna.features["breasts_color"]]"
+
+/obj/item/organ/genital/breasts/is_exposed()
+	. = ..()
+	if(.)
+		return TRUE
+	return owner.is_chest_exposed()

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

@@ -0,0 +1,15 @@
+/obj/item/organ/genital/eggsack
+	name 			= "Egg sack"
+	desc 			= "An egg producing reproductive organ."
+	icon_state 		= "egg_sack"
+	icon 			= 'modular_citadel/icons/obj/genitals/ovipositor.dmi'
+	zone 			= "groin"
+	slot 			= "testicles"
+	color			= null //don't use the /genital color since it already is colored
+	w_class 		= 3
+	internal = TRUE
+	var/egg_girth = EGG_GIRTH_DEF
+	var/cum_mult = CUM_RATE_MULT
+	var/cum_rate = CUM_RATE
+	var/cum_efficiency	= CUM_EFFICIENCY
+	var/obj/item/organ/ovipositor/linked_ovi

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

@@ -0,0 +1,331 @@
+/obj/item/organ/genital
+	color = "#fcccb3"
+	var/shape = "human"
+	var/sensitivity = 1
+	var/list/genital_flags = list()
+	var/can_masturbate_with = FALSE
+	var/masturbation_verb = "masturbate"
+	var/can_climax = FALSE
+	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_efficiency = 1
+	var/fluid_rate = 1
+	var/fluid_mult = 1
+	var/producing = FALSE
+	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.
+	var/obj/item/organ/genital/linked_organ
+	var/through_clothes = FALSE
+	var/internal 		= FALSE
+
+/obj/item/organ/genital/Initialize()
+	. = ..()
+	if(!reagents)
+		create_reagents(fluid_max_volume)
+	update()
+
+/obj/item/organ/genital/Destroy()
+	remove_ref()
+	if(owner)
+		Remove(owner, 1)//this should remove references to it, so it can be GCd correctly
+	update_link()//this should remove any other links it has
+	return ..()
+
+/obj/item/organ/genital/proc/update()
+	if(QDELETED(src))
+		return
+	update_size()
+	update_appearance()
+	update_link()
+
+//exposure and through-clothing code
+/mob/living/carbon
+	var/list/exposed_genitals = list() //Keeping track of them so we don't have to iterate through every genitalia and see if exposed
+
+/obj/item/organ/genital/proc/is_exposed()
+	if(!owner)
+		return FALSE
+	if(internal)
+		return FALSE
+	if(through_clothes)
+		return TRUE
+
+/obj/item/organ/genital/proc/toggle_through_clothes()
+	if(through_clothes)
+		through_clothes = FALSE
+		owner.exposed_genitals -= src
+	else
+		through_clothes = TRUE
+		owner.exposed_genitals += src
+	if(ishuman(owner)) //recast to use update genitals proc
+		var/mob/living/carbon/human/H = owner
+		H.update_genitals()
+
+/mob/living/carbon/verb/toggle_genitals()
+	set category = "IC"
+	set name = "Expose/Hide genitals"
+	set desc = "Allows you to toggle which genitals should show through clothes or not."
+
+	var/list/genital_list = list()
+	for(var/obj/item/organ/O in internal_organs)
+		if(istype(O, /obj/item/organ/genital))
+			var/obj/item/organ/genital/G = O
+			if(!G.internal)
+				genital_list += G
+	if(!genital_list.len) //There is nothing to expose
+		return
+	//Full list of exposable genitals created
+	var/obj/item/organ/genital/picked_organ
+	picked_organ = input(src, "Expose/Hide genitals", "Choose which genitalia to expose/hide", null) in genital_list
+	if(picked_organ)
+		picked_organ.toggle_through_clothes()
+	return
+
+
+
+
+/obj/item/organ/genital/proc/update_size()
+
+/obj/item/organ/genital/proc/update_appearance()
+
+/obj/item/organ/genital/proc/update_link()
+
+/obj/item/organ/genital/proc/remove_ref()
+	if(linked_organ)
+		linked_organ.linked_organ = null
+		linked_organ = null
+
+/obj/item/organ/genital/Insert(mob/living/carbon/M, special = 0)
+	..()
+	update()
+
+/obj/item/organ/genital/Remove(mob/living/carbon/M, special = 0)
+	..()
+	update()
+
+//proc to give a player their genitals and stuff when they log in
+/mob/living/carbon/human/proc/give_genitals(clean=0)//clean will remove all pre-existing genitals. proc will then give them any genitals that are enabled in their DNA
+	if (NOGENITALS in dna.species.species_traits)
+		return
+	if(clean)
+		var/obj/item/organ/genital/GtoClean
+		for(GtoClean in internal_organs)
+			qdel(GtoClean)
+	//Order should be very important. FIRST vagina, THEN testicles, THEN penis, as this affects the order they are rendered in.
+	if(dna.features["has_breasts"])
+		give_breasts()
+	if(dna.features["has_vag"])
+		give_vagina()
+	if(dna.features["has_womb"])
+		give_womb()
+	if(dna.features["has_balls"])
+		give_balls()
+	if(dna.features["has_cock"])
+		give_penis()
+	if(dna.features["has_ovi"])
+		give_ovipositor()
+	if(dna.features["has_eggsack"])
+		give_eggsack()
+
+/mob/living/carbon/human/proc/give_penis()
+	if(!dna)
+		return FALSE
+	if(NOGENITALS in dna.species.species_traits)
+		return FALSE
+	if(!getorganslot("penis"))
+		var/obj/item/organ/genital/penis/P = new
+		P.Insert(src)
+		if(P)
+			if(dna.species.use_skintones && dna.features["genitals_use_skintone"])
+				P.color = skintone2hex(skin_tone)
+			else
+				P.color = "#[dna.features["cock_color"]]"
+			P.length = dna.features["cock_length"]
+			P.girth_ratio = dna.features["cock_girth_ratio"]
+			P.shape = dna.features["cock_shape"]
+			P.update()
+
+/mob/living/carbon/human/proc/give_balls()
+	if(!dna)
+		return FALSE
+	if(NOGENITALS in dna.species.species_traits)
+		return FALSE
+	if(!getorganslot("testicles"))
+		var/obj/item/organ/genital/testicles/T = new
+		T.Insert(src)
+//		if(dna.species.use_skintones && dna.features["genitals_use_skintone"])
+//			T.color = skintone2hex(skin_tone)
+//		else
+//			T.color = "#[dna.features["balls_color"]]"
+		if(T)
+			T.size = dna.features["balls_size"]
+			T.sack_size = dna.features["balls_sack_size"]
+			T.fluid_id = dna.features["balls_fluid"]
+			T.fluid_rate = dna.features["balls_cum_rate"]
+			T.fluid_mult = dna.features["balls_cum_mult"]
+			T.fluid_efficiency = dna.features["balls_efficiency"]
+			T.update()
+
+/mob/living/carbon/human/proc/give_breasts()
+	if(!dna)
+		return FALSE
+	if(NOGENITALS in dna.species.species_traits)
+		return FALSE
+	if(!getorganslot("breasts"))
+		var/obj/item/organ/genital/breasts/B = new
+		B.Insert(src)
+		if(B)
+			if(dna.species.use_skintones && dna.features["genitals_use_skintone"])
+				B.color = skintone2hex(skin_tone)
+			else
+				B.color = "#[dna.features["breasts_color"]]"
+			B.size = dna.features["breasts_size"]
+			B.shape = dna.features["breasts_shape"]
+			B.fluid_id = dna.features["breasts_fluid"]
+			B.update()
+
+
+/mob/living/carbon/human/proc/give_ovipositor()
+/mob/living/carbon/human/proc/give_eggsack()
+/mob/living/carbon/human/proc/give_vagina()
+	if(!dna)
+		return FALSE
+	if(NOGENITALS in dna.species.species_traits)
+		return FALSE
+	if(!getorganslot("vagina"))
+		var/obj/item/organ/genital/vagina/V = new
+		V.Insert(src)
+		if(V)
+			if(dna.species.use_skintones && dna.features["genitals_use_skintone"])
+				V.color = skintone2hex(skin_tone)
+			else
+				V.color = "[dna.features["vag_color"]]"
+			V.shape = "[dna.features["vag_shape"]]"
+			V.update()
+
+/mob/living/carbon/human/proc/give_womb()
+	if(!dna)
+		return FALSE
+	if(NOGENITALS in dna.species.species_traits)
+		return FALSE
+	if(!getorganslot("womb"))
+		var/obj/item/organ/genital/womb/W = new
+		W.Insert(src)
+		if(W)
+			W.update()
+
+
+/datum/species/proc/genitals_layertext(layer)
+	switch(layer)
+		if(GENITALS_BEHIND_LAYER)
+			return "BEHIND"
+		if(GENITALS_ADJ_LAYER)
+			return "ADJ"
+		if(GENITALS_FRONT_LAYER)
+			return "FRONT"
+
+//procs to handle sprite overlays being applied to humans
+
+/obj/item/equipped(mob/user, slot)
+	if(ishuman(user))
+		var/mob/living/carbon/human/H = user
+		H.update_genitals()
+	..()
+
+/mob/living/carbon/human/doUnEquip(obj/item/I, force)
+	. = ..()
+	if(!.)
+		return
+	update_genitals()
+
+/mob/living/carbon/human/proc/update_genitals()
+	if(src && !QDELETED(src))
+		dna.species.handle_genitals(src)
+
+/datum/species/proc/handle_genitals(mob/living/carbon/human/H)
+	if(!H)//no args
+		CRASH("H = null")
+	if(!LAZYLEN(H.internal_organs))//if they have no organs, we're done
+		return
+	if(NOGENITALS in species_traits)//golems and such
+		return
+
+	var/list/genitals_to_add = list()
+	var/list/relevant_layers = list(GENITALS_BEHIND_LAYER, GENITALS_ADJ_LAYER, GENITALS_FRONT_LAYER)
+	var/list/standing = list()
+	var/size = null
+
+	for(var/L in relevant_layers) //Less hardcode
+		H.remove_overlay(L)
+
+	if(H.has_trait(TRAIT_HUSK))
+		return
+	//start scanning for genitals
+	//var/list/worn_stuff = H.get_equipped_items()//cache this list so it's not built again
+	for(var/obj/item/organ/O in H.internal_organs)
+		if(istype(O, /obj/item/organ/genital))
+			var/obj/item/organ/genital/G = O
+			if(G.is_exposed()) //Checks appropriate clothing slot and if it's through_clothes
+				genitals_to_add += H.getorganslot(G.slot)
+	//Now we added all genitals that aren't internal and should be rendered
+
+	//start applying overlays
+	for(var/layer in relevant_layers)
+		var/layertext = genitals_layertext(layer)
+		for(var/obj/item/organ/genital/G in genitals_to_add)
+			var/datum/sprite_accessory/S
+			size = G.size
+			switch(G.type)
+				if(/obj/item/organ/genital/penis)
+					S = GLOB.cock_shapes_list[G.shape]
+				if(/obj/item/organ/genital/vagina)
+					S = GLOB.vagina_shapes_list[G.shape]
+				if(/obj/item/organ/genital/breasts)
+					S = GLOB.breasts_shapes_list[G.shape]
+
+			if(!S || S.icon_state == "none")
+				continue
+			var/mutable_appearance/genital_overlay = mutable_appearance(S.icon, layer = -layer)
+			if(S.alt_aroused)
+				G.aroused_state = H.isPercentAroused(G.aroused_amount)
+			else
+				G.aroused_state = FALSE
+			genital_overlay.icon_state = "[G.slot]_[S.icon_state]_[size]_[G.aroused_state]_[layertext]"
+
+			if(S.center)
+				genital_overlay = center_image(genital_overlay, S.dimension_x, S.dimension_y)
+
+			if(use_skintones && H.dna.features["genitals_use_skintone"])
+				genital_overlay.color = "#[skintone2hex(H.skin_tone)]"
+			else
+				switch(S.color_src)
+					if("cock_color")
+						genital_overlay.color = "#[H.dna.features["cock_color"]]"
+					if("breasts_color")
+						genital_overlay.color = "#[H.dna.features["breasts_color"]]"
+					if("vag_color")
+						genital_overlay.color = "#[H.dna.features["vag_color"]]"
+					if(MUTCOLORS)
+						if(fixed_mut_color)
+							genital_overlay.color = "#[fixed_mut_color]"
+						else
+							genital_overlay.color = "#[H.dna.features["mcolor"]]"
+					if(MUTCOLORS2)
+						if(fixed_mut_color2)
+							genital_overlay.color = "#[fixed_mut_color2]"
+						else
+							genital_overlay.color = "#[H.dna.features["mcolor2"]]"
+					if(MUTCOLORS3)
+						if(fixed_mut_color3)
+							genital_overlay.color = "#[fixed_mut_color3]"
+						else
+							genital_overlay.color = "#[H.dna.features["mcolor3"]]"
+			standing += genital_overlay
+		if(LAZYLEN(standing))
+			H.overlays_standing[layer] = standing.Copy()
+			standing = list()
+
+	for(var/L in relevant_layers)
+		H.apply_overlay(L)

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

@@ -0,0 +1,116 @@
+/datum/sprite_accessory
+	var/alt_aroused = FALSE //CIT CODE if this is TRUE, then the genitals will use an alternate icon_state when aroused.
+
+
+//DICKS,COCKS,PENISES,WHATEVER YOU WANT TO CALL THEM
+/datum/sprite_accessory/penis
+	icon = 'modular_citadel/icons/obj/genitals/penis_onmob.dmi'
+	icon_state = null
+	name = "penis"			//the preview name of the accessory
+	gender_specific = 0	//Might be needed somewhere down the list.
+	color_src = "cock_color"
+	locked = 0
+
+/datum/sprite_accessory/penis/human
+	icon_state = "human"
+	name = "Human"
+
+/datum/sprite_accessory/penis/knotted
+	icon_state = "knotted"
+	name = "Knotted"
+
+/datum/sprite_accessory/penis/flared
+	icon_state = "flared"
+	name = "Flared"
+
+/datum/sprite_accessory/penis/barbknot
+	icon_state = "barbknot"
+	name = "Barbed, Knotted"
+
+/datum/sprite_accessory/penis/tapered
+	icon_state = "tapered"
+	name = "Tapered"
+
+////////////////////////
+// Taur cocks go here //
+////////////////////////
+/datum/sprite_accessory/penis/taur_flared
+	icon = 'modular_citadel/icons/obj/genitals/taur_penis_onmob.dmi' //Needed larger width
+	icon_state = "flared"
+	name = "Taur, Flared"
+	center = TRUE //Center the image 'cause 2-tile wide.
+	dimension_x = 64
+
+/datum/sprite_accessory/penis/taur_knotted
+	icon = 'modular_citadel/icons/obj/genitals/taur_penis_onmob.dmi' //Needed larger width
+	icon_state = "knotted"
+	name = "Taur, Knotted"
+	center = TRUE //Center the image 'cause 2-tile wide.
+	dimension_x = 64
+
+/datum/sprite_accessory/penis/taur_tapered
+	icon = 'modular_citadel/icons/obj/genitals/taur_penis_onmob.dmi' //Needed larger width
+	icon_state = "tapered"
+	name = "Taur, Tapered"
+	center = TRUE //Center the image 'cause 2-tile wide.
+	dimension_x = 64
+
+
+
+
+//Vaginas
+/datum/sprite_accessory/vagina
+	icon = 'modular_citadel/icons/obj/genitals/vagina_onmob.dmi'
+	icon_state = null
+	name = "vagina"
+	gender_specific = 0
+	color_src = "vag_color"
+	locked = 0
+	alt_aroused = FALSE //if this is TRUE, then the genitals will use an alternate sprite for aroused states
+
+/datum/sprite_accessory/vagina/human
+	icon_state = "human"
+	name = "Human"
+	alt_aroused = TRUE
+
+/datum/sprite_accessory/vagina/tentacles
+	icon_state = "tentacle"
+	name = "Tentacle"
+	alt_aroused = TRUE
+
+/datum/sprite_accessory/vagina/dentata
+	icon_state = "dentata"
+	name = "Dentata"
+	alt_aroused = TRUE
+
+/datum/sprite_accessory/vagina/hairy
+	icon_state = "hairy"
+	name = "Hairy"
+
+
+//BREASTS BE HERE
+/datum/sprite_accessory/breasts
+	icon = 'modular_citadel/icons/obj/genitals/breasts_onmob.dmi'
+	icon_state = null
+	name = "breasts"
+	gender_specific = 0
+	color_src = "breasts_color"
+	locked = 0
+
+/datum/sprite_accessory/breasts/pair
+	icon_state = "pair"
+	name = "Pair"
+
+
+//OVIPOSITORS BE HERE
+/datum/sprite_accessory/ovipositor
+	icon = 'modular_citadel/icons/obj/genitals/penis_onmob.dmi'
+	icon_state = null
+	name = "Ovipositor"			//the preview name of the accessory
+	gender_specific = 0			//Might be needed somewhere down the list.
+	color_src = "cock_color"
+	locked = 0
+
+/datum/sprite_accessory/ovipositor/knotted
+	icon_state = "knotted"
+	name = "Knotted"

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

@@ -0,0 +1,16 @@
+/obj/item/organ/genital/ovipositor
+	name = "Ovipositor"
+	desc = "An egg laying reproductive organ."
+	icon_state = "ovi_knotted_2"
+	icon = 'modular_citadel/icons/obj/genitals/ovipositor.dmi'
+	zone = "groin"
+	slot = "penis"
+	w_class = 3
+	shape = "knotted"
+	size = 3
+	var/length = 6								//inches
+	var/girth  = 0
+	var/girth_ratio = COCK_GIRTH_RATIO_DEF 		//citadel_defines.dm for these defines
+	var/knot_girth_ratio = KNOT_GIRTH_RATIO_DEF
+	var/list/oviflags = list()
+	var/obj/item/organ/eggsack/linked_eggsack

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

@@ -0,0 +1,66 @@
+/obj/item/organ/genital/penis
+	name 					= "penis"
+	desc 					= "A male reproductive organ."
+	icon_state 				= "penis"
+	icon 					= 'modular_citadel/icons/obj/genitals/penis.dmi'
+	zone 					= "groin"
+	slot 					= "penis"
+	w_class 				= 3
+	can_masturbate_with 	= TRUE
+	masturbation_verb 		= "stroke"
+	can_climax 				= TRUE
+	fluid_transfer_factor = 0.5
+	size 					= 2 //arbitrary value derived from length and girth for sprites.
+	var/length 				= 6	//inches
+	var/cached_length //used to detect a change in length
+	var/girth  				= 0
+	var/girth_ratio 		= COCK_GIRTH_RATIO_DEF //0.73; check citadel_defines.dm
+	var/knot_girth_ratio 	= KNOT_GIRTH_RATIO_DEF
+	var/list/dickflags 		= list()
+	var/list/knotted_types 	= list("knotted", "barbed, knotted")
+
+/obj/item/organ/genital/penis/update_size()
+	if(length == cached_length)
+		return
+	switch(length)
+		if(-INFINITY to 5)
+			size = 1
+		if(5 to 9)
+			size = 2
+		if(9 to INFINITY)
+			size = 3//no new sprites for anything larger yet
+/*		if(9 to 15)
+			size = 3
+		if(15 to INFINITY)
+			size = 3*/
+	girth = (length * girth_ratio)
+	cached_length = length
+
+/obj/item/organ/genital/penis/update_appearance()
+	var/string = "penis_[GLOB.cock_shapes_icons[shape]]_[size]"
+	icon_state = sanitize_text(string)
+	var/lowershape = lowertext(shape)
+	desc = "You see a [lowershape] penis. You estimate it's about [round(length, 0.25)] inch[length > 1 ? "es" : ""] long."
+	if(owner)
+		if(owner.dna.species.use_skintones && owner.dna.features["genitals_use_skintone"])
+			if(ishuman(owner)) // Check before recasting type, although someone fucked up if you're not human AND have use_skintones somehow...
+				var/mob/living/carbon/human/H = owner // only human mobs have skin_tone, which we need.
+				color = "#[skintone2hex(H.skin_tone)]"
+		else
+			color = "#[owner.dna.features["cock_color"]]"
+
+/obj/item/organ/genital/penis/update_link()
+	if(owner)
+		linked_organ = (owner.getorganslot("testicles"))
+		if(linked_organ)
+			linked_organ.linked_organ = src
+	else
+		if(linked_organ)
+			linked_organ.linked_organ = null
+		linked_organ = null
+
+/obj/item/organ/genital/penis/is_exposed()
+	. = ..()
+	if(.)
+		return TRUE
+	return owner.is_groin_exposed()

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

@@ -0,0 +1,54 @@
+/obj/item/organ/genital/testicles
+	name = "testicles"
+	desc = "A male reproductive organ."
+	icon_state = "testicles"
+	icon = 'modular_citadel/icons/obj/genitals/penis.dmi'
+	zone = "groin"
+	slot = "testicles"
+	w_class = 3
+	internal	 		= TRUE
+	size 				= BALLS_SIZE_DEF
+	var/sack_size		= BALLS_SACK_SIZE_DEF
+	fluid_id 			= "semen"
+	producing			= TRUE
+	var/sent_full_message = 1 //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)
+		generate_cum()
+
+/obj/item/organ/genital/testicles/proc/generate_cum()
+	reagents.maximum_volume = fluid_max_volume
+	if(reagents.total_volume >= reagents.maximum_volume)
+		if(!sent_full_message)
+			send_full_message()
+			sent_full_message = 1
+		return FALSE
+	sent_full_message = 0
+	update_link()
+	if(!linked_organ)
+		return FALSE
+	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
+
+/obj/item/organ/genital/testicles/update_link()
+	if(owner && !QDELETED(src))
+		linked_organ = (owner.getorganslot("penis"))
+		if(linked_organ)
+			linked_organ.linked_organ = src
+	else
+		if(linked_organ)
+			linked_organ.linked_organ = null
+		linked_organ = null
+
+/obj/item/organ/genital/testicles/proc/send_full_message(msg = "Your balls finally feel full, again.")
+	if(owner && istext(msg))
+		owner << msg
+		return TRUE
+

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

@@ -0,0 +1,72 @@
+/obj/item/organ/genital/vagina
+	name 					= "vagina"
+	desc 					= "A female reproductive organ."
+	icon					= 'modular_citadel/icons/obj/genitals/vagina.dmi'
+	icon_state 				= "vagina"
+	zone 					= "groin"
+	slot 					= "vagina"
+	size					= 1 //There is only 1 size right now
+	can_masturbate_with		= TRUE
+	masturbation_verb 	= "finger"
+	can_climax 				= TRUE
+	fluid_transfer_factor = 0.1 //Yes, some amount is exposed to you, go get your AIDS
+	w_class 				= 3
+	var/cap_length		= 8//D   E   P   T   H (cap = capacity)
+	var/cap_girth		= 12
+	var/cap_girth_ratio = 1.5
+	var/clits				= 1
+	var/clit_diam 			= 0.25
+	var/clit_len			= 0.25
+	var/list/vag_types = list("tentacle", "dentata", "hairy")
+
+
+/obj/item/organ/genital/vagina/update_appearance()
+	var/string = "vagina" //Keeping this code here, so making multiple sprites for the different kinds is easier.
+	icon_state = sanitize_text(string)
+	var/lowershape = lowertext(shape)
+	var/details
+
+	switch(lowershape)
+		if("tentacle")
+			details = "Its opening is lined with several tentacles and "
+		if("dentata")
+			details = "There's teeth inside it and it "
+		if("hairy")
+			details = "It has quite a bit of hair growing on it and "
+		if("human")
+			details = "It is taut with smooth skin, though without much hair and "
+		if("gaping")
+			details = "It is gaping slightly open, though without much hair and "
+		else
+			details = "It has an exotic shape and "
+	if(aroused_state)
+		details += "is slick with female arousal."
+	else
+		details += "seems to be dry."
+
+	desc = "You see a vagina. [details]"
+
+	if(owner)
+		if(owner.dna.species.use_skintones && owner.dna.features["genitals_use_skintone"])
+			if(ishuman(owner)) // Check before recasting type, although someone fucked up if you're not human AND have use_skintones somehow...
+				var/mob/living/carbon/human/H = owner // only human mobs have skin_tone, which we need.
+				color = "#[skintone2hex(H.skin_tone)]"
+		else
+			color = "#[owner.dna.features["vag_color"]]"
+
+
+/obj/item/organ/genital/vagina/update_link()
+	if(owner)
+		linked_organ = (owner.getorganslot("womb"))
+		if(linked_organ)
+			linked_organ.linked_organ = src
+	else
+		if(linked_organ)
+			linked_organ.linked_organ = null
+		linked_organ = null
+
+/obj/item/organ/genital/vagina/is_exposed()
+	. = ..()
+	if(.)
+		return TRUE
+	return owner.is_groin_exposed()

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

@@ -0,0 +1,43 @@
+/obj/item/organ/genital/womb
+	name 			= "womb"
+	desc 			= "A female reproductive organ."
+	icon			= 'modular_citadel/icons/obj/genitals/vagina.dmi'
+	icon_state 		= "womb"
+	zone 			= "groin"
+	slot 			= "womb"
+	w_class 		= 3
+	internal 		= TRUE
+	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)
+		generate_femcum()
+
+/obj/item/organ/genital/womb/proc/generate_femcum()
+	reagents.maximum_volume = fluid_max_volume
+	update_link()
+	if(!linked_organ)
+		return FALSE
+	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
+
+/obj/item/organ/genital/womb/update_link()
+	if(owner)
+		linked_organ = (owner.getorganslot("vagina"))
+		if(linked_organ)
+			linked_organ.linked_organ = src
+	else
+		if(linked_organ)
+			linked_organ.linked_organ = null
+		linked_organ = null
+
+/obj/item/organ/genital/womb/Destroy()
+	return ..()

modular_citadel/code/modules/arousal/toys/dildos.dm

@@ -0,0 +1,132 @@
+//////////
+//DILDOS//
+//////////
+obj/item/dildo
+	name 				= "dildo"
+	desc 				= "Floppy!"
+	icon 				= 'modular_citadel/icons/obj/genitals/dildo.dmi'
+	damtype 			= BRUTE
+	force 				= 0
+	throwforce			= 0
+	icon_state 			= "dildo_knotted_2"
+	alpha 				= 192//transparent
+	var/can_customize	= FALSE
+	var/dildo_shape 	= "human"
+	var/dildo_size		= 2
+	var/dildo_type		= "dildo"//pretty much just used for the icon state
+	var/random_color 	= TRUE
+	var/random_size 	= FALSE
+	var/random_shape 	= FALSE
+	//Lists moved to _cit_helpers.dm as globals so they're not instanced individually
+
+obj/item/dildo/proc/update_appearance()
+	icon_state = "[dildo_type]_[dildo_shape]_[dildo_size]"
+	var/sizeword = ""
+	switch(dildo_size)
+		if(1)
+			sizeword = "small "
+		if(3)
+			sizeword = "big "
+		if(4)
+			sizeword = "huge "
+		if(5)
+			sizeword = "gigantic "
+
+	name = "[sizeword][dildo_shape] [can_customize ? "custom " : ""][dildo_type]"
+
+obj/item/dildo/AltClick(mob/living/user)
+	if(QDELETED(src))
+		return
+	if(!isliving(user))
+		return
+	if(isAI(user))
+		return
+	if(user.stat > 0)//unconscious or dead
+		return
+	customize(user)
+
+obj/item/dildo/proc/customize(mob/living/user)
+	if(!can_customize)
+		return FALSE
+	if(src && !user.incapacitated() && in_range(user,src))
+		var/color_choice = input(user,"Choose a color for your dildo.","Dildo Color") as null|anything in GLOB.dildo_colors
+		if(src && color_choice && !user.incapacitated() && in_range(user,src))
+			sanitize_inlist(color_choice, GLOB.dildo_colors, "Red")
+			color = GLOB.dildo_colors[color_choice]
+	update_appearance()
+	if(src && !user.incapacitated() && in_range(user,src))
+		var/shape_choice = input(user,"Choose a shape for your dildo.","Dildo Shape") as null|anything in GLOB.dildo_shapes
+		if(src && shape_choice && !user.incapacitated() && in_range(user,src))
+			sanitize_inlist(shape_choice, GLOB.dildo_colors, "Knotted")
+			dildo_shape = GLOB.dildo_shapes[shape_choice]
+	update_appearance()
+	if(src && !user.incapacitated() && in_range(user,src))
+		var/size_choice = input(user,"Choose the size for your dildo.","Dildo Size") as null|anything in GLOB.dildo_sizes
+		if(src && size_choice && !user.incapacitated() && in_range(user,src))
+			sanitize_inlist(size_choice, GLOB.dildo_colors, "Medium")
+			dildo_size = GLOB.dildo_sizes[size_choice]
+	update_appearance()
+	if(src && !user.incapacitated() && in_range(user,src))
+		var/transparency_choice = input(user,"Choose the transparency of your dildo. Lower is more transparent!(192-255)","Dildo Transparency") as null|num
+		if(src && transparency_choice && !user.incapacitated() && in_range(user,src))
+			sanitize_integer(transparency_choice, 192, 255, 192)
+			alpha = transparency_choice
+	update_appearance()
+	return TRUE
+
+obj/item/dildo/Initialize()
+	. = ..()
+	if(random_color == TRUE)
+		var/randcolor = pick(GLOB.dildo_colors)
+		color = GLOB.dildo_colors[randcolor]
+	if(random_shape == TRUE)
+		var/randshape = pick(GLOB.dildo_shapes)
+		dildo_shape = GLOB.dildo_shapes[randshape]
+	if(random_size == TRUE)
+		var/randsize = pick(GLOB.dildo_sizes)
+		dildo_size = GLOB.dildo_sizes[randsize]
+	update_appearance()
+	alpha		= rand(192, 255)
+	pixel_y 	= rand(-7,7)
+	pixel_x 	= rand(-7,7)
+
+obj/item/dildo/examine(mob/user)
+	..()
+	if(can_customize)
+		user << "<span class='notice'>Alt-Click \the [src.name] to customize it.</span>"
+
+obj/item/dildo/random//totally random
+	name 				= "random dildo"//this name will show up in vendors and shit so you know what you're vending(or don't, i guess :^))
+	random_color 		= TRUE
+	random_shape 		= TRUE
+	random_size 		= TRUE
+
+
+obj/item/dildo/knotted
+	dildo_shape 		= "knotted"
+	name 				= "knotted dildo"
+
+obj/item/dildo/human
+	dildo_shape 		= "human"
+	name 				= "human dildo"
+
+obj/item/dildo/plain
+	dildo_shape 		= "plain"
+	name 				= "plain dildo"
+
+obj/item/dildo/flared
+	dildo_shape 		= "flared"
+	name 				= "flared dildo"
+
+obj/item/dildo/flared/huge
+	name = "literal horse cock"
+	desc = "THIS THING IS HUGE!"
+	dildo_size = 4
+
+obj/item/dildo/custom
+	name 				= "customizable dildo"
+	desc 				= "Thanks to significant advances in synthetic nanomaterials, this dildo is capable of taking on many different forms to fit the user's preferences! Pricy!"
+	can_customize		= TRUE
+	random_color 		= TRUE
+	random_shape 		= TRUE
+	random_size 		= TRUE

modular_citadel/code/modules/client/preferences_toggles.dm

@@ -0,0 +1,22 @@
+TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Sound, toggleeatingnoise)()
+	set name = "Toggle Eating Noises"
+	set category = "Preferences"
+	set desc = "Hear Eating noises"
+	usr.client.prefs.toggles ^= EATING_NOISES
+	usr.client.prefs.save_preferences()
+	usr.stop_sound_channel(CHANNEL_PRED)
+	to_chat(usr, "You will [(usr.client.prefs.toggles & EATING_NOISES) ? "now" : "no longer"] hear eating noises.")
+/datum/verbs/menu/Settings/Sound/toggleeatingnoise/Get_checked(client/C)
+	return !(C.prefs.toggles & EATING_NOISES)
+
+
+TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Sound, toggledigestionnoise)()
+	set name = "Toggle Digestion Noises"
+	set category = "Preferences"
+	set desc = "Hear digestive noises"
+	usr.client.prefs.toggles ^= DIGESTION_NOISES
+	usr.client.prefs.save_preferences()
+	usr.stop_sound_channel(CHANNEL_DIGEST)
+	to_chat(usr, "You will [(usr.client.prefs.toggles & DIGESTION_NOISES) ? "now" : "no longer"] hear digestion noises.")
+/datum/verbs/menu/Settings/Sound/toggledigestionnoise/Get_checked(client/C)
+	return !(C.prefs.toggles & DIGESTION_NOISES)

modular_citadel/code/modules/clothing/suits/suits.dm

@@ -0,0 +1,13 @@
+/*/////////////////////////////////////////////////////////////////////////////////
+///////																		///////
+///////			Cit's exclusive suits, armor, etc. go here			///////
+///////																		///////
+*//////////////////////////////////////////////////////////////////////////////////
+
+
+/obj/item/clothing/suit/armor/hos/trenchcoat/cloak
+	name = "armored trenchcloak"
+	desc = "A trenchcoat enchanced with a special lightweight kevlar. This one appears to be designed to be draped over one's shoulders rather than worn normally.."
+	alternate_worn_icon = 'icons/mob/citadel/suit.dmi'
+	icon_state = "hostrench"
+	item_state = "hostrench"

modular_citadel/code/modules/clothing/under.dm

@@ -1,7 +0,0 @@
-/obj/item/clothing/under/syndicate/cosmetic
-	name = "tactitool turtleneck"
-	desc = "Just looking at it makes you want to buy an SKS, go into the woods, and -operate-."
-	icon_state = "tactifool"
-	item_state = "bl_suit"
-	item_color = "tactifool"
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0)

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

@@ -1,2 +0,0 @@
-/obj/item/clothing/under/syndicate/tacticool
-	has_sensor = TRUE

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

@@ -19,4 +19,59 @@
 
 /obj/structure/closet/secure_closet/CMO/PopulateContents()	//This is placed here because it's a very specific addition for a very specific niche
 	..()
-	new /obj/item/clothing/under/rank/chief_medical_officer/turtleneck(src)
+	new /obj/item/clothing/under/rank/chief_medical_officer/turtleneck(src)
+	
+/obj/item/clothing/under/syndicate/cosmetic
+	name = "tactitool turtleneck"
+	desc = "Just looking at it makes you want to buy an SKS, go into the woods, and -operate-."
+	icon_state = "tactifool"
+	item_state = "bl_suit"
+	item_color = "tactifool"
+	has_sensor = TRUE
+	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0)
+	
+/obj/item/clothing/under/syndicate/tacticool
+	has_sensor = TRUE
+	
+// Sweaters are good enough for this category too.
+
+/obj/item/clothing/under/bb_sweater
+	name = "cream sweater"
+	desc = "Why trade style for comfort? Now you can go commando down south and still be cozy up north."
+	icon_state = "bb_turtle"
+	item_state = "w_suit"
+	item_color = "bb_turtle"
+	body_parts_covered = CHEST|ARMS
+	can_adjust = 1
+	icon = 'icons/obj/clothing/turtlenecks.dmi'
+	icon_override = 'icons/mob/citadel/uniforms.dmi'
+
+/obj/item/clothing/under/bb_sweater/black
+	name = "black sweater"
+	icon_state = "bb_turtleblk"
+	item_state = "bl_suit"
+	item_color = "bb_turtleblk"
+
+/obj/item/clothing/under/bb_sweater/purple
+	name = "purple sweater"
+	icon_state = "bb_turtlepur"
+	item_state = "p_suit"
+	item_color = "bb_turtlepur"
+
+/obj/item/clothing/under/bb_sweater/green
+	name = "green sweater"
+	icon_state = "bb_turtlegrn"
+	item_state = "g_suit"
+	item_color = "bb_turtlegrn"
+
+/obj/item/clothing/under/bb_sweater/red
+	name = "red sweater"
+	icon_state = "bb_turtlered"
+	item_state = "r_suit"
+	item_color = "bb_turtlered"
+
+/obj/item/clothing/under/bb_sweater/blue
+	name = "blue sweater"
+	icon_state = "bb_turtleblu"
+	item_state = "b_suit"
+	item_color = "bb_turtleblu"

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

@@ -0,0 +1,24 @@
+/*/////////////////////////////////////////////////////////////////////////////////
+///////																		///////
+///////			Cit's exclusive jumpsuits, uniforms, etc. go here			///////
+///////																		///////
+*//////////////////////////////////////////////////////////////////////////////////
+
+
+/obj/item/clothing/under/rank/security/skirt
+	name = "security skirt"
+	desc = "A tactical security skirt for officers complete with Nanotrasen belt buckle."
+	icon = 'icons/obj/clothing/cit_clothes.dmi'
+	icon_state = "secskirt"
+	icon_override = 'icons/mob/citadel/uniforms.dmi'
+	item_state = "r_suit"
+	item_color = "secskirt"
+
+/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 = 'icons/obj/clothing/cit_clothes.dmi'
+	icon_state = "hosskirt"
+	icon_override = 'icons/mob/citadel/uniforms.dmi'
+	item_state = "gy_suit"
+	item_color = "hosskirt"

modular_citadel/code/modules/custom_loadout/custom_items.dm

@@ -0,0 +1,306 @@
+
+//For custom items.
+
+/obj/item/custom/ceb_soap
+	name = "Cebutris' Soap"
+	desc = "A generic bar of soap that doesn't really seem to work right."
+	gender = PLURAL
+	icon = 'icons/obj/custom.dmi'
+	icon_state = "cebu"
+	w_class = WEIGHT_CLASS_TINY
+	flags_1 = NOBLUDGEON_1
+
+/obj/item/soap/cebu //real versions, for admin shenanigans. Adminspawn only
+	desc = "A bright blue bar of soap that smells of wolves"
+	icon = 'icons/obj/custom.dmi'
+	icon_state = "cebu"
+
+/obj/item/soap/cebu/fast //speedyquick cleaning version. Still not as fast as Syndiesoap. Adminspawn only.
+	cleanspeed = 15
+
+
+/*Inferno707*/
+
+/obj/item/clothing/neck/cloak/inferno
+	name = "Kiara's Cloak"
+	desc = "The design on this seems a little too familiar."
+	icon = 'icons/obj/custom.dmi'
+	icon_state = "infcloak"
+	icon_override = 'icons/mob/custom_w.dmi'
+	item_state = "infcloak"
+	w_class = WEIGHT_CLASS_SMALL
+	body_parts_covered = CHEST|GROIN|LEGS|ARMS
+
+/obj/item/clothing/neck/petcollar/inferno
+	name = "Kiara's Collar"
+	desc = "A soft black collar that seems to stretch to fit whoever wears it."
+	icon = 'icons/obj/custom.dmi'
+	icon_state = "infcollar"
+	icon_override = 'icons/mob/custom_w.dmi'
+	item_state = "infcollar"
+	item_color = null
+	tagname = null
+
+/obj/item/clothing/accessory/medal/steele
+	name = "Insignia Of Steele"
+	desc = "An intricate pendant given to those who help a key member of the Steele Corporation."
+	icon = 'icons/obj/custom.dmi'
+	icon_state = "steele"
+	item_color = "steele"
+	medaltype = "medal-silver"
+
+/*DirtyOldHarry*/
+
+/obj/item/lighter/gold
+	name = "\improper Engraved Zippo"
+	desc = "A shiny and relatively expensive zippo lighter. There's a small etched in verse on the bottom that reads, 'No Gods, No Masters, Only Man.'"
+	icon = 'icons/obj/custom.dmi'
+	icon_state = "gold_zippo"
+	item_state = "gold_zippo"
+	w_class = WEIGHT_CLASS_TINY
+	flags_1 = CONDUCT_1
+	slot_flags = SLOT_BELT
+	heat = 1500
+	resistance_flags = FIRE_PROOF
+	light_color = LIGHT_COLOR_FIRE
+
+
+/*Zombierobin*/
+
+/obj/item/clothing/neck/scarf/zomb //Default white color, same functionality as beanies.
+	name = "A special scarf"
+	icon = 'icons/obj/custom.dmi'
+	icon_state = "zombscarf"
+	desc = "A fashionable collar"
+	icon_override = 'icons/mob/custom_w.dmi'
+	item_color = "zombscarf"
+	dog_fashion = /datum/dog_fashion/head
+
+/obj/item/clothing/suit/toggle/labcoat/mad/red
+	name = "\improper The Mad's labcoat"
+	desc = "An oddly special looking coat."
+	icon = 'icons/obj/custom.dmi'
+	icon_state = "labred"
+	icon_override = 'icons/mob/custom_w.dmi'
+	item_state = "labred"
+
+
+/*Improvedname*/
+
+/obj/item/toy/plush/carrot
+	name = "carrot plushie"
+	desc = "While a normal carrot would be good for your eyes, this one seems a bit more for hugging then eating."
+	icon = 'icons/obj/hydroponics/harvest.dmi'
+	icon_state = "carrot"
+	item_state = "carrot"
+	w_class = WEIGHT_CLASS_SMALL
+	attack_verb = list("slapped")
+	resistance_flags = FLAMMABLE
+	squeak_override = list('sound/items/bikehorn.ogg'= 1)
+
+/obj/item/clothing/neck/cloak/carrot
+	name = "carrot cloak"
+	desc = "A cloak in the shape and color of a carrot!"
+	icon = 'icons/obj/custom.dmi'
+	icon_override = 'icons/mob/custom_w.dmi'
+	icon_state = "carrotcloak"
+	item_state = "carrotcloak"
+	w_class = WEIGHT_CLASS_SMALL
+	body_parts_covered = CHEST|GROIN|LEGS|ARMS
+
+/obj/item/storage/backpack/satchel/carrot
+	name = "carrot satchel"
+	desc = "An satchel that is designed to look like an carrot"
+	icon = 'icons/obj/custom.dmi'
+	icon_state = "satchel_carrot"
+	item_state = "satchel_carrot"
+	icon_override = 'icons/mob/custom_w.dmi'
+
+/obj/item/storage/backpack/satchel/carrot/Initialize()
+	. = ..()
+	AddComponent(/datum/component/squeak, list('sound/items/toysqueak1.ogg'=1), 50)
+
+/*PLACEHOLDER*/
+
+/obj/item/toy/plush/tree
+	name = "christmass tree plushie"
+	desc = "A festive plush that squeeks when you squeeze it!"
+	icon = 'icons/obj/custom.dmi'
+	icon_state = "pine_c"
+	item_state = "pine_c"
+	w_class = WEIGHT_CLASS_SMALL
+	attack_verb = list("slapped")
+	resistance_flags = FLAMMABLE
+	squeak_override = list('sound/misc/server-ready.ogg'= 1)
+
+/obj/item/clothing/neck/cloak/festive
+	name = "Celebratory Cloak of Morozko"
+	desc = " It probably will protect from snow, charcoal or elves."
+	icon = 'icons/obj/custom.dmi'
+	icon_state = "festive"
+	item_state = "festive"
+	icon_override = 'icons/mob/custom_w.dmi'
+	w_class = WEIGHT_CLASS_SMALL
+	body_parts_covered = CHEST|GROIN|LEGS|ARMS
+
+
+/*Zigfie*/
+
+/obj/item/clothing/mask/luchador/zigfie
+	name = "Alboroto Rosa mask"
+	icon = 'icons/obj/custom.dmi'
+	icon_state = "lucharzigfie"
+	icon_override = 'icons/mob/custom_w.dmi'
+	item_state = "lucharzigfie"
+
+
+/*PLACEHOLDER*/
+
+/obj/item/clothing/head/hardhat/reindeer/fluff
+	name = "novelty reindeer hat"
+	desc = "Some fake antlers and a very fake red nose - Sponsored by PWR Game(tm)"
+	icon_state = "hardhat0_reindeer"
+	item_state = "hardhat0_reindeer"
+	item_color = "reindeer"
+	flags_inv = 0
+	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0)
+	brightness_on = 0 //luminosity when on
+	dynamic_hair_suffix = ""
+
+/obj/item/clothing/head/santa/fluff
+	name = "santa's hat"
+	desc = "On the first day of christmas my employer gave to me! - From Vlad with Salad"
+	icon_state = "santahatnorm"
+	item_state = "that"
+	dog_fashion = /datum/dog_fashion/head/santa
+
+//Removed all of the space flags from this suit so it utilizes nothing special.
+/obj/item/clothing/suit/space/santa/fluff
+	name = "Santa's suit"
+	desc = "Festive!"
+	icon_state = "santa"
+	item_state = "santa"
+	slowdown = 0
+
+/obj/item/clothing/mask/sexymime
+	name = "The Hollow heart"
+	desc = "Sometimes things are too much to hide."
+	icon = 'icons/obj/custom.dmi'
+	icon_override = 'icons/mob/custom_w.dmi'
+	icon_state = "sexymime"
+	item_state = "sexymime"
+	flags_inv = HIDEFACE|HIDEFACIALHAIR
+
+
+/*Brian*/
+
+/obj/item/clothing/suit/trenchcoat/green
+	name = "Reece's Great Coat"
+	desc = "You would swear this was in your nightmares after eating too many veggies."
+	icon = 'icons/obj/custom.dmi'
+	icon_state = "hos-g"
+	icon_override = 'icons/mob/custom_w.dmi'
+	item_state = "hos-g"
+	body_parts_covered = CHEST|GROIN|ARMS|LEGS
+
+
+/*Slomek*/
+/obj/item/reagent_containers/food/drinks/flask/russian
+	name = "russian flask"
+	desc = "Every good russian spaceman knows it's a good idea to bring along a couple of pints of whiskey wherever they go."
+	icon = 'icons/obj/custom.dmi'
+	icon_state = "russianflask"
+	volume = 60
+
+/obj/item/clothing/mask/gas/stalker
+	name = "S.T.A.L.K.E.R. mask"
+	desc = "Smells like reactor four."
+	icon = 'icons/obj/custom.dmi'
+	item_state = "stalker"
+	icon_override = 'icons/mob/custom_w.dmi'
+	icon_state = "stalker"
+
+
+/*Sylas*/
+/obj/item/clothing/neck/petcollar/stripe //don't really wear this though please c'mon seriously guys
+	name = "collar"
+	desc = "It's a collar..."
+	icon = 'icons/obj/custom.dmi'
+	icon_state = "petcollar-stripe"
+	icon_override = 'icons/mob/custom_w.dmi'
+	item_state = "petcollar-stripe"
+	tagname = null
+
+
+/*PLACEHOLDER*/
+/obj/item/clothing/under/singery/custom
+	name = "bluish performer's outfit"
+	desc = "Just looking at this makes you want to sing."
+	icon = 'icons/obj/custom.dmi'
+	icon_state = "singer"
+	icon_override = 'icons/mob/custom_w.dmi'
+	item_state = "singer"
+	item_color = "singer"
+	fitted = NO_FEMALE_UNIFORM
+	alternate_worn_layer = ABOVE_SHOES_LAYER
+	can_adjust = 0
+
+
+/obj/item/clothing/shoes/sneakers/pink
+	icon = 'icons/obj/custom.dmi'
+	icon_state = "pink"
+	icon_override = 'icons/mob/custom_w.dmi'
+	item_state = "pink"
+
+/obj/item/clothing/neck/tie/bloodred
+	name = "Blood Red Tie"
+	desc = "A neosilk clip-on tie. This one has a black S on the tipping and looks rather unique."
+	icon = 'icons/obj/custom.dmi'
+	icon_state = "bloodredtie"
+	icon_override = 'icons/mob/custom_w.dmi'
+
+
+/*Fractious*/
+
+/obj/item/clothing/suit/vermillion
+	name = "vermillion clothing"
+	desc = "Some clothing."
+	icon_state = "vermillion"
+	item_state = "vermillion"
+	body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS
+	icon = 'icons/obj/custom.dmi'
+	icon_override = 'icons/mob/custom_w.dmi'
+
+/*TechnicalMagi*/
+/obj/item/clothing/under/bb_sweater/black/naomi
+	name = "worn black sweater"
+	desc = "A well-loved sweater, showing signs of several cleanings and re-stitchings. And a few stains. Is that cat fur?"
+
+/obj/item/clothing/neck/petcollar/naomi
+	name = "worn pet collar"
+	desc = "a pet collar that looks well used."
+
+/obj/item/clothing/neck/petcollar/naomi/examine(mob/user)
+	. = ..()
+	if(usr.ckey != "technicalmagi")
+		to_chat(user, "There's something odd about the it. You probably shouldn't wear it...")//warn people not to wear it if they're not Naomi, lest they become as crazy as she is
+
+/obj/item/clothing/neck/petcollar/naomi/equipped()
+	. = ..()
+	START_PROCESSING(SSobj, src)
+
+/obj/item/clothing/neck/petcollar/naomi/dropped()
+	. = ..()
+	STOP_PROCESSING(SSobj, src)
+
+/obj/item/clothing/neck/petcollar/naomi/process()
+	var/mob/living/carbon/human/H
+	if(ishuman(loc))
+		H = loc
+	if(!H)
+		return
+	else if(H.get_item_by_slot(slot_neck) == src)
+		if(H.arousalloss < H.max_arousal / 3)
+			H.arousalloss = H.max_arousal / 3
+		if(prob(5) && H.hallucination < 15)
+			H.hallucination += 10

modular_citadel/code/modules/custom_loadout/load_to_mob.dm

@@ -0,0 +1,61 @@
+
+//Proc that does the actual loading of items to mob
+/*Itemlists are formatted as
+"[typepath]" = number_of_it_to_spawn
+*/
+
+#define DROP_TO_FLOOR 0
+#define LOADING_TO_HUMAN 1
+
+/proc/handle_roundstart_items(mob/living/M, ckey_override, job_override, special_override)
+	if(!istype(M) || (!M.ckey && !ckey_override) || (!M.mind && (!job_override || !special_override)))
+		return FALSE
+	return load_itemlist_to_mob(M, parse_custom_roundstart_items(ckey_override? ckey_override : M.ckey, M.name, job_override? job_override : M.mind.assigned_role, special_override? special_override : M.mind.special_role), TRUE, TRUE, FALSE)
+
+//Just incase there's extra mob selections in the future.....
+/proc/load_itemlist_to_mob(mob/living/L, list/itemlist, drop_on_floor_if_full = TRUE, load_to_all_slots = TRUE, replace_slots = FALSE)
+	if(!istype(L) || !islist(itemlist))
+		return FALSE
+	var/loading_mode = DROP_TO_FLOOR
+	var/turf/current_turf = get_turf(L)
+	if(ishuman(L))
+		loading_mode = LOADING_TO_HUMAN
+	switch(loading_mode)
+		if(DROP_TO_FLOOR)
+			for(var/I in itemlist)
+				var/typepath = text2path(I)
+				if(!typepath)
+					continue
+				for(var/i = 0, i < itemlist[I], i++)
+					new typepath(current_turf)
+			return TRUE
+		if(LOADING_TO_HUMAN)
+			return load_itemlist_to_human(L, itemlist, drop_on_floor_if_full, load_to_all_slots, replace_slots)
+
+/proc/load_itemlist_to_human(mob/living/carbon/human/H, list/itemlist, drop_on_floor_if_full = TRUE, load_to_all_slots = TRUE, replace_slots = FALSE)
+	if(!istype(H) || !islist(itemlist))
+		return FALSE
+	var/turf/T = get_turf(H)
+	for(var/item in itemlist)
+		var/path = item
+		if(!ispath(path))
+			path = text2path(path)
+		if(!path)
+			continue
+		var/amount = itemlist[item]
+		for(var/i in 1 to amount)
+			var/atom/movable/loaded_atom = new path
+			if(!istype(loaded_atom))
+				QDEL_NULL(loaded_atom)
+				continue
+			if(!istype(loaded_atom, /obj/item))
+				loaded_atom.forceMove(T)
+				continue
+			var/obj/item/loaded = loaded_atom
+			var/obj/item/storage/S = H.get_item_by_slot(slot_back)
+			if(istype(S))
+				S.handle_item_insertion(loaded, TRUE, H)	//Force it into their backpack
+				continue
+			if(!H.put_in_hands(loaded))						//They don't have one/somehow that failed, put it in their hands
+				loaded.forceMove(T)				//Guess we're just dumping it on the floor!
+	return TRUE

modular_citadel/code/modules/custom_loadout/read_from_file.dm

@@ -0,0 +1,71 @@
+
+GLOBAL_LIST(custom_item_list)
+//Layered list in form of custom_item_list[ckey][job][items][amounts]
+//ckey is key, job is specific jobs, or "ALL" for all jobs, items for items, amounts for amount of item.
+
+//File should be in the format of ckey|exact job name/exact job name/or put ALL instead of any job names|/path/to/item=amount;/path/to/item=amount
+//Each ckey should be in a different line
+//if there's multiple entries of a single ckey the later ones will add to the earlier definitions.
+
+/proc/reload_custom_roundstart_items_list(custom_filelist)
+	if(!custom_filelist)
+		custom_filelist = "config/custom_roundstart_items.txt"
+	GLOB.custom_item_list = list()
+	var/list/file_lines = world.file2list(custom_filelist)
+	for(var/line in file_lines)
+		if(length(line) == 0)	//Emptyline, no one cares.
+			continue
+		if(copytext(line,1,3) == "//")	//Commented line, ignore.
+			continue
+		var/ckey_str_sep = findtext(line, "|")						//Process our stuff..
+		var/char_str_sep = findtext(line, "|", ckey_str_sep+1)
+		var/job_str_sep = findtext(line, "|", char_str_sep+1)
+		var/item_str_sep = findtext(line, "|", job_str_sep+1)
+		var/ckey_str = ckey(copytext(line, 1, ckey_str_sep))
+		var/char_str = copytext(line, ckey_str_sep+1, char_str_sep)
+		var/job_str = copytext(line, char_str_sep+1, job_str_sep)
+		var/item_str = copytext(line, job_str_sep+1, item_str_sep)
+		if(!ckey_str || !char_str || !job_str || !item_str || !length(ckey_str) || !length(char_str) || !length(job_str) || !length(item_str))
+			log_admin("Errored custom_items_whitelist line: [line] - Component/separator missing!")
+		if(!islist(GLOB.custom_item_list[ckey_str]))
+			GLOB.custom_item_list[ckey_str] = list()	//Initialize list for this ckey if it isn't initialized..
+		var/list/characters = splittext(char_str, "/")
+		for(var/character in characters)
+			if(!islist(GLOB.custom_item_list[ckey_str][character]))
+				GLOB.custom_item_list[ckey_str][character] = list()
+		var/list/jobs = splittext(job_str, "/")
+		for(var/job in jobs)
+			for(var/character in characters)
+				if(!islist(GLOB.custom_item_list[ckey_str][character][job]))
+					GLOB.custom_item_list[ckey_str][character][job] = list()		//Initialize item list for this job of this ckey if not already initialized.
+		var/list/item_strings = splittext(item_str, ";")			//Get item strings in format of /path/to/item=amount
+		for(var/item_string in item_strings)
+			var/path_str_sep = findtext(item_string, "=")
+			var/path = copytext(item_string, 1, path_str_sep)	//Path to spawn
+			var/amount = copytext(item_string, path_str_sep+1)	//Amount to spawn
+			//world << "DEBUG: Item string [item_string] processed"
+			amount = text2num(amount)
+			path = text2path(path)
+			if(!ispath(path) || !isnum(amount))
+				log_admin("Errored custom_items_whitelist line: [line] - Path/number for item missing or invalid.")
+			for(var/character in characters)
+				for(var/job in jobs)
+					if(!GLOB.custom_item_list[ckey_str][character][job][path])		//Doesn't exist, make it exist!
+						GLOB.custom_item_list[ckey_str][character][job][path] = amount
+					else
+						GLOB.custom_item_list[ckey_str][character][job][path] += amount	//Exists, we want more~
+	return GLOB.custom_item_list
+
+/proc/parse_custom_roundstart_items(ckey, char_name = "ALL", job_name = "ALL", special_role)
+	var/list/ret = list()
+	if(GLOB.custom_item_list[ckey])
+		for(var/char in GLOB.custom_item_list[ckey])
+			if((char_name == char) || (char_name == "ALL") || (char == "ALL"))
+				for(var/job in GLOB.custom_item_list[ckey][char])
+					if((job_name == job) || (job == "ALL") || (job_name == "ALL") || (special_role && (job == special_role)))
+						for(var/item_path in GLOB.custom_item_list[ckey][char][job])
+							if(ret[item_path])
+								ret[item_path] += GLOB.custom_item_list[ckey][char][job][item_path]
+							else
+								ret[item_path] = GLOB.custom_item_list[ckey][char][job][item_path]
+	return ret

modular_citadel/code/modules/mob/cit_emotes.dm

@@ -0,0 +1,3 @@
+//Disables the custom emote blacklist from TG that normally applies to slimes.
+/datum/emote/living/custom
+	mob_type_blacklist_typecache = list(/mob/living/brain)

modular_citadel/code/modules/mob/living/silicon/robot/dogborg archive.dm

@@ -0,0 +1,76 @@
+/obj/item/robot_module/loader
+	name = "loader robot module"
+/obj/item/robot_module/loader/New()
+	..()
+	emag = new /obj/item/borg/stun(src)
+	modules += new /obj/item/extinguisher(src)
+	modules += new /obj/item/weldingtool/largetank/cyborg(src)
+	modules += new /obj/item/screwdriver(src)
+	modules += new /obj/item/wrench(src)
+	modules += new /obj/item/crowbar(src)
+	modules += new /obj/item/wirecutters(src)
+	modules += new /obj/item/device/multitool(src)
+	modules += new /obj/item/device/t_scanner(src)
+	modules += new /obj/item/device/analyzer(src)
+	modules += new /obj/item/device/assembly/signaler
+	modules += new /obj/item/soap/nanotrasen(src)
+
+	fix_modules()
+
+/obj/item/robot_module/k9
+	name = "Security K-9 Unit module"
+/obj/item/robot_module/k9/New()
+	..()
+	modules += new /obj/item/restraints/handcuffs/cable/zipties/cyborg/dog(src)
+	modules += new /obj/item/dogborg/jaws/big(src)
+	modules += new /obj/item/dogborg/pounce(src)
+	modules += new /obj/item/clothing/mask/gas/sechailer/cyborg(src)
+	modules += new /obj/item/soap/tongue(src)
+	modules += new /obj/item/device/analyzer/nose(src)
+	modules += new /obj/item/storage/bag/borgdelivery(src)
+	//modules += new /obj/item/device/assembly/signaler(src)
+	//modules += new /obj/item/device/detective_scanner(src)
+	modules += new /obj/item/gun/energy/disabler/cyborg(src)
+	emag = new /obj/item/gun/energy/laser/cyborg(src)
+	fix_modules()
+
+/obj/item/robot_module/security/respawn_consumable(mob/living/silicon/robot/R, coeff = 1)
+	..()
+	var/obj/item/gun/energy/gun/advtaser/cyborg/T = locate(/obj/item/gun/energy/gun/advtaser/cyborg) in get_usable_modules()
+	if(T)
+		if(T.power_supply.charge < T.power_supply.maxcharge)
+			var/obj/item/ammo_casing/energy/S = T.ammo_type[T.select]
+			T.power_supply.give(S.e_cost * coeff)
+			T.update_icon()
+		else
+			T.charge_tick = 0
+	fix_modules()
+
+/obj/item/robot_module/borgi
+	name = "Borgi module"
+
+/obj/item/robot_module/borgi/New()
+	..()
+	modules += new /obj/item/dogborg/jaws/small(src)
+	modules += new /obj/item/storage/bag/borgdelivery(src)
+	modules += new /obj/item/soap/tongue(src)
+	modules += new /obj/item/device/healthanalyzer(src)
+	modules += new /obj/item/device/analyzer/nose(src)
+	emag = new /obj/item/dogborg/pounce(src)
+	fix_modules()
+
+/obj/item/robot_module/medihound
+	name = "MediHound module"
+
+/obj/item/robot_module/medihound/New()
+	..()
+	modules += new /obj/item/dogborg/jaws/small(src)
+	modules += new /obj/item/storage/bag/borgdelivery(src)
+	modules += new /obj/item/device/analyzer/nose(src)
+	modules += new /obj/item/soap/tongue(src)
+	modules += new /obj/item/device/healthanalyzer(src)
+	modules += new /obj/item/dogborg/sleeper(src)
+	modules += new /obj/item/twohanded/shockpaddles/hound(src)
+	modules += new /obj/item/device/sensor_device(src)
+	emag = new /obj/item/dogborg/pounce(src)
+	fix_modules()

modular_citadel/code/modules/mob/living/silicon/robot/dogborg_equipment.dm

@@ -0,0 +1,401 @@
+/*
+DOG BORG EQUIPMENT HERE
+SLEEPER CODE IS IN game/objects/items/devices/dogborg_sleeper.dm !
+*/
+
+/obj/item/dogborg/jaws/big
+	name = "combat jaws"
+	icon = 'icons/mob/dogborg.dmi'
+	icon_state = "jaws"
+	desc = "The jaws of the law."
+	flags_1 = CONDUCT_1
+	force = 12
+	throwforce = 0
+	hitsound = 'sound/weapons/bite.ogg'
+	attack_verb = list("chomped", "bit", "ripped", "mauled", "enforced")
+	w_class = 3
+	sharpness = IS_SHARP
+
+/obj/item/dogborg/jaws/small
+	name = "puppy jaws"
+	icon = 'icons/mob/dogborg.dmi'
+	icon_state = "smalljaws"
+	desc = "The jaws of a small dog."
+	flags_1 = CONDUCT_1
+	force = 6
+	throwforce = 0
+	hitsound = 'sound/weapons/bite.ogg'
+	attack_verb = list("nibbled", "bit", "gnawed", "chomped", "nommed")
+	w_class = 3
+	sharpness = IS_SHARP
+
+/obj/item/dogborg/jaws/attack(atom/A, mob/living/silicon/robot/user)
+	..()
+	user.do_attack_animation(A, ATTACK_EFFECT_BITE)
+
+/obj/item/dogborg/jaws/small/attack_self(mob/user)
+	var/mob/living/silicon/robot.R = user
+	if(R.emagged)
+		name = "combat jaws"
+		icon = 'icons/mob/dogborg.dmi'
+		icon_state = "jaws"
+		desc = "The jaws of the law."
+		flags_1 = CONDUCT_1
+		force = 12
+		throwforce = 0
+		hitsound = 'sound/weapons/bite.ogg'
+		attack_verb = list("chomped", "bit", "ripped", "mauled", "enforced")
+		w_class = 3
+		sharpness = IS_SHARP
+	else
+		name = "puppy jaws"
+		icon = 'icons/mob/dogborg.dmi'
+		icon_state = "smalljaws"
+		desc = "The jaws of a small dog."
+		flags_1 = CONDUCT_1
+		force = 5
+		throwforce = 0
+		hitsound = 'sound/weapons/bite.ogg'
+		attack_verb = list("nibbled", "bit", "gnawed", "chomped", "nommed")
+		w_class = 3
+		sharpness = IS_SHARP
+	update_icon()
+
+
+//Cuffs
+
+/obj/item/restraints/handcuffs/cable/zipties/cyborg/dog/attack(mob/living/carbon/C, mob/user)
+	if(!C.handcuffed)
+		playsound(loc, 'sound/weapons/cablecuff.ogg', 60, 1, -2)
+		C.visible_message("<span class='danger'>[user] is trying to put zipties on [C]!</span>", \
+							"<span class='userdanger'>[user] is trying to put zipties on [C]!</span>")
+		if(do_mob(user, C, 60))
+			if(!C.handcuffed)
+				C.handcuffed = new /obj/item/restraints/handcuffs/cable/zipties/used(C)
+				C.update_inv_handcuffed(0)
+				to_chat(user,"<span class='notice'>You handcuff [C].</span>")
+				playsound(loc, pick('sound/voice/bgod.ogg', 'sound/voice/biamthelaw.ogg', 'sound/voice/bsecureday.ogg', 'sound/voice/bradio.ogg', 'sound/voice/binsult.ogg', 'sound/voice/bcreep.ogg'), 50, 0)
+				add_logs(user, C, "handcuffed")
+		else
+			to_chat(user,"<span class='warning'>You fail to handcuff [C]!</span>")
+
+
+//Boop
+
+/obj/item/device/analyzer/nose
+	name = "boop module"
+	icon = 'icons/mob/dogborg.dmi'
+	icon_state = "nose"
+	desc = "The BOOP module"
+	flags_1 = CONDUCT_1
+	force = 0
+	throwforce = 0
+	attack_verb = list("nuzzled", "nosed", "booped")
+	w_class = 1
+
+/obj/item/device/analyzer/nose/attack_self(mob/user)
+	user.visible_message("[user] sniffs around the air.", "<span class='warning'>You sniff the air for gas traces.</span>")
+
+	var/turf/location = user.loc
+	if(!istype(location))
+		return
+
+	var/datum/gas_mixture/environment = location.return_air()
+
+	var/pressure = environment.return_pressure()
+	var/total_moles = environment.total_moles()
+
+	to_chat(user, "<span class='info'><B>Results:</B></span>")
+	if(abs(pressure - ONE_ATMOSPHERE) < 10)
+		to_chat(user, "<span class='info'>Pressure: [round(pressure,0.1)] kPa</span>")
+	else
+		to_chat(user, "<span class='alert'>Pressure: [round(pressure,0.1)] kPa</span>")
+	if(total_moles)
+		var/list/env_gases = environment.gases
+
+		environment.assert_gases(arglist(GLOB.hardcoded_gases))
+		var/o2_concentration = env_gases[/datum/gas/oxygen][MOLES]/total_moles
+		var/n2_concentration = env_gases[/datum/gas/nitrogen][MOLES]/total_moles
+		var/co2_concentration = env_gases[/datum/gas/carbon_dioxide][MOLES]/total_moles
+		var/plasma_concentration = env_gases[/datum/gas/plasma][MOLES]/total_moles
+		environment.garbage_collect()
+
+		if(abs(n2_concentration - N2STANDARD) < 20)
+			to_chat(user, "<span class='info'>Nitrogen: [round(n2_concentration*100, 0.01)] %</span>")
+		else
+			to_chat(user, "<span class='alert'>Nitrogen: [round(n2_concentration*100, 0.01)] %</span>")
+
+		if(abs(o2_concentration - O2STANDARD) < 2)
+			to_chat(user, "<span class='info'>Oxygen: [round(o2_concentration*100, 0.01)] %</span>")
+		else
+			to_chat(user, "<span class='alert'>Oxygen: [round(o2_concentration*100, 0.01)] %</span>")
+
+		if(co2_concentration > 0.01)
+			to_chat(user, "<span class='alert'>CO2: [round(co2_concentration*100, 0.01)] %</span>")
+		else
+			to_chat(user, "<span class='info'>CO2: [round(co2_concentration*100, 0.01)] %</span>")
+
+		if(plasma_concentration > 0.005)
+			to_chat(user, "<span class='alert'>Plasma: [round(plasma_concentration*100, 0.01)] %</span>")
+		else
+			to_chat(user, "<span class='info'>Plasma: [round(plasma_concentration*100, 0.01)] %</span>")
+
+
+		for(var/id in env_gases)
+			if(id in GLOB.hardcoded_gases)
+				continue
+			var/gas_concentration = env_gases[id][MOLES]/total_moles
+			to_chat(user, "<span class='alert'>[env_gases[id][GAS_META][META_GAS_NAME]]: [round(gas_concentration*100, 0.01)] %</span>")
+		to_chat(user, "<span class='info'>Temperature: [round(environment.temperature-T0C)] &deg;C</span>")
+
+/obj/item/device/analyzer/nose/AltClick(mob/user) //Barometer output for measuring when the next storm happens
+	. = ..()
+
+//Delivery
+
+/obj/item/storage/bag/borgdelivery
+	name = "fetching storage"
+	desc = "Fetch the thing!"
+	icon = 'icons/mob/dogborg.dmi'
+	icon_state = "dbag"
+	//Can hold one big item at a time. Drops contents on unequip.(see inventory.dm)
+	w_class = 5
+	max_w_class = 2
+	max_combined_w_class = 2
+	storage_slots = 1
+	collection_mode = 0
+	can_hold = list() // any
+	cant_hold = list(/obj/item/disk/nuclear)
+
+
+//Tongue stuff
+
+/obj/item/soap/tongue
+	name = "synthetic tongue"
+	desc = "Useful for slurping mess off the floor before affectionally licking the crew members in the face."
+	icon = 'icons/mob/dogborg.dmi'
+	icon_state = "synthtongue"
+	hitsound = 'sound/effects/attackblob.ogg'
+	cleanspeed = 80
+
+/obj/item/soap/tongue/scrubpup
+	cleanspeed = 25 //slightly faster than a mop.
+
+/obj/item/soap/tongue/New()
+	..()
+	flags_1 |= NOBLUDGEON_1 //No more attack messages
+
+/obj/item/trash/rkibble
+	name = "robo kibble"
+	desc = "A novelty bowl of assorted mech fabricator byproducts. Mockingly feed this to the sec-dog to help it recharge."
+	icon = 'icons/mob/dogborg.dmi'
+	icon_state= "kibble"
+
+/obj/item/soap/tongue/attack_self(mob/user)
+	var/mob/living/silicon/robot.R = user
+	if(R.emagged)
+		name = "hacked tongue of doom"
+		desc = "Your tongue has been upgraded successfully. Congratulations."
+		icon = 'icons/mob/dogborg.dmi'
+		icon_state = "syndietongue"
+		cleanspeed = 10 //(nerf'd)tator soap stat
+	else
+		name = "synthetic tongue"
+		desc = "Useful for slurping mess off the floor before affectionally licking the crew members in the face."
+		icon = 'icons/mob/dogborg.dmi'
+		icon_state = "synthtongue"
+		cleanspeed = initial(cleanspeed)
+	update_icon()
+
+/obj/item/soap/tongue/afterattack(atom/target, mob/user, proximity)
+	var/mob/living/silicon/robot.R = user
+	if(!proximity || !check_allowed_items(target))
+		return
+	if(R.client && (target in R.client.screen))
+		to_chat(R, "<span class='warning'>You need to take that [target.name] off before cleaning it!</span>")
+	else if(is_cleanable(target))
+		R.visible_message("[R] begins to lick off \the [target.name].", "<span class='warning'>You begin to lick off \the [target.name]...</span>")
+		if(do_after(R, src.cleanspeed, target = target))
+			if(!in_range(src, target)) //Proximity is probably old news by now, do a new check.
+				return //If they moved away, you can't eat them.
+			to_chat(R, "<span class='notice'>You finish licking off \the [target.name].</span>")
+			qdel(target)
+			R.cell.give(50)
+	else if(isobj(target)) //hoo boy. danger zone man
+		if(istype(target,/obj/item/trash))
+			R.visible_message("[R] nibbles away at \the [target.name].", "<span class='warning'>You begin to nibble away at \the [target.name]...</span>")
+			if(do_after(R, src.cleanspeed, target = target))
+				if(!in_range(src, target)) //Proximity is probably old news by now, do a new check.
+					return //If they moved away, you can't eat them.
+				to_chat(R, "<span class='notice'>You finish off \the [target.name].</span>")
+				qdel(target)
+				R.cell.give(250)
+			return
+		if(istype(target,/obj/item/stock_parts/cell))
+			R.visible_message("[R] begins cramming \the [target.name] down its throat.", "<span class='warning'>You begin cramming \the [target.name] down your throat...</span>")
+			if(do_after(R, 50, target = target))
+				if(!in_range(src, target)) //Proximity is probably old news by now, do a new check.
+					return //If they moved away, you can't eat them.
+				to_chat(R, "<span class='notice'>You finish off \the [target.name].</span>")
+				var/obj/item/stock_parts/cell.C = target
+				R.cell.charge = R.cell.charge + (C.charge / 3) //Instant full cell upgrades op idgaf
+				qdel(target)
+			return
+		var/obj/item/I = target //HAHA FUCK IT, NOT LIKE WE ALREADY HAVE A SHITTON OF WAYS TO REMOVE SHIT
+		if(!I.anchored && R.emagged)
+			R.visible_message("[R] begins chewing up \the [target.name]. Looks like it's trying to loophole around its diet restriction!", "<span class='warning'>You begin chewing up \the [target.name]...</span>")
+			if(do_after(R, 100, target = I)) //Nerf dat time yo
+				if(!in_range(src, target)) //Proximity is probably old news by now, do a new check. Even emags don't make you magically eat things at range.
+					return //If they moved away, you can't eat them.
+				visible_message("<span class='warning'>[R] chews up \the [target.name] and cleans off the debris!</span>")
+				to_chat(R, "<span class='notice'>You finish off \the [target.name].</span>")
+				qdel(I)
+				R.cell.give(500)
+			return
+		R.visible_message("[R] begins to lick \the [target.name] clean...", "<span class='notice'>You begin to lick \the [target.name] clean...</span>")
+		if(do_after(R, src.cleanspeed, target = target))
+			if(!in_range(src, target)) //Proximity is probably old news by now, do a new check.
+				return //If they moved away, you can't clean them.
+			to_chat(R,"<span class='notice'>You clean \the [target.name].</span>")
+			var/obj/effect/decal/cleanable/C = locate() in target
+			qdel(C)
+			SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
+	else if(ishuman(target))
+		if(R.emagged)
+			var/mob/living/L = target
+			if(R.cell.charge <= 666)
+				return
+			L.Stun(4) // normal stunbaton is force 7 gimme a break good sir!
+			L.Knockdown(80)
+			L.apply_effect(STUTTER, 4)
+			L.visible_message("<span class='danger'>[R] has shocked [L] with its tongue!</span>", \
+								"<span class='userdanger'>[R] has shocked you with its tongue! You can feel the betrayal.</span>")
+			playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1)
+			R.cell.use(666)
+		else
+			R.visible_message("<span class='warning'>\the [R] affectionally licks \the [target]'s face!</span>", "<span class='notice'>You affectionally lick \the [target]'s face!</span>")
+			playsound(src.loc, 'sound/effects/attackblob.ogg', 50, 1)
+			return
+	else if(istype(target, /obj/structure/window))
+		R.visible_message("[R] begins to lick \the [target.name] clean...", "<span class='notice'>You begin to lick \the [target.name] clean...</span>")
+		if(do_after(R, src.cleanspeed, target = target))
+			if(!in_range(src, target)) //Proximity is probably old news by now, do a new check.
+				return //If they moved away, you can't clean them.
+			to_chat(R, "<span class='notice'>You clean \the [target.name].</span>")
+			target.color = initial(target.color)
+	else
+		R.visible_message("[R] begins to lick \the [target.name] clean...", "<span class='notice'>You begin to lick \the [target.name] clean...</span>")
+		if(do_after(R, src.cleanspeed, target = target))
+			if(!in_range(src, target)) //Proximity is probably old news by now, do a new check.
+				return //If they moved away, you can't clean them.
+			to_chat(R, "<span class='notice'>You clean \the [target.name].</span>")
+			var/obj/effect/decal/cleanable/C = locate() in target
+			qdel(C)
+			SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
+	return
+
+
+//Defibs
+
+/obj/item/twohanded/shockpaddles/cyborg/hound
+	name = "Paws of Life"
+	desc = "MediHound specific shock paws."
+	icon = 'icons/mob/dogborg.dmi'
+	icon_state = "defibpaddles0"
+	item_state = "defibpaddles0"
+
+// Pounce stuff for K-9
+
+/obj/item/dogborg/pounce
+	name = "pounce"
+	icon = 'icons/mob/dogborg.dmi'
+	icon_state = "pounce"
+	desc = "Leap at your target to momentarily stun them."
+	force = 0
+	throwforce = 0
+
+/obj/item/dogborg/pounce/New()
+	..()
+	flags_1 |= NOBLUDGEON_1
+
+/mob/living/silicon/robot
+	var/leaping = 0
+	var/pounce_cooldown = 0
+	var/pounce_cooldown_time = 50 //Nearly doubled, u happy?
+	var/pounce_spoolup = 3
+	var/leap_at
+	var/disabler
+	var/laser
+	var/sleeper_g
+	var/sleeper_r
+
+#define MAX_K9_LEAP_DIST 4 //because something's definitely borked the pounce functioning from a distance.
+
+/obj/item/dogborg/pounce/afterattack(atom/A, mob/user)
+	var/mob/living/silicon/robot/R = user
+	if(R && !R.pounce_cooldown)
+		R.pounce_cooldown = !R.pounce_cooldown
+		to_chat(R, "<span class ='warning'>Your targeting systems lock on to [A]...</span>")
+		addtimer(CALLBACK(R, /mob/living/silicon/robot.proc/leap_at, A), R.pounce_spoolup)
+		spawn(R.pounce_cooldown_time)
+			R.pounce_cooldown = !R.pounce_cooldown
+	else if(R && R.pounce_cooldown)
+		to_chat(R, "<span class='danger'>Your leg actuators are still recharging!</span>")
+
+/mob/living/silicon/robot/proc/leap_at(atom/A)
+	if(leaping || stat || buckled || lying)
+		return
+
+	if(!has_gravity(src) || !has_gravity(A))
+		to_chat(src,"<span class='danger'>It is unsafe to leap without gravity!</span>")
+		//It's also extremely buggy visually, so it's balance+bugfix
+		return
+
+	if(cell.charge <= 500)
+		to_chat(src,"<span class='danger'>Insufficent reserves for jump actuators!</span>")
+		return
+
+	else
+		leaping = 1
+		weather_immunities += "lava"
+		pixel_y = 10
+		update_icons()
+		throw_at(A, MAX_K9_LEAP_DIST, 1, spin=0, diagonals_first = 1)
+		cell.use(500) //Doubled the energy consumption
+		weather_immunities -= "lava"
+
+/mob/living/silicon/robot/throw_impact(atom/A)
+
+	if(!leaping)
+		return ..()
+
+	if(A)
+		if(isliving(A))
+			var/mob/living/L = A
+			var/blocked = 0
+			if(ishuman(A))
+				var/mob/living/carbon/human/H = A
+				if(H.check_shields(0, "the [name]", src, attack_type = LEAP_ATTACK))
+					blocked = 1
+			if(!blocked)
+				L.visible_message("<span class ='danger'>[src] pounces on [L]!</span>", "<span class ='userdanger'>[src] pounces on you!</span>")
+				L.Knockdown(45)
+				playsound(src, 'sound/weapons/Egloves.ogg', 50, 1)
+				sleep(2)//Runtime prevention (infinite bump() calls on hulks)
+				step_towards(src,L)
+			else
+				Knockdown(45, 1, 1)
+
+			pounce_cooldown = !pounce_cooldown
+			spawn(pounce_cooldown_time) //3s by default
+				pounce_cooldown = !pounce_cooldown
+		else if(A.density && !A.CanPass(src))
+			visible_message("<span class ='danger'>[src] smashes into [A]!</span>", "<span class ='userdanger'>You smash into [A]!</span>")
+			playsound(src, 'sound/items/trayhit1.ogg', 50, 1)
+			Knockdown(45, 1, 1)
+
+		if(leaping)
+			leaping = 0
+			pixel_y = initial(pixel_y)
+			update_icons()
+			update_canmove()

modular_citadel/code/modules/mob/living/silicon/robot/robot_modules.dm

@@ -67,6 +67,7 @@
 		/obj/item/soap/tongue,
 		/obj/item/device/healthanalyzer,
 		/obj/item/device/dogborg/sleeper/medihound,
+		/obj/item/reagent_containers/borghypo,
 		/obj/item/twohanded/shockpaddles/cyborg/hound,
 		/obj/item/stack/medical/gauze/cyborg,
 		/obj/item/device/sensor_device)

modular_citadel/code/modules/mob/living/simple_animal/pokemon.dm

@@ -0,0 +1,306 @@
+//Sprites are trademarks of Gamefreak, Nintendo, The Pokemon Company, and Spike Chunsoft.
+#define ispokemon(A) (istype(A, /mob/living/simple_animal/pokemon))
+//POKEBALL
+/obj/item/pokeball
+	name = "pokeball"
+	icon = 'icons/obj/pokeball.dmi'
+	icon_state = "pokeball"
+	force = 0
+	throwforce = 0
+	var/success_chance = 25
+	var/pokemon
+/obj/item/pokeball/great
+	name = "great ball"
+	icon_state = "pokeball_great"
+	success_chance = 50
+/obj/item/pokeball/ultra
+	icon_state = "pokeball_ultra"
+	name = "ultra ball"
+	success_chance = 75
+/obj/item/pokeball/master
+	icon_state = "pokeball_master"
+	name = "master ball"
+	success_chance = 100
+/* //WIP
+/obj/item/pokeball/throw_impact(atom/hit_atom)
+	if(ispokemon(hit_atom))
+		var/mob/living/simple_animal/pokemon/pmon = hit_atom
+		var/initial_success_chance = success_chance
+		pmon.resize = 0.1
+		pmon.color = "RED"
+		pmon.canmove = 0
+		sleep(15)
+		if(pmon.pokeball == src)
+			pmon.loc = src
+			pokemon = pmon
+
+			return 1
+		if(pmon.pokeball && pmon.pokeball !=src)
+			return ..()
+		var/bonus_chance = ((pmon.maxHealth - pmon.health) / 2)
+		if(bonus_chance > 100)
+			bonus_chance = 100
+		success_chance = (success_chance + bonus_chance)
+		if(success_chance > 100)
+			success_chance = 100
+		if(success_chance < 0)//just in case
+			success_chance  = 0
+		sleep(15)
+		if(prob(success_chance))
+			visible_message("<span class='warning'>[src] shakes...</span>")
+		else
+			escape()
+		sleep(15)
+		if(prob(success_chance))
+			visible_message("<span class='warning'>[src] shakes...</span>")
+		else
+			escape()
+		sleep(15)
+		if(prob(success_chance))
+			visible_message("<span class='warning'>[src] shakes...</span>")
+		else
+			escape()
+	else
+		..()
+/obj/item/pokeball/proc/capture(mob/living/simple_animal/pokemon/pmon, mob/living/user)
+
+/obj/item/pokeball/proc/escape(mob/living/simple_animal/pokemon/pmon, mob/living/user)
+	if(!pokemon)
+		return
+	pmon.resize = 10
+	pmon.color = null
+	pmon.canmove = 1
+	pmon.loc = src.loc
+	if(pmon.pokeball != src)
+		visible_message("<span class='warning'>[pmon] breaks free from [src]</span>")
+		PoolOrNew(/obj/effect/particle_effect/sparks, loc)
+		playsound(src.loc, "sparks", 50, 1)
+		qdel(src)
+
+	else
+/obj/item/pokeball/proc/recall
+/obj/item/pokeball/proc/release
+*/
+/mob/living/simple_animal/pokemon
+	name = "eevee"
+	icon_state = "eevee"
+	icon_living = "eevee"
+	icon_dead = "eevee_d"
+	desc = "Gotta catch 'em all!"
+	icon = 'icons/mob/pokemon.dmi'
+	var/pokeball
+	pixel_x = -16
+	butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 5)
+	ventcrawler = 2
+	health = 100
+	maxHealth = 100
+	layer = 4
+	response_help = "pets"
+	wander = 1
+	turns_per_move = 2
+	pass_flags = PASSTABLE | PASSMOB
+
+/mob/living/simple_animal/pokemon/proc/simple_lay_down()
+	set name = "Rest"
+	set category = "IC"
+
+	resting = !resting
+	src << "<span class='notice'>You are now [resting ? "resting" : "getting up"].</span>"
+	update_canmove()
+	update_icon()
+
+/mob/living/simple_animal/pokemon/proc/update_icon()
+	if(lying || resting || sleeping)
+		icon_state = "[icon_state]_rest"
+	else
+		icon_state = "[icon_living]"
+
+/mob/living/simple_animal/pokemon/New()
+	..()
+	verbs += /mob/living/simple_animal/pokemon/proc/simple_lay_down
+
+/*
+/////TEMPLATE/////
+
+/mob/living/simple_animal/pokemon/
+	name = ""
+	icon_state = ""
+	icon_living = ""
+	icon_dead = ""
+*/
+
+/mob/living/simple_animal/pokemon/leg
+	icon = 'icons/mob/legendary.dmi'
+	pixel_x = -32
+	butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 12)
+	health = 200
+	maxHealth = 200
+
+
+/mob/living/simple_animal/pokemon/leg/articuno
+	name = "Articuno"
+	icon_state = "articuno"
+	icon_living = "articuno"
+	icon_dead = "articuno_d"
+	flying = 1
+
+/mob/living/simple_animal/pokemon/leg/rayquaza
+	name = "Rayquaza"
+	icon_state = "rayquaza"
+	icon_living = "rayquaza"
+	icon_dead = "rayquaza_d"
+	flying = 1
+
+//ALPHABETICAL PLEASE
+
+/mob/living/simple_animal/pokemon/absol
+	name = "absol"
+	icon_state = "absol"
+	icon_living = "absol"
+	icon_dead = "absol_d"
+	speak = list("Absol!", "Ab-Absol!")
+
+/mob/living/simple_animal/pokemon/aggron
+	name = "aggron"
+	icon_state = "aggron"
+	icon_living = "aggron"
+	icon_dead = "aggron_d"
+
+/mob/living/simple_animal/pokemon/ampharos
+	name = "ampharos"
+	icon_state = "ampharos"
+	icon_living = "ampharos"
+	icon_dead = "ampharos_d"
+
+/mob/living/simple_animal/pokemon/charmander
+	name = "charmander"
+	icon_state = "charmander"
+	icon_living = "charmander"
+	icon_dead = "charmander_d"
+
+/mob/living/simple_animal/pokemon/ditto
+	name = "ditto"
+	icon_state = "ditto"
+	icon_living = "ditto"
+	icon_dead = "ditto_d"
+
+/mob/living/simple_animal/pokemon/dratini/dragonair
+	name = "dragonair"
+	desc = "A Dragonair stores an enormous amount of energy inside its body. It is said to alter the weather around it by loosing energy from the crystals on its neck and tail."
+	icon_state = "dragonair"
+	icon_living = "dragonair"
+	icon_dead = "dragonair_d"
+
+/mob/living/simple_animal/pokemon/dratini/dragonair/dragonite
+	name = "dragonite"
+	desc = "It can circle the globe in just 16 hours. It is a kindhearted Pokémon that leads lost and foundering ships in a storm to the safety of land."
+	icon_state = "dragonite"
+	icon_living = "dragonite"
+	icon_dead = "dragonite_d"
+
+/mob/living/simple_animal/pokemon/dratini
+	name = "dratini"
+	desc = "A Dratini continually molts and sloughs off its old skin. It does so because the life energy within its body steadily builds to reach uncontrollable levels."
+	icon_state = "dratini"
+	icon_living = "dratini"
+	icon_dead = "dratini_d"
+
+/mob/living/simple_animal/pokemon/eevee
+	name = "eevee"
+	desc = "Eevee has an unstable genetic makeup that suddenly mutates due to its environment. Radiation from various stones causes this Pokémon to evolve."
+	icon_state = "eevee"
+	icon_living = "eevee"
+	icon_dead = "eevee_d"
+	speak = list("Eevee!", "Ee-Eevee!")
+	response_help  = "pets"
+	response_harm   = "hits"
+
+/mob/living/simple_animal/pokemon/eevee/espeon
+	name = "espeon"
+	desc = "Espeon is extremely loyal to any trainer it considers to be worthy. It is said to have developed precognitive powers to protect its trainer from harm."
+	icon_state = "espeon"
+	icon_living = "espeon"
+	icon_dead = "espeon_d"
+
+/mob/living/simple_animal/pokemon/flaaffy
+	name = "flaaffy"
+	icon_state = "flaaffy"
+	icon_living = "flaaffy"
+	icon_dead = "flaaffy_d"
+
+/mob/living/simple_animal/pokemon/eevee/flareon
+	name = "flareon"
+	desc = "Flareon's fluffy fur releases heat into the air so that its body does not get excessively hot. Its body temperature can rise to a maximum of 1,650 degrees F."
+	icon_state = "flareon"
+	icon_living = "flareon"
+	icon_dead = "flareon_d"
+	speak = list("Flare!", "Flareon!")
+
+/mob/living/simple_animal/pokemon/eevee/glaceon
+	name = "glaceon"
+	desc = "By controlling its body heat, it can freeze the atmosphere around it to make a diamond-dust flurry."
+	icon_state = "glaceon"
+	icon_living = "glaceon"
+	icon_dead = "glaceon_d"
+	speak = list("Glace!", "Glaceon!")
+
+/mob/living/simple_animal/pokemon/eevee/jolteon
+	name = "jolteon"
+	desc = "Its cells generate weak power that is amplified by its fur's static electricity to drop thunderbolts. The bristling fur is made of electrically charged needles."
+	icon_state = "jolteon"
+	icon_living = "jolteon"
+	icon_dead = "jolteon_d"
+	speak = list("Jolt!", "Jolteon!")
+
+/mob/living/simple_animal/pokemon/larvitar
+	name = "larvitar"
+	desc = "It is born deep underground. It can't emerge until it has entirely consumed the soil around it."
+	icon_state = "larvitar"
+	icon_living = "larvitar"
+	icon_dead = "larvitar_d"
+
+/mob/living/simple_animal/pokemon/mareep
+	name = "mareep"
+	icon_state = "mareep"
+	icon_living = "mareep"
+	icon_dead = "mareep_d"
+
+/mob/living/simple_animal/pokemon/poochyena/mightyena
+	name = "mightyena"
+	icon_state = "mightyena"
+	icon_living = "mightyena"
+	icon_dead = "mightyena"
+
+/mob/living/simple_animal/pokemon/miltank
+	name = "miltank"
+	icon_state = "miltank"
+	icon_living = "miltank"
+	icon_dead = "miltank_d"
+
+/mob/living/simple_animal/pokemon/poochyena
+	name = "poochyena"
+	icon_state = "poochyena"
+	icon_living = "poochyena"
+	icon_dead = "poochyena_d"
+
+/mob/living/simple_animal/pokemon/eevee/sylveon
+	name = "Sylveon"
+	desc = "Sylveon, the Intertwining Pokémon. Sylveon affectionately wraps its ribbon-like feelers around its Trainer's arm as they walk together."
+	icon_state = "sylveon"
+	icon_living = "sylveon"
+	icon_dead = "sylveon_d"
+	speak = list("Sylveon!", "Syl!")
+	response_help  = "pets"
+	response_harm   = "hits"
+
+/mob/living/simple_animal/pokemon/eevee/umbreon
+	name = "umbreon"
+	icon_state = "umbreon"
+	icon_dead = "umbreon_d"
+	icon_living = "umbreon"
+
+/mob/living/simple_animal/pokemon/vulpix
+	name = "vulpix"
+	icon_state = "vulpix"
+	icon_living = "vulpix"
+	icon_dead = "vulpix_d"

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

@@ -0,0 +1,117 @@
+//////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 = '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 = 'icons/obj/guns/cit_guns.dmi'
+	icon_state = "flechettegun"
+	item_state = "gun"
+	w_class = WEIGHT_CLASS_NORMAL
+	slot_flags = 0
+	/obj/item/device/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/handguns.dm

@@ -0,0 +1,424 @@
+////////////Anti Tank Pistol////////////
+
+/obj/item/gun/ballistic/automatic/pistol/antitank
+	name = "Anti Tank Pistol"
+	desc = "A massively impractical and silly monstrosity of a pistol that fires .50 calliber rounds. The recoil is likely to dislocate your wrist."
+	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon_state = "atp"
+	item_state = "pistol"
+	recoil = 4
+	mag_type = /obj/item/ammo_box/magazine/sniper_rounds
+	fire_delay = 50
+	burst_size = 1
+	can_suppress = 0
+	w_class = WEIGHT_CLASS_NORMAL
+	actions_types = list()
+	fire_sound = 'sound/weapons/blastcannon.ogg'
+	spread = 20		//damn thing has no rifling.
+
+/obj/item/gun/ballistic/automatic/pistol/antitank/update_icon()
+	..()
+	if(magazine)
+		cut_overlays()
+		add_overlay("atp-mag")
+	else
+		cut_overlays()
+	icon_state = "[initial(icon_state)][chambered ? "" : "-e"]"
+
+/obj/item/gun/ballistic/automatic/pistol/antitank/syndicate
+	name = "Syndicate Anti Tank Pistol"
+	desc = "A massively impractical and silly monstrosity of a pistol that fires .50 calliber rounds. The recoil is likely to dislocate a variety of joints without proper bracing."
+	pin = /obj/item/device/firing_pin/implant/pindicate
+
+/*		made redundant by reskinnable stetchkins
+//////Stealth Pistol//////
+
+/obj/item/gun/ballistic/automatic/pistol/stealth
+	name = "stealth pistol"
+	desc = "A unique bullpup pistol with a compact frame. Has an integrated surpressor."
+	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon_state = "stealthpistol"
+	w_class = WEIGHT_CLASS_SMALL
+	mag_type = /obj/item/ammo_box/magazine/m10mm
+	can_suppress = 0
+	fire_sound = 'sound/weapons/gunshot_silenced.ogg'
+	suppressed = 1
+	burst_size = 1
+
+/obj/item/gun/ballistic/automatic/pistol/stealth/update_icon()
+	..()
+	if(magazine)
+		cut_overlays()
+		add_overlay("stealthpistol-magazine")
+	else
+		cut_overlays()
+	icon_state = "[initial(icon_state)][chambered ? "" : "-e"]"
+
+*/
+
+///foam stealth pistol///
+
+/obj/item/gun/ballistic/automatic/toy/pistol/stealth
+	name = "foam force stealth pistol"
+	desc = "A small, easily concealable toy bullpup handgun. Ages 8 and up."
+	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon_state = "foamsp"
+	w_class = WEIGHT_CLASS_SMALL
+	mag_type = /obj/item/ammo_box/magazine/toy/pistol
+	can_suppress = FALSE
+	fire_sound = 'sound/weapons/gunshot_silenced.ogg'
+	suppressed = TRUE
+	burst_size = 1
+	fire_delay = 0
+	spread = 20
+	actions_types = list()
+
+/obj/item/gun/ballistic/automatic/toy/pistol/stealth/update_icon()
+	..()
+	if(magazine)
+		cut_overlays()
+		add_overlay("foamsp-magazine")
+	else
+		cut_overlays()
+	icon_state = "[initial(icon_state)][chambered ? "" : "-e"]"
+
+//////10mm soporific bullets//////
+
+obj/item/projectile/bullet/c10mm/soporific
+	name ="10mm soporific bullet"
+	armour_penetration = 0
+	nodamage = TRUE
+	dismemberment = 0
+	knockdown = 0
+
+/obj/item/projectile/bullet/c10mm/soporific/on_hit(atom/target, blocked = FALSE)
+	if((blocked != 100) && isliving(target))
+		var/mob/living/L = target
+		L.blur_eyes(6)
+		if(L.getStaminaLoss() >= 60)
+			L.Sleeping(300)
+		else
+			L.adjustStaminaLoss(25)
+	return 1
+
+/obj/item/ammo_casing/c10mm/soporific
+	name = ".10mm soporific bullet casing"
+	desc = "A 10mm soporific bullet casing."
+	projectile_type = /obj/item/projectile/bullet/c10mm/soporific
+
+/obj/item/ammo_box/magazine/m10mm/soporific
+	name = "pistol magazine (10mm soporific)"
+	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon_state = "9x19pS"
+	desc = "A gun magazine. Loaded with rounds which inject the target with a variety of illegal substances to induce sleep in the target."
+	ammo_type = /obj/item/ammo_casing/c10mm/soporific
+
+/obj/item/ammo_box/c10mm/soporific
+	name = "ammo box (10mm soporific)"
+	ammo_type = /obj/item/ammo_casing/c10mm/soporific
+	max_ammo = 24
+
+//////modular pistol////// (reskinnable stetchkins)
+
+/obj/item/gun/ballistic/automatic/pistol/modular
+	name = "modular pistol"
+	desc = "A small, easily concealable 10mm handgun. Has a threaded barrel for suppressors."
+	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon_state = "cde"
+	can_unsuppress = TRUE
+	obj_flags = UNIQUE_RENAME
+	unique_reskin = list("Default" = "cde",
+						"NT-99" = "n99",
+						"Stealth" = "stealthpistol",
+						"HKVP-78" = "vp78",
+						"Luger" = "p08b",
+						"Mk.58" = "secguncomp",
+						"PX4 Storm" = "px4"
+						)
+
+/obj/item/gun/ballistic/automatic/pistol/modular/update_icon()
+	..()
+	if(current_skin)
+		icon_state = "[unique_reskin[current_skin]][chambered ? "" : "-e"][suppressed ? "-suppressed" : ""]"
+	else
+		icon_state = "[initial(icon_state)][chambered ? "" : "-e"][suppressed ? "-suppressed" : ""]"
+	if(magazine && suppressed)
+		cut_overlays()
+		add_overlay("[unique_reskin[current_skin]]-magazine-sup")	//Yes, this means the default iconstate can't have a magazine overlay
+	else if (magazine)
+		cut_overlays()
+		add_overlay("[unique_reskin[current_skin]]-magazine")
+	else
+		cut_overlays()
+
+/////////RAYGUN MEMES/////////
+
+/obj/item/projectile/beam/lasertag/ray		//the projectile, compatible with regular laser tag armor
+	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon_state = "ray"
+	name = "ray bolt"
+	eyeblur = 0
+
+/obj/item/ammo_casing/energy/laser/raytag
+	projectile_type = /obj/item/projectile/beam/lasertag/ray
+	select_name = "raytag"
+	fire_sound = 'sound/weapons/raygun.ogg'
+
+/obj/item/gun/energy/laser/practice/raygun
+	name = "toy ray gun"
+	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon_state = "raygun"
+	desc = "A toy laser with a classic, retro feel and look. Compatible with existing laser tag systems."
+	ammo_type = list(/obj/item/ammo_casing/energy/laser/raytag)
+	selfcharge = TRUE
+
+/*/////////////////////////////////////////////////////////////////////////////////////////////
+							The Recolourable Gun
+*//////////////////////////////////////////////////////////////////////////////////////////////
+
+/obj/item/gun/ballistic/automatic/pistol/p37
+	name = "\improper CX Mk.37P"
+	desc = "A modern reimagining of an old legendary gun, the Mk.37 is a handgun with a toggle-locking mechanism manufactured by CX Armories. \
+			This model is coated with a special polychromic material. \
+			Has a small warning on the receiver that boldly states 'WARNING: WILL DETONATE UPON UNAUTHORIZED USE'. \
+			Uses 9mm bullets loaded into proprietary magazines."
+	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon_state = "p37"
+	w_class = WEIGHT_CLASS_NORMAL
+	spawnwithmagazine = FALSE
+	mag_type = /obj/item/ammo_box/magazine/m9mm/p37
+	can_suppress = FALSE
+	pin = /obj/item/device/firing_pin/dna/dredd		//goes boom if whoever isn't DNA locked to it tries to use it
+	actions_types = list(/datum/action/item_action/pick_color)
+
+	var/frame_color = "#808080" //RGB
+	var/receiver_color = "#808080"
+	var/body_color = "#0098FF"
+	var/barrel_color = "#808080"
+	var/tip_color = "#808080"
+	var/arm_color = "#808080"
+	var/grip_color = "#00FFCB"	//Does not actually colour the grip, just the lights surrounding it
+	var/energy_color = "#00FFCB"
+
+///Defining all the colourable bits and displaying them///
+
+/obj/item/gun/ballistic/automatic/pistol/p37/update_icon()
+	var/mutable_appearance/frame_overlay = mutable_appearance('icons/obj/guns/cit_guns.dmi', "p37_frame")
+	var/mutable_appearance/receiver_overlay = mutable_appearance('icons/obj/guns/cit_guns.dmi', "p37_receiver")
+	var/mutable_appearance/body_overlay = mutable_appearance('icons/obj/guns/cit_guns.dmi', "p37_body")
+	var/mutable_appearance/barrel_overlay = mutable_appearance('icons/obj/guns/cit_guns.dmi', "p37_barrel")
+	var/mutable_appearance/tip_overlay = mutable_appearance('icons/obj/guns/cit_guns.dmi', "p37_tip")
+	var/mutable_appearance/grip_overlay = mutable_appearance('icons/obj/guns/cit_guns.dmi', "p37_grip")
+	var/mutable_appearance/energy_overlay = mutable_appearance('icons/obj/guns/cit_guns.dmi', "p37_light")
+	var/mutable_appearance/arm_overlay = mutable_appearance('icons/obj/guns/cit_guns.dmi', "p37_arm")
+	var/mutable_appearance/arm_overlay_e = mutable_appearance('icons/obj/guns/cit_guns.dmi', "p37_arm-e")
+
+	if(frame_color)
+		frame_overlay.color = frame_color
+	if(receiver_color)
+		receiver_overlay.color = receiver_color
+	if(body_color)
+		body_overlay.color = body_color
+	if(barrel_color)
+		barrel_overlay.color = barrel_color
+	if(tip_color)
+		tip_overlay.color = tip_color
+	if(grip_color)
+		grip_overlay.color = grip_color
+	if(energy_color)
+		energy_overlay.color = energy_color
+	if(arm_color)
+		arm_overlay.color = arm_color
+	if(arm_color)
+		arm_overlay_e.color = arm_color
+
+	cut_overlays()		//So that it doesn't keep stacking overlays non-stop on top of each other
+
+	add_overlay(frame_overlay)
+	add_overlay(receiver_overlay)
+	add_overlay(body_overlay)
+	add_overlay(barrel_overlay)
+	add_overlay(tip_overlay)
+	add_overlay(grip_overlay)
+	add_overlay(energy_overlay)
+
+	if(magazine)	//does not need a cut_overlays proc call here because it's already called further up
+		add_overlay("p37_mag")
+
+	if(chambered)
+		cut_overlay(arm_overlay_e)
+		add_overlay(arm_overlay)
+	else
+		cut_overlay(arm_overlay)
+		add_overlay(arm_overlay_e)
+
+///letting you actually recolor things///
+
+/obj/item/gun/ballistic/automatic/pistol/p37/ui_action_click(mob/user, var/datum/action/A)
+	if(istype(A, /datum/action/item_action/pick_color))
+
+		var/choice = input(user,"Mk.37P polychrome options", "Gun Recolor") in list("Frame Color","Receiver Color","Body Color",
+																"Barrel Color", "Barrel Tip Color", "Grip Light Color",
+																"Light Color", "Arm Color", "*CANCEL*")
+
+		switch(choice)
+
+			if("Frame Color")
+				var/frame_color_input = input(usr,"","Choose Frame Color",frame_color) as color|null
+				if(frame_color_input)
+					frame_color = sanitize_hexcolor(frame_color_input, desired_format=6, include_crunch=1)
+				update_icon()
+
+			if("Receiver Color")
+				var/receiver_color_input = input(usr,"","Choose Receiver Color",receiver_color) as color|null
+				if(receiver_color_input)
+					receiver_color = sanitize_hexcolor(receiver_color_input, desired_format=6, include_crunch=1)
+				update_icon()
+
+			if("Body Color")
+				var/body_color_input = input(usr,"","Choose Body Color",body_color) as color|null
+				if(body_color_input)
+					body_color = sanitize_hexcolor(body_color_input, desired_format=6, include_crunch=1)
+				update_icon()
+
+			if("Barrel Color")
+				var/barrel_color_input = input(usr,"","Choose Barrel Color",barrel_color) as color|null
+				if(barrel_color_input)
+					barrel_color = sanitize_hexcolor(barrel_color_input, desired_format=6, include_crunch=1)
+				update_icon()
+
+			if("Barrel Tip Color")
+				var/tip_color_input = input(usr,"","Choose Barrel Tip Color",tip_color) as color|null
+				if(tip_color_input)
+					tip_color = sanitize_hexcolor(tip_color_input, desired_format=6, include_crunch=1)
+				update_icon()
+
+			if("Grip Light Color")
+				var/grip_color_input = input(usr,"","Choose Grip Light Color",grip_color) as color|null
+				if(grip_color_input)
+					grip_color = sanitize_hexcolor(grip_color_input, desired_format=6, include_crunch=1)
+				update_icon()
+
+			if("Light Color")
+				var/energy_color_input = input(usr,"","Choose Light Color",energy_color) as color|null
+				if(energy_color_input)
+					energy_color = sanitize_hexcolor(energy_color_input, desired_format=6, include_crunch=1)
+				update_icon()
+
+			if("Arm Color")
+				var/arm_color_input = input(usr,"","Choose Arm Color",arm_color) as color|null
+				if(arm_color_input)
+					arm_color = sanitize_hexcolor(arm_color_input, desired_format=6, include_crunch=1)
+				update_icon()
+				A.UpdateButtonIcon()
+
+	else
+		..()
+
+///boolets///
+
+/obj/item/projectile/bullet/c9mm/frangible
+	name = "9mm frangible bullet"
+	damage = 15
+	stamina = 0
+	speed = 1.0
+	range = 20
+	armour_penetration = -25
+
+/obj/item/projectile/bullet/c9mm/rubber
+	name = "9mm rubber bullet"
+	damage = 5
+	stamina = 30
+	speed = 1.2
+	range = 14
+	knockdown = 0
+
+/obj/item/ammo_casing/c9mm/frangible
+	name = "9mm frangible bullet casing"
+	desc = "A 9mm frangible bullet casing."
+	projectile_type = /obj/item/projectile/bullet/c9mm/frangible
+
+/obj/item/ammo_casing/c9mm/rubber
+	name = "9mm rubber bullet casing"
+	desc = "A 9mm rubber bullet casing."
+	projectile_type = /obj/item/projectile/bullet/c9mm/rubber
+
+/obj/item/ammo_box/magazine/m9mm/p37
+	name = "\improper P37 magazine (9mm frangible)"
+	desc = "A gun magazine. Loaded with plastic composite rounds which fragment upon impact to minimize collateral damage."
+	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon_state = "11mm"		//topkek
+	ammo_type = /obj/item/ammo_casing/c9mm/frangible
+	caliber = "9mm"
+	max_ammo = 11
+	multiple_sprites = 1
+
+/obj/item/ammo_box/magazine/m9mm/p37/fmj
+	name = "\improper P37 magazine (9mm)"
+	ammo_type = /obj/item/ammo_casing/c9mm
+	desc = "A gun magazine. Loaded with conventional full metal jacket rounds."
+
+/obj/item/ammo_box/magazine/m9mm/p37/rubber
+	name = "\improper P37 magazine (9mm Non-Lethal Rubbershot)"
+	ammo_type = /obj/item/ammo_casing/c9mm/rubber
+	desc = "A gun magazine. Loaded with less-than-lethal rubber bullets."
+
+/obj/item/ammo_box/c9mm/frangible
+	name = "ammo box (9mm frangible)"
+	ammo_type = /obj/item/ammo_casing/c9mm/frangible
+
+/obj/item/ammo_box/c9mm/rubber
+	name = "ammo box (9mm non-lethal rubbershot)"
+	ammo_type = /obj/item/ammo_casing/c9mm/rubber
+
+/datum/design/c9mmfrag
+	name = "Box of 9mm Frangible Bullets"
+	id = "9mm_frag"
+	build_type = AUTOLATHE
+	materials = list(MAT_METAL = 25000)
+	build_path = /obj/item/ammo_box/c9mm/frangible
+	category = list("hacked", "Security")
+
+/datum/design/c9mmrubber
+	name = "Box of 9mm Rubber Bullets"
+	id = "9mm_rubber"
+	build_type = AUTOLATHE
+	materials = list(MAT_METAL = 30000)
+	build_path = /obj/item/ammo_box/c9mm/rubber
+	category = list("initial", "Security")
+
+
+///Security Variant///
+
+/obj/item/gun/ballistic/automatic/pistol/p37/sec
+	name = "\improper CX Mk.37S"
+	desc = "A modern reimagining of an old legendary gun, the Mk.37 is a handgun with a toggle-locking mechanism manufactured by CX Armories. Uses 9mm bullets loaded into proprietary magazines."
+	spawnwithmagazine = FALSE
+	pin = /obj/item/device/firing_pin/implant/mindshield
+	actions_types = list()	//so you can't recolor it
+
+	frame_color = "#808080" //RGB
+	receiver_color = "#808080"
+	body_color = "#282828"
+	barrel_color = "#808080"
+	tip_color = "#808080"
+	arm_color = "#800000"
+	grip_color = "#FFFF00"	//Does not actually colour the grip, just the lights surrounding it
+	energy_color = "#FFFF00"
+
+///Foam Variant because WE NEED MEMES///
+
+/obj/item/gun/ballistic/automatic/pistol/p37/foam
+	name = "\improper Foam Force Mk.37F"
+	desc = "A licensed foam-firing reproduction of a handgun with a toggle-locking mechanism manufactured by CX Armories. This model is coated with a special polychromic material. Uses standard foam pistol magazines."
+	icon_state = "p37_foam"
+	pin = /obj/item/device/firing_pin
+	spawnwithmagazine = TRUE
+	obj_flags = 0
+	casing_ejector = FALSE
+	mag_type = /obj/item/ammo_box/magazine/toy/pistol
+	can_suppress = FALSE
+	actions_types = list(/datum/action/item_action/pick_color)
+
+/obj/item/ammo_box/magazine/toy/pistol	//forcing this might be a bad idea, but it'll fix the foam gun infinite material exploit
+	materials = list(MAT_METAL = 200)

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

@@ -0,0 +1,466 @@
+///////XCOM X9 AR///////
+
+/obj/item/gun/ballistic/automatic/x9	//will be adminspawn only so ERT or something can use them
+	name = "\improper X9 Assault Rifle"
+	desc = "A rather old design of a cheap, reliable assault rifle made for combat against unknown enemies. Uses 5.56mm ammo."
+	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon_state = "x9"
+	item_state = "arg"
+	slot_flags = 0
+	mag_type = /obj/item/ammo_box/magazine/m556	//Uses the m90gl's magazine, just like the NT-ARG
+	fire_sound = 'sound/weapons/gunshot_smg.ogg'
+	can_suppress = 0
+	burst_size = 6	//in line with XCOMEU stats. This can fire 5 bursts from a full magazine.
+	fire_delay = 1
+	spread = 30	//should be 40 for XCOM memes, but since its adminspawn only, might as well make it useable
+	recoil = 1
+
+///toy memes///
+
+/obj/item/ammo_box/magazine/toy/x9
+	name = "foam force X9 magazine"
+	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon_state = "toy9magazine"
+	max_ammo = 30
+	multiple_sprites = 2
+	materials = list(MAT_METAL = 200)
+
+/obj/item/gun/ballistic/automatic/x9/toy
+	name = "\improper Foam Force X9"
+	desc = "An old but reliable assault rifle made for combat against unknown enemies. Appears to be hastily converted. Ages 8 and up."
+	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon_state = "toy9"
+	can_suppress = 0
+	obj_flags = 0
+	mag_type = /obj/item/ammo_box/magazine/toy/x9
+	casing_ejector = 0
+	spread = 90		//MAXIMUM XCOM MEMES (actually that'd be 180 spread)
+	w_class = WEIGHT_CLASS_BULKY
+	weapon_weight = WEAPON_HEAVY
+
+////////XCOM2 Magpistol/////////
+
+//////projectiles//////
+
+/obj/item/projectile/bullet/mags
+	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon_state = "magjectile"
+	damage = 15
+	armour_penetration = 10
+	light_range = 2
+	speed = 0.6
+	range = 25
+	light_color = LIGHT_COLOR_RED
+
+/obj/item/projectile/bullet/nlmags //non-lethal boolets
+	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon_state = "magjectile-nl"
+	damage = 0
+	knockdown = 0
+	stamina = 25
+	armour_penetration = -10
+	light_range = 2
+	speed = 0.7
+	range = 25
+	light_color = LIGHT_COLOR_BLUE
+
+
+/////actual ammo/////
+
+/obj/item/ammo_casing/caseless/amags
+	desc = "A ferromagnetic slug intended to be launched out of a compatible weapon."
+	caliber = "mags"
+	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon_state = "mag-casing-live"
+	projectile_type = /obj/item/projectile/bullet/mags
+
+/obj/item/ammo_casing/caseless/anlmags
+	desc = "A specialized ferromagnetic slug designed with a less-than-lethal payload."
+	caliber = "mags"
+	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon_state = "mag-casing-live"
+	projectile_type = /obj/item/projectile/bullet/nlmags
+
+//////magazines/////
+
+/obj/item/ammo_box/magazine/mmag/small
+	name = "magpistol magazine (non-lethal disabler)"
+	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon_state = "nlmagmag"
+	ammo_type = /obj/item/ammo_casing/caseless/anlmags
+	caliber = "mags"
+	max_ammo = 15
+	multiple_sprites = 2
+
+/obj/item/ammo_box/magazine/mmag/small/lethal
+	name = "magpistol magazine (lethal)"
+	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon_state = "smallmagmag"
+	ammo_type = /obj/item/ammo_casing/caseless/amags
+
+//////the gun itself//////
+
+/obj/item/gun/ballistic/automatic/pistol/mag
+	name = "magpistol"
+	desc = "A handgun utilizing maglev technologies to propel a ferromagnetic slug to extreme velocities."
+	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon_state = "magpistol"
+	force = 10
+	fire_sound = 'sound/weapons/magpistol.ogg'
+	mag_type = /obj/item/ammo_box/magazine/mmag/small
+	can_suppress = 0
+	casing_ejector = 0
+	fire_delay = 2
+	recoil = 0.2
+
+/obj/item/gun/ballistic/automatic/pistol/mag/update_icon()
+	..()
+	if(magazine)
+		cut_overlays()
+		add_overlay("magpistol-magazine")
+	else
+		cut_overlays()
+	icon_state = "[initial(icon_state)][chambered ? "" : "-e"]"
+
+///research memes///
+
+/obj/item/gun/ballistic/automatic/pistol/mag/nopin
+	pin = null
+	spawnwithmagazine = FALSE
+
+/datum/design/magpistol
+	name = "Magpistol"
+	desc = "A weapon which fires ferromagnetic slugs."
+	id = "magpisol"
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = 7500, MAT_GLASS = 1000, MAT_URANIUM = 1000, MAT_TITANIUM = 5000, MAT_SILVER = 2000)
+	build_path = /obj/item/gun/ballistic/automatic/pistol/mag/nopin
+	category = list("Weapons")
+	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
+
+/datum/design/mag_magpistol
+	name = "Magpistol Magazine"
+	desc = "A 14 round magazine for the Magpistol."
+	id = "mag_magpistol"
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = 4000, MAT_SILVER = 500)
+	build_path = /obj/item/ammo_box/magazine/mmag/small/lethal
+	category = list("Ammo")
+	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
+
+/datum/design/mag_magpistol/nl
+	name = "Magpistol Magazine (Non-Lethal)"
+	desc = "A 14 round non-lethal magazine for the Magpistol."
+	id = "mag_magpistol_nl"
+	materials = list(MAT_METAL = 3000, MAT_SILVER = 250, MAT_TITANIUM = 250)
+	build_path = /obj/item/ammo_box/magazine/mmag/small
+	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
+
+//////toy memes/////
+
+/obj/item/projectile/bullet/reusable/foam_dart/mag
+	name = "magfoam dart"
+	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon_state = "magjectile-toy"
+	ammo_type = /obj/item/ammo_casing/caseless/foam_dart/mag
+	light_range = 2
+	light_color = LIGHT_COLOR_YELLOW
+
+/obj/item/ammo_casing/caseless/foam_dart/mag
+	name = "magfoam dart"
+	desc = "A foam dart with fun light-up projectiles powered by magnets!"
+	projectile_type = /obj/item/projectile/bullet/reusable/foam_dart/mag
+
+/obj/item/ammo_box/magazine/internal/shot/toy/mag
+	ammo_type = /obj/item/ammo_casing/caseless/foam_dart/mag
+	max_ammo = 14
+
+/obj/item/gun/ballistic/shotgun/toy/mag
+	name = "foam force magpistol"
+	desc = "A fancy toy sold alongside light-up foam force darts. Ages 8 and up."
+	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon_state = "toymag"
+	item_state = "gun"
+	mag_type = /obj/item/ammo_box/magazine/internal/shot/toy/mag
+	fire_sound = 'sound/weapons/magpistol.ogg'
+	slot_flags = SLOT_BELT
+	w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/ammo_box/foambox/mag
+	name = "ammo box (Magnetic Foam Darts)"
+	icon = 'icons/obj/guns/toy.dmi'
+	icon_state = "foambox"
+	ammo_type = /obj/item/ammo_casing/caseless/foam_dart/mag
+	max_ammo = 42
+
+//////Magrifle//////
+
+///projectiles///
+
+/obj/item/projectile/bullet/magrifle
+	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon_state = "magjectile-large"
+	damage = 20
+	armour_penetration = 25
+	light_range = 3
+	speed = 0.7
+	range = 35
+	light_color = LIGHT_COLOR_RED
+
+/obj/item/projectile/bullet/nlmagrifle //non-lethal boolets
+	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon_state = "magjectile-large-nl"
+	damage = 0
+	knockdown = 0
+	stamina = 25
+	armour_penetration = -10
+	light_range = 3
+	speed = 0.65
+	range = 35
+	light_color = LIGHT_COLOR_BLUE
+
+///ammo casings///
+
+/obj/item/ammo_casing/caseless/amagm
+	desc = "A large ferromagnetic slug intended to be launched out of a compatible weapon."
+	caliber = "magm"
+	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon_state = "mag-casing-live"
+	projectile_type = /obj/item/projectile/bullet/magrifle
+
+/obj/item/ammo_casing/caseless/anlmagm
+	desc = "A large, specialized ferromagnetic slug designed with a less-than-lethal payload."
+	caliber = "magm"
+	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon_state = "mag-casing-live"
+	projectile_type = /obj/item/projectile/bullet/nlmagrifle
+
+///magazines///
+
+/obj/item/ammo_box/magazine/mmag/
+	name = "magrifle magazine (non-lethal disabler)"
+	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon_state = "mediummagmag"
+	ammo_type = /obj/item/ammo_casing/caseless/anlmagm
+	caliber = "magm"
+	max_ammo = 24
+	multiple_sprites = 2
+
+/obj/item/ammo_box/magazine/mmag/lethal
+	name = "magrifle magazine (lethal)"
+	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon_state = "mediummagmag"
+	ammo_type = /obj/item/ammo_casing/caseless/amagm
+	max_ammo = 24
+
+///the gun itself///
+
+/obj/item/gun/ballistic/automatic/magrifle
+	name = "\improper Magnetic Rifle"
+	desc = "A simple upscalling of the technologies used in the magpistol, the magrifle is capable of firing slightly larger slugs in bursts. Compatible with the magpistol's slugs."
+	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon_state = "magrifle"
+	item_state = "arg"
+	slot_flags = 0
+	mag_type = /obj/item/ammo_box/magazine/mmag
+	fire_sound = 'sound/weapons/magrifle.ogg'
+	can_suppress = 0
+	burst_size = 3
+	fire_delay = 2
+	spread = 5
+	recoil = 0.15
+	casing_ejector = 0
+
+///research///
+
+/obj/item/gun/ballistic/automatic/magrifle/nopin
+	pin = null
+	spawnwithmagazine = FALSE
+
+/datum/design/magrifle
+	name = "Magrifle"
+	desc = "An upscaled Magpistol in rifle form."
+	id = "magrifle"
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = 10000, MAT_GLASS = 2000, MAT_URANIUM = 2000, MAT_TITANIUM = 10000, MAT_SILVER = 4000, MAT_GOLD = 2000)
+	build_path = /obj/item/gun/ballistic/automatic/magrifle/nopin
+	category = list("Weapons")
+	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
+
+/datum/design/mag_magrifle
+	name = "Magrifle Magazine (Lethal)"
+	desc = "A 24-round magazine for the Magrifle."
+	id = "mag_magrifle"
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = 8000, MAT_SILVER = 1000)
+	build_path = /obj/item/ammo_box/magazine/mmag/lethal
+	category = list("Ammo")
+	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
+
+/datum/design/mag_magrifle/nl
+	name = "Magrifle Magazine (Non-Lethal)"
+	desc = "A 24- round non-lethal magazine for the Magrifle."
+	id = "mag_magrifle_nl"
+	materials = list(MAT_METAL = 6000, MAT_SILVER = 500, MAT_TITANIUM = 500)
+	build_path = /obj/item/ammo_box/magazine/mmag
+	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
+
+///foamagrifle///
+
+/obj/item/ammo_box/magazine/toy/foamag
+	name = "foam force magrifle magazine"
+	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon_state = "foamagmag"
+	max_ammo = 24
+	multiple_sprites = 2
+	ammo_type = /obj/item/ammo_casing/caseless/foam_dart/mag
+	materials = list(MAT_METAL = 200)
+
+/obj/item/gun/ballistic/automatic/magrifle/toy
+	name = "foamag rifle"
+	desc = "A foam launching magnetic rifle. Ages 8 and up."
+	icon_state = "foamagrifle"
+	obj_flags = 0
+	mag_type = /obj/item/ammo_box/magazine/toy/foamag
+	casing_ejector = FALSE
+	spread = 60
+	w_class = WEIGHT_CLASS_BULKY
+	weapon_weight = WEAPON_HEAVY
+
+/*
+// TECHWEBS IMPLEMENTATION
+*/
+
+/datum/techweb_node/magnetic_weapons
+	id = "magnetic_weapons"
+	display_name = "Magnetic Weapons"
+	description = "Weapons using magnetic technology"
+	prereq_ids = list("weaponry", "adv_weaponry", "emp_adv")
+	design_ids = list("magrifle", "magpisol", "mag_magrifle", "mag_magrifle_nl", "mag_magpistol", "mag_magpistol_nl")
+	research_cost = 2500
+	export_price = 5000
+
+
+//////Hyper-Burst Rifle//////
+
+///projectiles///
+
+/obj/item/projectile/bullet/mags/hyper
+	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon_state = "magjectile"
+	damage = 10
+	armour_penetration = 10
+	stamina = 10
+	forcedodge = TRUE
+	range = 6
+	light_range = 1
+	light_color = LIGHT_COLOR_RED
+
+/obj/item/projectile/bullet/mags/hyper/inferno
+	icon_state = "magjectile-large"
+	stamina = 0
+	forcedodge = FALSE
+	range = 25
+	light_range = 4
+
+/obj/item/projectile/bullet/mags/hyper/inferno/on_hit(atom/target, blocked = FALSE)
+	..()
+	explosion(target, -1, 1, 2, 4, 5)
+	return 1
+
+///ammo casings///
+
+/obj/item/ammo_casing/caseless/ahyper
+	desc = "A large block of speciallized ferromagnetic material designed to be fired out of the experimental Hyper-Burst Rifle."
+	caliber = "hypermag"
+	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon_state = "hyper-casing-live"
+	projectile_type = /obj/item/projectile/bullet/mags/hyper
+	pellets = 12
+	variance = 40
+
+/obj/item/ammo_casing/caseless/ahyper/inferno
+	projectile_type = /obj/item/projectile/bullet/mags/hyper/inferno
+	pellets = 1
+	variance = 0
+
+///magazines///
+
+/obj/item/ammo_box/magazine/mhyper
+	name = "hyper-burst rifle magazine"
+	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon_state = "hypermag-4"
+	ammo_type = /obj/item/ammo_casing/caseless/ahyper
+	caliber = "hypermag"
+	desc = "A magazine for the Hyper-Burst Rifle. Loaded with a special slug that fragments into 12 smaller shards which can absolutely puncture anything, but has rather short effective range."
+	max_ammo = 4
+
+/obj/item/ammo_box/magazine/mhyper/update_icon()
+	..()
+	icon_state = "hypermag-[ammo_count() ? "4" : "0"]"
+
+/obj/item/ammo_box/magazine/mhyper/inferno
+	name = "hyper-burst rifle magazine (inferno)"
+	ammo_type = /obj/item/ammo_casing/caseless/ahyper/inferno
+	desc = "A magazine for the Hyper-Burst Rifle. Loaded with a special slug that violently reacts with whatever surface it strikes, generating a massive amount of heat and light."
+
+///gun itself///
+
+/obj/item/gun/ballistic/automatic/hyperburst
+	name = "\improper Hyper-Burst Rifle"
+	desc = "An extremely beefed up version of a stolen Nanotrasen weapon prototype, this 'rifle' is more like a cannon, with an extremely large bore barrel capable of generating several smaller magnetic 'barrels' to simultaneously launch multiple projectiles at once."
+	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon_state = "hyperburst"
+	item_state = "arg"
+	slot_flags = 0
+	mag_type = /obj/item/ammo_box/magazine/mhyper
+	fire_sound = 'sound/weapons/magburst.ogg'
+	can_suppress = 0
+	burst_size = 1
+	fire_delay = 40
+	recoil = 2
+	casing_ejector = 0
+	weapon_weight = WEAPON_HEAVY
+
+/obj/item/gun/ballistic/automatic/hyperburst/update_icon()
+	..()
+	icon_state = "hyperburst[magazine ? "-[get_ammo()]" : ""][chambered ? "" : "-e"]"
+
+///toy memes///
+
+/obj/item/projectile/beam/lasertag/mag		//the projectile, compatible with regular laser tag armor
+	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon_state = "magjectile-toy"
+	name = "lasertag magbolt"
+	forcedodge = TRUE		//for penetration memes
+	range = 5		//so it isn't super annoying
+	light_range = 2
+	light_color = LIGHT_COLOR_YELLOW
+	eyeblur = 0
+
+/obj/item/ammo_casing/energy/laser/magtag
+	projectile_type = /obj/item/projectile/beam/lasertag/mag
+	select_name = "magtag"
+	pellets = 3
+	variance = 30
+	e_cost = 1000
+	fire_sound = 'sound/weapons/magburst.ogg'
+
+/obj/item/gun/energy/laser/practice/hyperburst
+	name = "toy hyper-burst launcher"
+	desc = "A toy laser with a unique beam shaping lens that projects harmless bolts capable of going through objects. Compatible with existing laser tag systems."
+	ammo_type = list(/obj/item/ammo_casing/energy/laser/magtag)
+	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon_state = "toyburst"
+	clumsy_check = FALSE
+	obj_flags = 0
+	fire_delay = 40
+	weapon_weight = WEAPON_HEAVY
+	selfcharge = TRUE
+	charge_delay = 2
+	recoil = 2
+	cell_type = /obj/item/stock_parts/cell/toymagburst
+
+/obj/item/stock_parts/cell/toymagburst
+	name = "toy mag burst rifle power supply"
+	maxcharge = 4000

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

@@ -0,0 +1,234 @@
+
+///////XCOM X9 AR///////
+
+/obj/item/gun/ballistic/automatic/x9	//will be adminspawn only so ERT or something can use them
+	name = "\improper X9 Assault Rifle"
+	desc = "A rather old design of a cheap, reliable assault rifle made for combat against unknown enemies. Uses 5.56mm ammo."
+	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon_state = "x9"
+	item_state = "arg"
+	slot_flags = 0
+	mag_type = /obj/item/ammo_box/magazine/m556	//Uses the m90gl's magazine, just like the NT-ARG
+	fire_sound = 'sound/weapons/gunshot_smg.ogg'
+	can_suppress = 0
+	burst_size = 6	//in line with XCOMEU stats. This can fire 5 bursts from a full magazine.
+	fire_delay = 1
+	spread = 30	//should be 40 for XCOM memes, but since its adminspawn only, might as well make it useable
+	recoil = 1
+
+///toy memes///
+
+/obj/item/ammo_box/magazine/toy/x9
+	name = "foam force X9 magazine"
+	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon_state = "toy9magazine"
+	max_ammo = 30
+	multiple_sprites = 2
+	materials = list(MAT_METAL = 200)
+
+/obj/item/gun/ballistic/automatic/x9/toy
+	name = "\improper Foam Force X9"
+	desc = "An old but reliable assault rifle made for combat against unknown enemies. Appears to be hastily converted. Ages 8 and up."
+	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon_state = "toy9"
+	can_suppress = 0
+	obj_flags = 0
+	mag_type = /obj/item/ammo_box/magazine/toy/x9
+	casing_ejector = 0
+	spread = 90		//MAXIMUM XCOM MEMES (actually that'd be 180 spread)
+	w_class = WEIGHT_CLASS_BULKY
+	weapon_weight = WEAPON_HEAVY
+
+
+//////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 = '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 = 'icons/obj/guns/cit_guns.dmi'
+	icon_state = "flechettegun"
+	item_state = "gun"
+	w_class = WEIGHT_CLASS_NORMAL
+	slot_flags = 0
+	/obj/item/device/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"]"
+
+/*/////////////////////////////////////////////////////////////
+//////////////////////// Zero's Meme //////////////////////////
+*//////////////////////////////////////////////////////////////
+/obj/item/ammo_box/magazine/toy/AM4B
+	name = "foam force AM4-B magazine"
+	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon_state = "AM4MAG-60"
+	max_ammo = 60
+	multiple_sprites = 0
+	materials = list(MAT_METAL = 200)
+
+/obj/item/gun/ballistic/automatic/AM4B
+	name = "AM4-B"
+	desc = "A Relic from a bygone age. Nobody quite knows why it's here. Has a polychromic coating."
+	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon_state = "AM4"
+	item_state = "arg"
+	mag_type = /obj/item/ammo_box/magazine/toy/AM4B
+	can_suppress = 0
+	item_flags = NEEDS_PERMIT
+	casing_ejector = 0
+	spread = 30		//Assault Rifleeeeeee
+	w_class = WEIGHT_CLASS_NORMAL
+	burst_size = 4	//Shh.
+	fire_delay = 1
+	var/body_color = "#3333aa"
+
+/obj/item/gun/ballistic/automatic/AM4B/update_icon()
+	..()
+	var/mutable_appearance/body_overlay = mutable_appearance('icons/obj/guns/cit_guns.dmi', "AM4-Body")
+	if(body_color)
+		body_overlay.color = body_color
+	cut_overlays()		//So that it doesn't keep stacking overlays non-stop on top of each other
+	add_overlay(body_overlay)
+	if(ismob(loc))
+		var/mob/M = loc
+		M.update_inv_hands()
+/obj/item/gun/ballistic/automatic/AM4B/AltClick(mob/living/user)
+	if(!in_range(src, user))	//Basic checks to prevent abuse
+		return
+	if(user.incapacitated() || !istype(user))
+		to_chat(user, "<span class='warning'>You can't do that right now!</span>")
+		return
+	if(alert("Are you sure you want to recolor your gun?", "Confirm Repaint", "Yes", "No") == "Yes")
+		var/body_color_input = input(usr,"","Choose Shroud Color",body_color) as color|null
+		if(body_color_input)
+			body_color = sanitize_hexcolor(body_color_input, desired_format=6, include_crunch=1)
+		update_icon()
+/obj/item/gun/ballistic/automatic/AM4B/examine(mob/user)
+	..()
+	to_chat(user, "<span class='notice'>Alt-click to recolor it.</span>")
+
+/obj/item/ammo_box/magazine/toy/AM4C
+	name = "foam force AM4-C magazine"
+	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon_state = "AM4MAG-32"
+	max_ammo = 32
+	multiple_sprites = 0
+	materials = list(MAT_METAL = 200)
+
+/obj/item/gun/ballistic/automatic/AM4C
+	name = "AM4-C"
+	desc = "A Relic from a bygone age. This one seems newer, yet less effective."
+	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon_state = "AM4C"
+	item_state = "arg"
+	mag_type = /obj/item/ammo_box/magazine/toy/AM4C
+	can_suppress = 0
+	item_flags = NEEDS_PERMIT
+	casing_ejector = 0
+	spread = 45		//Assault Rifleeeeeee
+	w_class = WEIGHT_CLASS_NORMAL
+	burst_size = 4	//Shh.
+	fire_delay = 1

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

@@ -0,0 +1,90 @@
+/////////////spinfusor stuff////////////////
+
+/obj/item/projectile/bullet/spinfusor
+	name ="spinfusor disk"
+	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon_state= "spinner"
+	damage = 30
+	dismemberment = 25
+
+/obj/item/projectile/bullet/spinfusor/on_hit(atom/target, blocked = FALSE) //explosion to emulate the spinfusor's AOE
+	..()
+	explosion(target, -1, -1, 2, 0, -1)
+	return 1
+
+/obj/item/ammo_casing/caseless/spinfusor
+	name = "spinfusor disk"
+	desc = "A magnetic disk designed specifically for the Stormhammer magnetic cannon. Warning: extremely volatile!"
+	projectile_type = /obj/item/projectile/bullet/spinfusor
+	caliber = "spinfusor"
+	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon_state = "disk"
+	throwforce = 15 //still deadly when thrown
+	throw_speed = 3
+
+/obj/item/ammo_casing/caseless/spinfusor/throw_impact(atom/target) //disks detonate when thrown
+	if(!..()) // not caught in mid-air
+		visible_message("<span class='notice'>[src] detonates!</span>")
+		playsound(src.loc, "sparks", 50, 1)
+		explosion(target, -1, -1, 1, 1, -1)
+		qdel(src)
+		return 1
+
+/obj/item/ammo_box/magazine/internal/spinfusor
+	name = "spinfusor internal magazine"
+	ammo_type = /obj/item/ammo_casing/caseless/spinfusor
+	caliber = "spinfusor"
+	max_ammo = 1
+
+/obj/item/gun/ballistic/automatic/spinfusor
+	name = "Stormhammer Magnetic Cannon"
+	desc = "An innovative weapon utilizing mag-lev technology to spin up a magnetic fusor and launch it at extreme velocities."
+	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon_state = "spinfusor"
+	item_state = "spinfusor"
+	mag_type = /obj/item/ammo_box/magazine/internal/spinfusor
+	fire_sound = 'sound/weapons/rocketlaunch.ogg'
+	w_class = WEIGHT_CLASS_BULKY
+	can_suppress = 0
+	burst_size = 1
+	fire_delay = 40
+	select = 0
+	actions_types = list()
+	casing_ejector = 0
+
+/obj/item/gun/ballistic/automatic/spinfusor/attackby(obj/item/A, mob/user, params)
+	var/num_loaded = magazine.attackby(A, user, params, 1)
+	if(num_loaded)
+		to_chat(user, "<span class='notice'>You load [num_loaded] disk\s into \the [src].</span>")
+		update_icon()
+		chamber_round()
+
+/obj/item/gun/ballistic/automatic/spinfusor/attack_self(mob/living/user)
+	return //caseless rounds are too glitchy to unload properly. Best to make it so that you cannot remove disks from the spinfusor
+
+/obj/item/gun/ballistic/automatic/spinfusor/update_icon()
+	..()
+	icon_state = "spinfusor[magazine ? "-[get_ammo(1)]" : ""]"
+
+/obj/item/ammo_box/aspinfusor
+	name = "ammo box (spinfusor disks)"
+	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon_state = "spinfusorbox"
+	ammo_type = /obj/item/ammo_casing/caseless/spinfusor
+	max_ammo = 8
+
+/datum/supply_pack/security/armory/spinfusor
+	name = "Stormhammer Spinfusor Crate"
+	cost = 14000
+	contains = list(/obj/item/gun/ballistic/automatic/spinfusor,
+					/obj/item/gun/ballistic/automatic/spinfusor)
+	crate_name = "spinfusor crate"
+
+/datum/supply_pack/security/armory/spinfusorammo
+	name = "Spinfusor Disk Crate"
+	cost = 7000
+	contains = list(/obj/item/ammo_box/aspinfusor,
+					/obj/item/ammo_box/aspinfusor,
+					/obj/item/ammo_box/aspinfusor,
+					/obj/item/ammo_box/aspinfusor)
+	crate_name = "spinfusor disk crate"

modular_citadel/code/modules/projectiles/guns/energy/energy_gun.dm

@@ -1,7 +1,56 @@
 /obj/item/gun/energy/e_gun
+	name = "blaster carbine"
+	desc = "A high powered particle blaster carbine with varitable setting for stunning or lethal applications."
 	icon = 'modular_citadel/icons/obj/guns/OVERRIDE_energy.dmi'
 	lefthand_file = 'modular_citadel/icons/mob/inhands/OVERRIDE_guns_lefthand.dmi'
 	righthand_file = 'modular_citadel/icons/mob/inhands/OVERRIDE_guns_righthand.dmi'
 	ammo_x_offset = 2
 	flight_x_offset = 17
-	flight_y_offset = 11
+	flight_y_offset = 11
+	
+
+/*/////////////////////////////////////////////////////////////////////////////////////////////
+							The Recolourable Energy Gun
+*//////////////////////////////////////////////////////////////////////////////////////////////
+
+obj/item/gun/energy/e_gun/cx
+	name = "\improper CX Model D Energy Gun"
+	desc = "An overpriced hybrid energy gun with two settings: disable, and kill. Manufactured by CX Armories. Has a polychromic coating."
+	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon_state = "cxe"
+	lefthand_file = 'icons/mob/citadel/guns_lefthand.dmi'
+	righthand_file = 'icons/mob/citadel/guns_righthand.dmi'
+	ammo_type = list(/obj/item/ammo_casing/energy/disabler, /obj/item/ammo_casing/energy/laser)
+	flight_x_offset = 15
+	flight_y_offset = 10
+	var/body_color = "#252528"
+
+obj/item/gun/energy/e_gun/cx/update_icon()
+	..()
+	var/mutable_appearance/body_overlay = mutable_appearance('icons/obj/guns/cit_guns.dmi', "cxegun_body")
+	if(body_color)
+		body_overlay.color = body_color
+	add_overlay(body_overlay)
+
+	if(ismob(loc))
+		var/mob/M = loc
+		M.update_inv_hands()
+
+obj/item/gun/energy/e_gun/cx/AltClick(mob/living/user)
+	if(!in_range(src, user))	//Basic checks to prevent abuse
+		return
+	if(user.incapacitated() || !istype(user))
+		to_chat(user, "<span class='warning'>You can't do that right now!</span>")
+		return
+	if(alert("Are you sure you want to repaint your gun?", "Confirm Repaint", "Yes", "No") == "Yes")
+		var/body_color_input = input(usr,"","Choose Body Color",body_color) as color|null
+		if(body_color_input)
+			body_color = sanitize_hexcolor(body_color_input, desired_format=6, include_crunch=1)
+		update_icon()
+
+obj/item/gun/energy/e_gun/cx/worn_overlays(isinhands, icon_file)
+	. = ..()
+	if(isinhands)
+		var/mutable_appearance/body_inhand = mutable_appearance(icon_file, "cxe_body")
+		body_inhand.color = body_color
+		. += body_inhand

modular_citadel/code/modules/projectiles/guns/energy/laser.dm

@@ -1,4 +1,6 @@
 /obj/item/gun/energy/laser
+	name = "blaster rifle"
+	desc = "a high energy particle blaster, efficient and deadly."
 	icon = 'modular_citadel/icons/obj/guns/OVERRIDE_energy.dmi'
 	ammo_x_offset = 1
 	shaded_charge = 1
@@ -14,4 +16,31 @@
 
 /obj/item/gun/energy/laser/redtag
 	lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
+	righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
+	
+/obj/item/gun/energy/laser/carbine
+	name = "VGS blaster carbine"
+	desc = "A ruggedized laser carbine featuring much higher capacity and improved handling when compared to a normal blaster carbine."
+	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon_state = "lasernew"
+	item_state = "laser"
+	force = 10
+	throwforce = 10
+	ammo_type = list(/obj/item/ammo_casing/energy/lasergun)
+	cell_type = /obj/item/stock_parts/cell/lascarbine
+
+/obj/item/gun/energy/laser/carbine/nopin
+	pin = null
+
+/obj/item/stock_parts/cell/lascarbine
+	name = "laser carbine power supply"
+	maxcharge = 2500
+
+/datum/design/lasercarbine
+	name = "VGS Blaster Carbine"
+	desc = "Beefed up version of a normal blaster carbine."
+	id = "lasercarbine"
+	build_type = PROTOLATHE
+	materials = list(MAT_GOLD = 2500, MAT_METAL = 5000, MAT_GLASS = 5000)
+	build_path = /obj/item/gun/energy/laser/carbine/nopin
+	category = list("Weapons")

modular_citadel/code/modules/reagents/reagent container/cit_kegs.dm

@@ -0,0 +1,41 @@
+/obj/structure/reagent_dispensers/keg
+	name = "keg"
+	desc = "A keg."
+	icon = 'modular_citadel/icons/obj/objects.dmi'
+	icon_state = "keg"
+	reagent_id = "water"
+
+/obj/structure/reagent_dispensers/keg/mead
+	name = "keg of mead"
+	desc = "A keg of mead."
+	icon_state = "orangekeg"
+	reagent_id = "mead"
+
+/obj/structure/reagent_dispensers/keg/aphro
+	name = "keg of aphrodisiac"
+	desc = "A keg of aphrodisiac."
+	icon_state = "pinkkeg"
+	reagent_id = "aphro"
+
+/obj/structure/reagent_dispensers/keg/aphro/strong
+	name = "keg of strong aphrodisiac"
+	desc = "A keg of strong and addictive aphrodisiac."
+	reagent_id = "aphro+"
+
+/obj/structure/reagent_dispensers/keg/milk
+	name = "keg of milk"
+	desc = "It's not quite what you were hoping for."
+	icon_state = "whitekeg"
+	reagent_id = "milk"
+
+/obj/structure/reagent_dispensers/keg/semen
+	name = "keg of semen"
+	desc = "Dear lord, where did this even come from?"
+	icon_state = "whitekeg"
+	reagent_id = "semen"
+
+/obj/structure/reagent_dispensers/keg/gargle
+	name = "keg of pan galactic gargleblaster"
+	desc = "A keg of... wow that's a long name."
+	icon_state = "bluekeg"
+	reagent_id = "gargleblaster"

modular_citadel/code/modules/reagents/reagent container/hypospraymkii.dm

@@ -0,0 +1,223 @@
+#define HYPO_SPRAY 0
+#define HYPO_INJECT 1
+
+//A vial-loaded hypospray. Cartridge-based!
+/obj/item/reagent_containers/hypospray/mkii
+	name = "hypospray mk.II"
+	icon = 'modular_citadel/icons/obj/hypospraymkii.dmi'
+	icon_state = "hypo2"
+	var/list/allowed_containers = list(/obj/item/reagent_containers/glass/bottle/vial/small)
+	desc = "A new development from DeForest Medical, this new hypospray takes 30-unit vials as the drug supply for easy swapping."
+	volume = 0
+	amount_per_transfer_from_this = 5
+	possible_transfer_amounts = list(5,10,15)
+	var/mode = HYPO_INJECT
+	var/obj/item/reagent_containers/glass/bottle/vial/vial
+	var/loaded_vial = /obj/item/reagent_containers/glass/bottle/vial/small
+	var/spawnwithvial = TRUE
+	var/start_vial = null
+
+/obj/item/reagent_containers/hypospray/mkii/CMO
+	name = "hypospray mk.II deluxe"
+	allowed_containers = list(/obj/item/reagent_containers/glass/bottle/vial/small, /obj/item/reagent_containers/glass/bottle/vial/large)
+	icon_state = "cmo2"
+	ignore_flags = 1
+	desc = "The Chief Medical Officer's hypospray is identically functional to the base model, excepting that it can take larger vials in addition to regular sized. It is also able to penetrate harder materials and deliver more reagents per spray."
+	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
+	loaded_vial = /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/CMO
+	possible_transfer_amounts = list(5,10,15,30,60) //cmo hypo should be able to dump lots into it
+
+/obj/item/reagent_containers/hypospray/mkii/Initialize()
+	. = ..()
+	if(!spawnwithvial)
+		update_icon()
+		return
+	if (!start_vial)
+		start_vial = new loaded_vial(src)
+		vial = start_vial
+	update_icon()
+
+/obj/item/reagent_containers/hypospray/mkii/update_icon()
+	..()
+	icon_state = "[initial(icon_state)][vial ? "" : "-e"]"
+	if(ismob(loc))
+		var/mob/M = loc
+		M.update_inv_hands()
+	return
+
+/obj/item/reagent_containers/hypospray/mkii/examine(mob/user)
+	. = ..()
+	to_chat(user, "[src] is set to [mode ? "Inject" : "Spray"] contents on application.")
+
+/obj/item/reagent_containers/hypospray/mkii/proc/unload_hypo(obj/item/I, mob/user)
+	if((istype(I, /obj/item/reagent_containers/glass/bottle/vial)))
+		var/obj/item/reagent_containers/glass/bottle/vial/V = I
+		reagents.trans_to(V, reagents.total_volume)
+		reagents.maximum_volume = 0
+		V.forceMove(user.loc)
+		user.put_in_hands(V)
+		to_chat(user, "<span class='notice'>You remove the vial from the [src].</span>")
+		vial = null
+		update_icon()
+		playsound(loc, 'sound/weapons/empty.ogg', 50, 1)
+	else
+		to_chat(user, "<span class='notice'>This hypo isn't loaded!</span>")
+		return
+
+/obj/item/reagent_containers/hypospray/mkii/attackby(obj/item/I, mob/living/user)
+	if((istype(I, /obj/item/reagent_containers/glass/bottle/vial) && vial != null))
+		to_chat(user, "<span class='warning'>[src] can not hold more than one vial!</span>")
+		return FALSE
+	if((istype(I, /obj/item/reagent_containers/glass/bottle/vial)))
+		var/obj/item/reagent_containers/glass/bottle/vial/V = I
+		if(!is_type_in_list(V, allowed_containers))
+			to_chat(user, "<span class='notice'>\The [src] doesn't accept this vial.</span>")
+			return
+		vial = V
+		reagents.maximum_volume = V.volume
+		V.reagents.trans_to(src, V.reagents.total_volume)
+		if(!user.transferItemToLoc(V,src))
+			return
+		user.visible_message("<span class='notice'>[user] has loads vial into \the [src].</span>","<span class='notice'>You have loaded [vial] into \the [src].</span>")
+		update_icon()
+		playsound(loc, 'sound/weapons/autoguninsert.ogg', 50, 1)
+		return TRUE
+	else
+		to_chat(user, "<span class='notice'>This doesn't fit in \the [src].</span>")
+		return FALSE
+	return FALSE
+
+/obj/item/reagent_containers/hypospray/mkii/attack(obj/item/I, mob/user, params)
+	return
+
+/obj/item/reagent_containers/hypospray/mkii/afterattack(atom/target, mob/user, proximity)
+	if(!proximity)
+		return
+
+	if(!ismob(target))
+		return
+
+	var/mob/living/L
+	if(isliving(target))
+		L = target
+		if(!L.can_inject(user, 1))
+			return
+
+	if(!L && !target.is_injectable()) //only checks on non-living mobs, due to how can_inject() handles
+		to_chat(user, "<span class='warning'>You cannot directly fill [target]!</span>")
+		return
+
+	if(target.reagents.total_volume >= target.reagents.maximum_volume)
+		to_chat(user, "<span class='notice'>[target] is full.</span>")
+		return
+
+	if(ishuman(L))
+		var/obj/item/bodypart/affecting = L.get_bodypart(check_zone(user.zone_selected))
+		if(!affecting)
+			to_chat(user, "<span class='warning'>The limb is missing!</span>")
+			return
+		if(affecting.status != BODYPART_ORGANIC)
+			to_chat(user, "<span class='notice'>Medicine won't work on a robotic limb!</span>")
+			return
+
+	var/contained = reagents.log_list()
+	add_logs(user, L, "attemped to inject", src, addition="which had [contained]")
+//Always log attemped injections for admins
+	if(vial != null)
+		switch(mode)
+			if(HYPO_INJECT)
+				if(L) //living mob
+					if(!L.can_inject(user, TRUE))
+						return
+					if(L != user)
+						L.visible_message("<span class='danger'>[user] is trying to inject [L] with [src]!</span>", \
+										"<span class='userdanger'>[user] is trying to inject [L] with the [src]!</span>")
+						if(!do_mob(user, L, extra_checks=CALLBACK(L, /mob/living/proc/can_inject,user,1)))
+							return
+						if(!reagents.total_volume)
+							return
+						if(L.reagents.total_volume >= L.reagents.maximum_volume)
+							return
+						L.visible_message("<span class='danger'>[user] uses the [src] on [L]!</span>", \
+										"<span class='userdanger'>[user] uses the [src] on [L]!</span>")
+					else
+						if(!do_mob(user, L, extra_checks=CALLBACK(L, /mob/living/proc/can_inject,user,1)))
+							return
+						if(!reagents.total_volume)
+							return
+						if(L.reagents.total_volume >= L.reagents.maximum_volume)
+							return
+						log_attack("<font color='red'>[user.name] ([user.ckey]) applied [src] to [L.name] ([L.ckey]), which had [contained] (INTENT: [uppertext(user.a_intent)]) (MODE: [src.mode])</font>")
+						L.log_message("<font color='orange'>applied [src] to  themselves ([contained]).</font>", INDIVIDUAL_ATTACK_LOG)
+
+				var/fraction = min(amount_per_transfer_from_this/reagents.total_volume, 1)
+				reagents.reaction(L, INJECT, fraction)
+				reagents.trans_to(target, amount_per_transfer_from_this)
+				if(amount_per_transfer_from_this >= 15)
+					playsound(loc,'sound/items/hypospray_long.ogg',50, 1, -1)
+				if(amount_per_transfer_from_this < 15)
+					playsound(loc,  pick('sound/items/hypospray.ogg','sound/items/hypospray2.ogg'), 50, 1, -1)
+				to_chat(user, "<span class='notice'>You inject [amount_per_transfer_from_this] units of the solution. The hypospray's cartridge now contains [reagents.total_volume] units.</span>")
+
+			if(HYPO_SPRAY)
+				if(L) //living mob
+					if(!L.can_inject(user, TRUE))
+						return
+					if(L != user)
+						L.visible_message("<span class='danger'>[user] is trying to inject [L] with [src]!</span>", \
+										"<span class='userdanger'>[user] is trying to inject [L] with the [src]!</span>")
+						if(!do_mob(user, L, extra_checks=CALLBACK(L, /mob/living/proc/can_inject,user,1)))
+							return
+						if(!reagents.total_volume)
+							return
+						if(L.reagents.total_volume >= L.reagents.maximum_volume)
+							return
+						L.visible_message("<span class='danger'>[user] uses the [src] on [L]!</span>", \
+										"<span class='userdanger'>[user] uses the [src] on [L]!</span>")
+					else
+						if(!do_mob(user, L, extra_checks=CALLBACK(L, /mob/living/proc/can_inject,user,1)))
+							return
+						if(!reagents.total_volume)
+							return
+						if(L.reagents.total_volume >= L.reagents.maximum_volume)
+							return
+						log_attack("<font color='red'>[user.name] ([user.ckey]) applied [src] to [L.name] ([L.ckey]), which had [contained] (INTENT: [uppertext(user.a_intent)]) (MODE: [src.mode])</font>")
+						L.log_message("<font color='orange'>applied [src] to  themselves ([contained]).</font>", INDIVIDUAL_ATTACK_LOG)
+				var/fraction = min(amount_per_transfer_from_this/reagents.total_volume, 1)
+				reagents.reaction(L, PATCH, fraction)
+				reagents.trans_to(target, amount_per_transfer_from_this)
+				if(amount_per_transfer_from_this >= 15)
+					playsound(loc,'sound/items/hypospray_long.ogg',50, 1, -1)
+				if(amount_per_transfer_from_this < 15)
+					playsound(loc,  pick('sound/items/hypospray.ogg','sound/items/hypospray2.ogg'), 50, 1, -1)
+				to_chat(user, "<span class='notice'>You spray [amount_per_transfer_from_this] units of the solution. The hypospray's cartridge now contains [reagents.total_volume] units.</span>")
+	else
+		to_chat(user, "<span class='notice'>[src] doesn't work here!</span>")
+		return
+
+/obj/item/reagent_containers/hypospray/mkii/AltClick(mob/living/user)
+	if(user)
+		if(user.incapacitated())
+			return
+		else if(!contents)
+			to_chat(user, "This Hypo needs to be loaded first!")
+			return
+		else
+			for(var/obj/item/I in contents)
+				unload_hypo(I,user)
+
+/obj/item/reagent_containers/hypospray/mkii/verb/modes()
+	set name = "Change Application Method"
+	set category = "Object"
+	set src in usr
+	var/mob/M = usr
+	var/choice = alert(M, "Which application mode should this be? Current mode is: [mode ? "Spray" : "Inject"]", "", "Spray", "Cancel", "Inject")
+	switch(choice)
+		if("Cancel")
+			return
+		if("Inject")
+			mode = HYPO_INJECT
+			to_chat(M, "[src] is now set to inject contents on application.")
+		if("Spray")
+			mode = HYPO_SPRAY
+			to_chat(M, "[src] is now set to spray contents on application.")

modular_citadel/code/modules/reagents/reagent container/hypovial.dm

@@ -0,0 +1,116 @@
+/obj/item/reagent_containers/glass/bottle/vial
+	name = "hypospray vial"
+	desc = "This is a vial suitable for loading into mk II hyposprays."
+	icon = 'modular_citadel/icons/obj/vial.dmi'
+	icon_state = "hypovial"
+	spillable = FALSE
+	var/comes_with = list() //Easy way of doing this.
+	volume = 10
+	obj_flags = UNIQUE_RENAME
+	unique_reskin = list("Hypospray vial" = "hypovial",
+						"Red hypospray vial" = "hypovial-b",
+						"Blue hypospray vial" = "hypovial-d",
+						"Green hypospray vial" = "hypovial-a",
+						"Orange hypospray vial" = "hypovial-k",
+						"Purple hypospray vial" = "hypovial-p",
+						"Black hypospray vial" = "hypovial-t"
+						)
+
+/obj/item/reagent_containers/glass/bottle/vial/Initialize()
+	. = ..()
+	if(!icon_state)
+		icon_state = "hypovial"
+	update_icon()
+	for(var/R in comes_with)
+		reagents.add_reagent(R,comes_with[R])
+
+/obj/item/reagent_containers/glass/bottle/vial/on_reagent_change()
+	update_icon()
+
+/obj/item/reagent_containers/glass/bottle/vial/update_icon()
+	cut_overlays()
+	if(reagents.total_volume)
+		var/mutable_appearance/filling = mutable_appearance('modular_citadel/icons/obj/vial.dmi', "[icon_state]10")
+
+		var/percent = round((reagents.total_volume / volume) * 100)
+		switch(percent)
+			if(0 to 9)
+				filling.icon_state = "[icon_state]10"
+			if(10 to 29)
+				filling.icon_state = "[icon_state]25"
+			if(30 to 49)
+				filling.icon_state = "[icon_state]50"
+			if(50 to 69)
+				filling.icon_state = "[icon_state]75"
+			if(70 to INFINITY)
+				filling.icon_state = "[icon_state]100"
+
+		filling.color = mix_color_from_reagents(reagents.reagent_list)
+		add_overlay(filling)
+
+/obj/item/reagent_containers/glass/bottle/vial/small
+	volume = 30
+
+/obj/item/reagent_containers/glass/bottle/vial/large
+	name = "large hypospray vial"
+	desc = "This is a vial suitable for loading into the Chief Medical Officer's Hypospray mk II."
+	icon_state = "hypoviallarge"
+	volume = 60
+	unique_reskin = list("Large hypospray vial" = "hypoviallarge",
+						"Red hypospray vial" = "hypoviallarge-b",
+						"Blue hypospray vial" = "hypoviallarge-d",
+						"Green hypospray vial" = "hypoviallarge-a",
+						"Orange hypospray vial" = "hypoviallarge-k",
+						"Purple hypospray vial" = "hypoviallarge-p",
+						"Black hypospray vial" = "hypoviallarge-t"
+						)
+
+/obj/item/reagent_containers/glass/bottle/vial/small/preloaded/bicaridine
+	name = "vial (bicaridine)"
+	icon_state = "hypovial-b"
+	comes_with = list("bicaridine" = 30)
+
+/obj/item/reagent_containers/glass/bottle/vial/small/preloaded/antitoxin
+	name = "vial (Anti-Tox)"
+	icon_state = "hypovial-a"
+	comes_with = list("antitoxin" = 30)
+
+/obj/item/reagent_containers/glass/bottle/vial/small/preloaded/kelotane
+	name = "vial (kelotane)"
+	icon_state = "hypovial-k"
+	comes_with = list("kelotane" = 30)
+
+/obj/item/reagent_containers/glass/bottle/vial/small/preloaded/dexalin
+	name = "vial (dexalin)"
+	icon_state = "hypovial-d"
+	comes_with = list("dexalin" = 30)
+
+/obj/item/reagent_containers/glass/bottle/vial/small/preloaded/tricordrazine
+	name = "vial (tricordrazine)"
+	icon_state = "hypovial"
+	comes_with = list("tricordrazine" = 30)
+
+/obj/item/reagent_containers/glass/bottle/vial/large/preloaded/CMO
+	name = "large vial (CMO Special)"
+	icon_state = "hypoviallarge-cmos"
+	comes_with = list("epinephrine" = 15, "kelotane" = 15, "charcoal" = 15, "bicaridine" = 15)
+
+/obj/item/reagent_containers/glass/bottle/vial/large/preloaded/bicaridine
+	name = "large vial (bicaridine)"
+	icon_state = "hypoviallarge-b"
+	comes_with = list("bicaridine" = 60)
+
+/obj/item/reagent_containers/glass/bottle/vial/large/preloaded/antitoxin
+	name = "large vial (Anti-Tox)"
+	icon_state = "hypoviallarge-a"
+	comes_with = list("antitoxin" = 60)
+
+/obj/item/reagent_containers/glass/bottle/vial/large/preloaded/kelotane
+	name = "large vial (kelotane)"
+	icon_state = "hypoviallarge-k"
+	comes_with = list("kelotane" = 60)
+
+/obj/item/reagent_containers/glass/bottle/vial/large/preloaded/dexalin
+	name = "large vial (dexalin)"
+	icon_state = "hypoviallarge-d"
+	comes_with = list("dexalin" = 60)

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

@@ -0,0 +1,274 @@
+//body bluids
+/datum/reagent/consumable/semen
+	name = "Semen"
+	id = "semen"
+	description = "Sperm from some animal. Useless for anything but insemination, really."
+	taste_description = "something salty"
+	taste_mult = 2 //Not very overpowering flavor
+	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
+	nutriment_factor = 0.5 * REAGENTS_METABOLISM
+
+/datum/reagent/consumable/semen/reaction_turf(turf/T, reac_volume)
+	if(!istype(T))
+		return
+	if(reac_volume < 3)
+		return
+
+	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"]))
+
+/obj/effect/decal/cleanable/semen
+	name = "semen"
+	desc = null
+	gender = PLURAL
+	density = 0
+	layer = ABOVE_NORMAL_TURF_LAYER
+	icon = 'modular_citadel/icons/obj/genitals/effects.dmi'
+	icon_state = "semen1"
+	random_icon_states = list("semen1", "semen2", "semen3", "semen4")
+
+/obj/effect/decal/cleanable/semen/New()
+	..()
+	dir = pick(1,2,4,8)
+
+/datum/reagent/consumable/semen/reaction_turf(turf/T, reac_volume)
+	if(!isspaceturf(T))
+		var/obj/effect/decal/cleanable/reagentdecal = new/obj/effect/decal/cleanable/semen(T)
+		reagentdecal.reagents.add_reagent("semen", reac_volume)
+
+/datum/reagent/consumable/femcum
+	name = "Female Ejaculate"
+	id = "femcum"
+	description = "Vaginal lubricant found in most mammals and other animals of similar nature. Where you found this is your own business."
+	taste_description = "something with a tang" // wew coders who haven't eaten out a girl.
+	taste_mult = 2
+	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"
+	nutriment_factor = 0.5 * REAGENTS_METABOLISM
+
+/obj/effect/decal/cleanable/femcum
+	name = "female ejaculate"
+	desc = null
+	gender = PLURAL
+	density = 0
+	layer = ABOVE_NORMAL_TURF_LAYER
+	icon = 'modular_citadel/icons/obj/genitals/effects.dmi'
+	icon_state = "fem1"
+	random_icon_states = list("fem1", "fem2", "fem3", "fem4")
+	blood_state = null
+	bloodiness = null
+
+/obj/effect/decal/cleanable/femcum/New()
+	..()
+	dir = pick(1,2,4,8)
+	add_blood_DNA(list("Non-human DNA" = "A+"))
+
+/obj/effect/decal/cleanable/femcum/replace_decal(obj/effect/decal/cleanable/femcum/F)
+	F.add_blood_DNA(return_blood_DNA())
+	..()
+
+/datum/reagent/consumable/femcum/reaction_turf(turf/T, reac_volume)
+	if(!istype(T))
+		return
+	if(reac_volume < 3)
+		return
+
+	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"]))
+
+//aphrodisiac & anaphrodisiac
+
+/datum/reagent/drug/aphrodisiac
+	name = "Crocin"
+	id = "aphro"
+	description = "Naturally found in the crocus and gardenia flowers, this drug acts as a natural and safe aphrodisiac."
+	taste_description = "strawberry roofies"
+	taste_mult = 2 //Hide the roofies in stronger flavors
+	color = "#FFADFF"//PINK, rgb(255, 173, 255)
+
+/datum/reagent/drug/aphrodisiac/on_mob_life(mob/living/M)
+	if(M && M.canbearoused)
+		if(prob(33))
+			M.adjustArousalLoss(2)
+		if(prob(5))
+			M.emote(pick("moan","blush"))
+		if(prob(5))
+			var/aroused_message = pick("You feel frisky.", "You're having trouble suppressing your urges.", "You feel in the mood.")
+			to_chat(M, "<span class='love'>[aroused_message]</span>")
+	..()
+
+/datum/reagent/drug/aphrodisiacplus
+	name = "Hexacrocin"
+	id = "aphro+"
+	description = "Chemically condensed form of basic crocin. This aphrodisiac is extremely powerful and addictive in most animals.\
+					Addiction withdrawals can cause brain damage and shortness of breath. Overdosage can lead to brain damage and a\
+					 permanent increase in libido (commonly referred to as 'bimbofication')."
+	taste_description = "liquid desire"
+	color = "#FF2BFF"//dark pink
+	addiction_threshold = 20
+	overdose_threshold = 20
+
+/datum/reagent/drug/aphrodisiacplus/on_mob_life(mob/living/M)
+	if(M && M.canbearoused)
+		if(prob(33))
+			M.adjustArousalLoss(6)//not quite six times as powerful, but still considerably more powerful.
+		if(prob(5))
+			if(M.getArousalLoss() > 75)
+				M.say(pick("Hnnnnngghh...", "Ohh...", "Mmnnn..."))
+			else
+				M.emote(pick("moan","blush"))
+		if(prob(5))
+			var/aroused_message
+			if(M.getArousalLoss() > 90)
+				aroused_message = pick("You need to fuck someone!", "You're bursting with sexual tension!", "You can't get sex off your mind!")
+			else
+				aroused_message = pick("You feel a bit hot.", "You feel strong sexual urges.", "You feel in the mood.", "You're ready to go down on someone.")
+			to_chat(M, "<span class='love'>[aroused_message]</span>")
+	..()
+
+/datum/reagent/drug/aphrodisiacplus/addiction_act_stage2(mob/living/M)
+	if(prob(30))
+		M.adjustBrainLoss(2)
+	..()
+/datum/reagent/drug/aphrodisiacplus/addiction_act_stage3(mob/living/M)
+	if(prob(30))
+		M.adjustBrainLoss(3)
+
+		..()
+/datum/reagent/drug/aphrodisiacplus/addiction_act_stage4(mob/living/M)
+	if(prob(30))
+		M.adjustBrainLoss(4)
+	..()
+
+/datum/reagent/drug/aphrodisiacplus/overdose_process(mob/living/M)
+	if(M && M.canbearoused && prob(33))
+		if(M.getArousalLoss() >= 100 && ishuman(M) && M.has_dna())
+			var/mob/living/carbon/human/H = M
+			if(prob(50)) //Less spam
+				to_chat(H, "<span class='love'>Your libido is going haywire!</span>")
+				H.mob_climax(forced_climax=TRUE)
+		if(M.min_arousal < 50)
+			M.min_arousal += 1
+		if(M.min_arousal < M.max_arousal)
+			M.min_arousal += 1
+		M.adjustArousalLoss(2)
+	..()
+
+/datum/reagent/drug/anaphrodisiac
+	name = "Camphor"
+	id = "anaphro"
+	description = "Naturally found in some species of evergreen trees, camphor is a waxy substance. When injested by most animals, it acts as an anaphrodisiac\
+					, reducing libido and calming them. Non-habit forming and not addictive."
+	taste_description = "dull bitterness"
+	taste_mult = 2
+	color = "#D9D9D9"//rgb(217, 217, 217)
+	reagent_state = SOLID
+
+/datum/reagent/drug/anaphrodisiac/on_mob_life(mob/living/M)
+	if(M && M.canbearoused && prob(33))
+		M.adjustArousalLoss(-2)
+	..()
+
+/datum/reagent/drug/anaphrodisiacplus
+	name = "Hexacamphor"
+	id = "anaphro+"
+	description = "Chemically condensed camphor. Causes an extreme reduction in libido and a permanent one if overdosed. Non-addictive."
+	taste_description = "tranquil celibacy"
+	color = "#D9D9D9"//rgb(217, 217, 217)
+	reagent_state = SOLID
+	overdose_threshold = 20
+
+/datum/reagent/drug/anaphrodisiacplus/on_mob_life(mob/living/M)
+	if(M && M.canbearoused && prob(33))
+		M.adjustArousalLoss(-4)
+	..()
+
+/datum/reagent/drug/anaphrodisiacplus/overdose_process(mob/living/M)
+	if(M && M.canbearoused && prob(33))
+		if(M.min_arousal > 0)
+			M.min_arousal -= 1
+		if(M.min_arousal > 50)
+			M.min_arousal -= 1
+		M.adjustArousalLoss(-2)
+	..()
+
+//recipes
+/datum/chemical_reaction/aphro
+	name = "crocin"
+	id = "aphro"
+	results = list("aphro" = 6)
+	required_reagents = list("carbon" = 2, "hydrogen" = 2, "oxygen" = 2, "water" = 1)
+	required_temp = 400
+	mix_message = "The mixture boils off a pink vapor..."//The water boils off, leaving the crocin
+
+/datum/chemical_reaction/aphroplus
+	name = "hexacrocin"
+	id = "aphro+"
+	results = list("aphro+" = 1)
+	required_reagents = list("aphro" = 6, "phenol" = 1)
+	required_temp = 400
+	mix_message = "The mixture rapidly condenses and darkens in color..."
+
+/datum/chemical_reaction/anaphro
+	name = "camphor"
+	id = "anaphro"
+	results = list("anaphro" = 6)
+	required_reagents = list("carbon" = 2, "hydrogen" = 2, "oxygen" = 2, "sulfur" = 1)
+	required_temp = 400
+	mix_message = "The mixture boils off a yellow, smelly vapor..."//Sulfur burns off, leaving the camphor
+
+/datum/chemical_reaction/anaphroplus
+	name = "pentacamphor"
+	id = "anaphro+"
+	results = list("anaphro+" = 1)
+	required_reagents = list("anaphro" = 5, "acetone" = 1)
+	required_temp = 300
+	mix_message = "The mixture thickens and heats up slighty..."
+
+//=========Drinks and Stuff!============//
+
+/datum/reagent/consumable/ethanol/sake
+	name = "Sake"
+	id = "sake"
+	description = "A sweet rice wine of questionable legality and extreme potency."
+	color = "#DDDDDD"
+	boozepwr = 70
+	taste_description = "sweet rice wine"
+	glass_icon_state = "sakecup"
+	glass_name = "glass of sake"
+	glass_desc = "A traditional cup of sake."
+
+/datum/chemical_reaction/sake
+	name = "sake"
+	id = "sake"
+	results = list("sake" = 20)
+	required_reagents = list("rice" = 15, "sugar" = 5)
+	required_temp = 400
+	mix_message = "The rice grains ferment with the sugar into a clear, sweet-smelling liquid."
+
+/obj/item/reagent_containers/food/drinks/bottle/sake
+	name = "Traditional Sake"
+	desc = "Sweet as can be, and burns like foxfire going down."
+	icon = 'modular_citadel/icons/obj/drinks.dmi'
+	icon_state = "sakebottle"
+	list_reagents = list("sake" = 100)
+
+/obj/item/reagent_containers/food/drinks/bottle/sake/Initialize()
+	. = ..()
+	if(prob(30))
+		name = "Tetravulpine Sake"
+		desc += " On the bottle is a picture of a kitsune with four tails."
+	else if(prob(30))
+		name = "Inubashiri's Home Brew"
+		desc += " Awoo."

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

@@ -0,0 +1,162 @@
+// THIS IS NOW MERELY LEGACY, because memes. hopefully it won't be dumb.
+
+//
+//	The belly object is what holds onto a mob while they're inside a predator.
+//	It takes care of altering the pred's decription, digesting the prey, relaying struggles etc.
+//
+
+// If you change what variables are on this, then you need to update the copy() proc.
+
+//
+// Parent type of all the various "belly" varieties.
+//
+/datum/belly
+	var/name								// Name of this location
+	var/inside_flavor						// Flavor text description of inside sight/sound/smells/feels.
+	var/vore_sound = 'sound/vore/pred/swallow_01.ogg'	// Sound when ingesting someone
+	var/vore_verb = "ingest"				// Verb for eating with this in messages
+	var/human_prey_swallow_time = 10 SECONDS		// Time in deciseconds to swallow /mob/living/carbon/human
+	var/nonhuman_prey_swallow_time = 5 SECONDS		// Time in deciseconds to swallow anything else
+	var/emoteTime = 30 SECONDS				// How long between stomach emotes at prey
+	var/digest_brute = 0					// Brute damage per tick in digestion mode
+	var/digest_burn = 1						// Burn damage per tick in digestion mode
+	var/digest_tickrate = 9					// Modulus this of air controller tick number to iterate gurgles on
+	var/immutable = FALSE					// Prevents this belly from being deleted
+	var/escapable = FALSE					// Belly can be resisted out of at any time
+	var/escapetime = 60 SECONDS				// Deciseconds, how long to escape this belly
+	var/digestchance = 0					// % Chance of stomach beginning to digest if prey struggles
+//	var/silenced = FALSE					// Will the heartbeat/fleshy internal loop play?
+	var/escapechance = 0 					// % Chance of prey beginning to escape if prey struggles.
+
+	var/datum/belly/transferlocation = null	// Location that the prey is released if they struggle and get dropped off.
+	var/transferchance = 0 					// % Chance of prey being transferred to transfer location when resisting
+	var/autotransferchance = 0 				// % Chance of prey being autotransferred to transfer location
+	var/autotransferwait = 10 				// Time between trying to transfer.
+	var/can_taste = FALSE					// If this belly prints the flavor of prey when it eats someone.
+
+	var/tmp/digest_mode = DM_HOLD			// Whether or not to digest. Default to not digest.
+	var/tmp/list/digest_modes = list(DM_HOLD,DM_DIGEST,DM_HEAL,DM_NOISY)	// Possible digest modes
+	var/tmp/mob/living/owner				// The mob whose belly this is.
+	var/tmp/list/internal_contents = list()	// People/Things you've eaten into this belly!
+	var/tmp/is_full							// Flag for if digested remeans are present. (for disposal messages)
+	var/tmp/emotePend = FALSE				// If there's already a spawned thing counting for the next emote
+	var/swallow_time = 10 SECONDS			// for mob transfering automation
+	var/vore_capacity = 1				// The capacity (in people) this person can hold
+
+	// Don't forget to watch your commas at the end of each line if you change these.
+	var/list/struggle_messages_outside = list(
+		"%pred's %belly wobbles with a squirming meal.",
+		"%pred's %belly jostles with movement.",
+		"%pred's %belly briefly swells outward as someone pushes from inside.",
+		"%pred's %belly fidgets with a trapped victim.",
+		"%pred's %belly jiggles with motion from inside.",
+		"%pred's %belly sloshes around.",
+		"%pred's %belly gushes softly.",
+		"%pred's %belly lets out a wet squelch.")
+
+	var/list/struggle_messages_inside = list(
+		"Your useless squirming only causes %pred's slimy %belly to squelch over your body.",
+		"Your struggles only cause %pred's %belly to gush softly around you.",
+		"Your movement only causes %pred's %belly to slosh around you.",
+		"Your motion causes %pred's %belly to jiggle.",
+		"You fidget around inside of %pred's %belly.",
+		"You shove against the walls of %pred's %belly, making it briefly swell outward.",
+		"You jostle %pred's %belly with movement.",
+		"You squirm inside of %pred's %belly, making it wobble around.")
+
+	var/list/digest_messages_owner = list(
+		"You feel %prey's body succumb to your digestive system, which breaks it apart into soft slurry.",
+		"You hear a lewd glorp as your %belly muscles grind %prey into a warm pulp.",
+		"Your %belly lets out a rumble as it melts %prey into sludge.",
+		"You feel a soft gurgle as %prey's body loses form in your %belly. They're nothing but a soft mass of churning slop now.",
+		"Your %belly begins gushing %prey's remains through your system, adding some extra weight to your thighs.",
+		"Your %belly begins gushing %prey's remains through your system, adding some extra weight to your rump.",
+		"Your %belly begins gushing %prey's remains through your system, adding some extra weight to your belly.",
+		"Your %belly groans as %prey falls apart into a thick soup. You can feel their remains soon flowing deeper into your body to be absorbed.",
+		"Your %belly kneads on every fiber of %prey, softening them down into mush to fuel your next hunt.",
+		"Your %belly churns %prey down into a hot slush. You can feel the nutrients coursing through your digestive track with a series of long, wet glorps.")
+
+	var/list/digest_messages_prey = list(
+		"Your body succumbs to %pred's digestive system, which breaks you apart into soft slurry.",
+		"%pred's %belly lets out a lewd glorp as their muscles grind you into a warm pulp.",
+		"%pred's %belly lets out a rumble as it melts you into sludge.",
+		"%pred feels a soft gurgle as your body loses form in their %belly. You're nothing but a soft mass of churning slop now.",
+		"%pred's %belly begins gushing your remains through their system, adding some extra weight to %pred's thighs.",
+		"%pred's %belly begins gushing your remains through their system, adding some extra weight to %pred's rump.",
+		"%pred's %belly begins gushing your remains through their system, adding some extra weight to %pred's belly.",
+		"%pred's %belly groans as you fall apart into a thick soup. Your remains soon flow deeper into %pred's body to be absorbed.",
+		"%pred's %belly kneads on every fiber of your body, softening you down into mush to fuel their next hunt.",
+		"%pred's %belly churns you down into a hot slush. Your nutrient-rich remains course through their digestive track with a series of long, wet glorps.")
+
+	var/list/examine_messages = list(
+		"They have something solid in their %belly!",
+		"It looks like they have something in their %belly!")
+
+	//Mostly for being overridden on precreated bellies on mobs. Could be VV'd into
+	//a carbon's belly if someone really wanted. No UI for carbons to adjust this.
+	//List has indexes that are the digestion mode strings, and keys that are lists of strings.
+	var/list/emote_lists = list()
+
+//OLD: This only exists for legacy conversion purposes
+//It's called whenever an old datum-style belly is loaded
+/datum/belly/proc/copy(obj/belly/new_belly)
+
+	//// Non-object variables
+	new_belly.name = name
+	new_belly.desc = inside_flavor
+	new_belly.vore_sound = vore_sound
+	new_belly.vore_verb = vore_verb
+	new_belly.human_prey_swallow_time = human_prey_swallow_time
+	new_belly.nonhuman_prey_swallow_time = nonhuman_prey_swallow_time
+	new_belly.emote_time = emoteTime
+	new_belly.digest_brute = digest_brute
+	new_belly.digest_burn = digest_burn
+	new_belly.immutable = immutable
+	new_belly.can_taste = can_taste
+	new_belly.escapable = escapable
+	new_belly.escapetime = escapetime
+	new_belly.digestchance = digestchance
+	new_belly.escapechance = escapechance
+	new_belly.transferchance = transferchance
+	new_belly.transferlocation = transferlocation
+
+	//// Object-holding variables
+	//struggle_messages_outside - strings
+	new_belly.struggle_messages_outside.Cut()
+	for(var/I in struggle_messages_outside)
+		new_belly.struggle_messages_outside += I
+
+	//struggle_messages_inside - strings
+	new_belly.struggle_messages_inside.Cut()
+	for(var/I in struggle_messages_inside)
+		new_belly.struggle_messages_inside += I
+
+	//digest_messages_owner - strings
+	new_belly.digest_messages_owner.Cut()
+	for(var/I in digest_messages_owner)
+		new_belly.digest_messages_owner += I
+
+	//digest_messages_prey - strings
+	new_belly.digest_messages_prey.Cut()
+	for(var/I in digest_messages_prey)
+		new_belly.digest_messages_prey += I
+
+	//examine_messages - strings
+	new_belly.examine_messages.Cut()
+	for(var/I in examine_messages)
+		new_belly.examine_messages += I
+
+	//emote_lists - index: digest mode, key: list of strings
+	new_belly.emote_lists.Cut()
+	for(var/K in emote_lists)
+		new_belly.emote_lists[K] = list()
+		for(var/I in emote_lists[K])
+			new_belly.emote_lists[K] += I
+
+	return new_belly
+
+// // // // // // // // // // // //
+// // // LEGACY USE ONLY!! // // //
+// // // // // // // // // // // //
+//       See top of file!        //
+// // // // // // // // // // // //

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

@@ -0,0 +1,655 @@
+//#define VORE_SOUND_FALLOFF 0.05
+
+//
+//  Belly system 2.0, now using objects instead of datums because EH at datums.
+//	How many times have I rewritten bellies and vore now? -Aro
+//
+
+// If you change what variables are on this, then you need to update the copy() proc.
+
+//
+// Parent type of all the various "belly" varieties.
+//
+/obj/belly
+	name = "belly"							// Name of this location
+	desc = "It's a belly! You're in it!"	// Flavor text description of inside sight/sound/smells/feels.
+	var/vore_sound = 'sound/vore/pred/swallow_01.ogg'					// Sound when ingesting someone
+	var/vore_verb = "ingest"				// Verb for eating with this in messages
+	var/release_sound = 'sound/effects/splat.ogg'
+	var/human_prey_swallow_time = 100		// Time in deciseconds to swallow /mob/living/carbon/human
+	var/nonhuman_prey_swallow_time = 30		// Time in deciseconds to swallow anything else
+	var/emote_time = 60 SECONDS				// How long between stomach emotes at prey
+	var/digest_brute = 2					// Brute damage per tick in digestion mode
+	var/digest_burn = 2						// Burn damage per tick in digestion mode
+	var/immutable = FALSE					// Prevents this belly from being deleted
+	var/escapable = TRUE					// Belly can be resisted out of at any time
+	var/escapetime = 20 SECONDS				// Deciseconds, how long to escape this belly
+	var/digestchance = 0					// % Chance of stomach beginning to digest if prey struggles
+	var/absorbchance = 0					// % Chance of stomach beginning to absorb if prey struggles
+	var/escapechance = 100 					// % Chance of prey beginning to escape if prey struggles.
+	var/can_taste = FALSE					// If this belly prints the flavor of prey when it eats someone.
+	var/bulge_size = 0.25					// The minimum size the prey has to be in order to show up on examine.
+//	var/shrink_grow_size = 1				// This horribly named variable determines the minimum/maximum size it will shrink/grow prey to.
+	var/silent = FALSE
+
+	var/transferlocation = null	// Location that the prey is released if they struggle and get dropped off.
+	var/transferchance = 0 					// % Chance of prey being transferred to transfer location when resisting
+	var/autotransferchance = 0 				// % Chance of prey being autotransferred to transfer location
+	var/autotransferwait = 10 				// Time between trying to transfer.
+	var/swallow_time = 10 SECONDS			// for mob transfering automation
+	var/vore_capacity = 1					// simple animal nom capacity
+
+	//I don't think we've ever altered these lists. making them static until someone actually overrides them somewhere.
+	var/tmp/static/list/digest_modes = list(DM_HOLD,DM_DIGEST,DM_HEAL,DM_NOISY)	// Possible digest modes
+
+	var/tmp/mob/living/owner					// The mob whose belly this is.
+	var/tmp/digest_mode = DM_HOLD				// Current mode the belly is set to from digest_modes (+transform_modes if human)
+	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
+
+	// Don't forget to watch your commas at the end of each line if you change these.
+	var/list/struggle_messages_outside = list(
+		"%pred's %belly wobbles with a squirming meal.",
+		"%pred's %belly jostles with movement.",
+		"%pred's %belly briefly swells outward as someone pushes from inside.",
+		"%pred's %belly fidgets with a trapped victim.",
+		"%pred's %belly jiggles with motion from inside.",
+		"%pred's %belly sloshes around.",
+		"%pred's %belly gushes softly.",
+		"%pred's %belly lets out a wet squelch.")
+
+	var/list/struggle_messages_inside = list(
+		"Your useless squirming only causes %pred's slimy %belly to squelch over your body.",
+		"Your struggles only cause %pred's %belly to gush softly around you.",
+		"Your movement only causes %pred's %belly to slosh around you.",
+		"Your motion causes %pred's %belly to jiggle.",
+		"You fidget around inside of %pred's %belly.",
+		"You shove against the walls of %pred's %belly, making it briefly swell outward.",
+		"You jostle %pred's %belly with movement.",
+		"You squirm inside of %pred's %belly, making it wobble around.")
+
+	var/list/digest_messages_owner = list(
+		"You feel %prey's body succumb to your digestive system, which breaks it apart into soft slurry.",
+		"You hear a lewd glorp as your %belly muscles grind %prey into a warm pulp.",
+		"Your %belly lets out a rumble as it melts %prey into sludge.",
+		"You feel a soft gurgle as %prey's body loses form in your %belly. They're nothing but a soft mass of churning slop now.",
+		"Your %belly begins gushing %prey's remains through your system, adding some extra weight to your thighs.",
+		"Your %belly begins gushing %prey's remains through your system, adding some extra weight to your rump.",
+		"Your %belly begins gushing %prey's remains through your system, adding some extra weight to your belly.",
+		"Your %belly groans as %prey falls apart into a thick soup. You can feel their remains soon flowing deeper into your body to be absorbed.",
+		"Your %belly kneads on every fiber of %prey, softening them down into mush to fuel your next hunt.",
+		"Your %belly churns %prey down into a hot slush. You can feel the nutrients coursing through your digestive track with a series of long, wet glorps.")
+
+	var/list/digest_messages_prey = list(
+		"Your body succumbs to %pred's digestive system, which breaks you apart into soft slurry.",
+		"%pred's %belly lets out a lewd glorp as their muscles grind you into a warm pulp.",
+		"%pred's %belly lets out a rumble as it melts you into sludge.",
+		"%pred feels a soft gurgle as your body loses form in their %belly. You're nothing but a soft mass of churning slop now.",
+		"%pred's %belly begins gushing your remains through their system, adding some extra weight to %pred's thighs.",
+		"%pred's %belly begins gushing your remains through their system, adding some extra weight to %pred's rump.",
+		"%pred's %belly begins gushing your remains through their system, adding some extra weight to %pred's belly.",
+		"%pred's %belly groans as you fall apart into a thick soup. Your remains soon flow deeper into %pred's body to be absorbed.",
+		"%pred's %belly kneads on every fiber of your body, softening you down into mush to fuel their next hunt.",
+		"%pred's %belly churns you down into a hot slush. Your nutrient-rich remains course through their digestive track with a series of long, wet glorps.")
+
+	var/list/examine_messages = list(
+		"They have something solid in their %belly!",
+		"It looks like they have something in their %belly!")
+
+	//Mostly for being overridden on precreated bellies on mobs. Could be VV'd into
+	//a carbon's belly if someone really wanted. No UI for carbons to adjust this.
+	//List has indexes that are the digestion mode strings, and keys that are lists of strings.
+	var/tmp/list/emote_lists = list()
+
+//For serialization, keep this updated, required for bellies to save correctly.
+/obj/belly/vars_to_save()
+	return ..() + list(
+		"name",
+		"desc",
+		"vore_sound",
+		"vore_verb",
+		"release_sound",
+		"human_prey_swallow_time",
+		"nonhuman_prey_swallow_time",
+		"emote_time",
+		"digest_brute",
+		"digest_burn",
+		"immutable",
+		"can_taste",
+		"escapable",
+		"escapetime",
+		"digestchance",
+		"absorbchance",
+		"escapechance",
+		"transferchance",
+		"transferlocation",
+		"bulge_size",
+		"struggle_messages_outside",
+		"struggle_messages_inside",
+		"digest_messages_owner",
+		"digest_messages_prey",
+		"examine_messages",
+		"emote_lists",
+		"silent"
+		)
+
+		//ommitted list
+		// "shrink_grow_size",
+/obj/belly/New(var/newloc)
+	. = ..(newloc)
+	//If not, we're probably just in a prefs list or something.
+	if(isliving(newloc))
+		owner = loc
+		owner.vore_organs |= src
+		SSbellies.belly_list += src
+
+/obj/belly/Destroy()
+	SSbellies.belly_list -= src
+	if(owner)
+		owner.vore_organs -= src
+		owner = null
+	. = ..()
+
+// Called whenever an atom enters this belly
+/obj/belly/Entered(var/atom/movable/thing,var/atom/OldLoc)
+	if(OldLoc in contents)
+		return //Someone dropping something (or being stripdigested)
+
+	//Generic entered message
+	to_chat(owner,"<span class='notice'>[thing] slides into your [lowertext(name)].</span>")
+
+	//Sound w/ antispam flag setting
+	if(!silent && !recent_sound)
+		for(var/mob/M in get_hearers_in_view(5, get_turf(owner)))
+			if(M.client && M.client.prefs.toggles & EATING_NOISES)
+				playsound(get_turf(owner),"[src.vore_sound]",50,0,-5,0,ignore_walls = FALSE,channel=CHANNEL_PRED)
+				recent_sound = TRUE
+
+	//Messages if it's a mob
+	if(isliving(thing))
+		var/mob/living/M = thing
+		if(desc)
+			to_chat(M, "<span class='notice'><B>[desc]</B></span>")
+		var/taste
+		if(can_taste && (taste = M.get_taste_message(FALSE)))
+			to_chat(owner, "<span class='notice'>[M] tastes of [taste].</span>")
+
+// Release all contents of this belly into the owning mob's location.
+// If that location is another mob, contents are transferred into whichever of its bellies the owning mob is in.
+// Returns the number of mobs so released.
+/obj/belly/proc/release_all_contents(var/include_absorbed = FALSE)
+	var/atom/destination = drop_location()
+	var/count = 0
+	for(var/thing in contents)
+		var/atom/movable/AM = thing
+		if(isliving(AM))
+			var/mob/living/L = AM
+			if(L.absorbed && !include_absorbed)
+				continue
+			L.absorbed = FALSE
+		for(var/mob/living/W in AM)
+			W.stop_sound_channel(CHANNEL_PREYLOOP)
+		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(5, get_turf(owner)))
+		if(M.client && M.client.prefs.toggles & EATING_NOISES)
+			playsound(get_turf(owner),"[src.release_sound]",50,0,-5,0,ignore_walls = FALSE,channel=CHANNEL_PRED)
+	items_preserved.Cut()
+	owner.visible_message("<font color='green'><b>[owner] expels everything from their [lowertext(name)]!</b></font>")
+	owner.update_icons()
+
+	return count
+
+// Release a specific atom from the contents of this belly into the owning mob's location.
+// If that location is another mob, the atom is transferred into whichever of its bellies the owning mob is in.
+// Returns the number of atoms so released.
+/obj/belly/proc/release_specific_contents(var/atom/movable/M)
+	if (!(M in contents))
+		return FALSE // They weren't in this belly anyway
+
+	M.forceMove(drop_location())  // Move the belly contents into the same location as belly's owner.
+	items_preserved -= M
+	for(var/mob/living/P in M)
+		P.stop_sound_channel(CHANNEL_PREYLOOP)
+	if(release_sound)
+		for(var/mob/H in get_hearers_in_view(5, get_turf(owner)))
+			if(H.client && H.client.prefs.toggles & EATING_NOISES)
+				playsound(get_turf(owner),"[src.release_sound]",50,0,-5,0,ignore_walls = FALSE,channel=CHANNEL_PRED)
+
+	if(istype(M,/mob/living))
+		var/mob/living/ML = M
+		var/mob/living/OW = owner
+		if(ML.absorbed)
+			ML.absorbed = FALSE
+			if(ishuman(M) && ishuman(OW))
+				var/mob/living/carbon/human/Prey = M
+				var/mob/living/carbon/human/Pred = OW
+				var/absorbed_count = 2 //Prey that we were, plus the pred gets a portion
+				for(var/mob/living/P in contents)
+					if(P.absorbed)
+						absorbed_count++
+				Pred.reagents.trans_to(Prey, Pred.reagents.total_volume / absorbed_count)
+
+	owner.visible_message("<font color='green'><b>[owner] expels [M] from their [lowertext(name)]!</b></font>")
+	owner.update_icons()
+	return TRUE
+
+// Actually perform the mechanics of devouring the tasty prey.
+// The purpose of this method is to avoid duplicate code, and ensure that all necessary
+// steps are taken.
+/obj/belly/proc/nom_mob(var/mob/prey, var/mob/user)
+	var/sound/preyloop = sound('sound/vore/prey/loop.ogg', repeat = TRUE)
+	if(owner.stat == DEAD)
+		return
+	if (prey.buckled)
+		prey.buckled.unbuckle_mob(prey,TRUE)
+
+	prey.forceMove(src)
+	prey.playsound_local(loc,preyloop,70,0, channel = CHANNEL_PREYLOOP)
+	owner.updateVRPanel()
+
+	for(var/mob/living/M in contents)
+		M.updateVRPanel()
+
+	// Setup the autotransfer checks if needed
+	if(transferlocation && autotransferchance > 0)
+		addtimer(CALLBACK(src, /obj/belly/.proc/check_autotransfer, prey), autotransferwait)
+
+/obj/belly/proc/check_autotransfer(var/mob/prey)
+	// Some sanity checks
+	if(transferlocation && (autotransferchance > 0) && (prey in contents))
+		if(prob(autotransferchance))
+			// Double check transferlocation isn't insane
+			if(verify_transferlocation())
+				transfer_contents(prey, transferlocation)
+		else
+			// Didn't transfer, so wait before retrying
+			addtimer(CALLBACK(src, /obj/belly/.proc/check_autotransfer, prey), autotransferwait)
+
+/obj/belly/proc/verify_transferlocation()
+	for(var/I in owner.vore_organs)
+		var/obj/belly/B = owner.vore_organs[I]
+		if(B == transferlocation)
+			return TRUE
+
+	for(var/I in owner.vore_organs)
+		var/obj/belly/B = owner.vore_organs[I]
+		if(B == transferlocation)
+			transferlocation = B
+			return TRUE
+	return FALSE
+
+
+// Get the line that should show up in Examine message if the owner of this belly
+// is examined.   By making this a proc, we not only take advantage of polymorphism,
+// but can easily make the message vary based on how many people are inside, etc.
+// Returns a string which shoul be appended to the Examine output.
+/obj/belly/proc/get_examine_msg()
+	if(contents.len && examine_messages.len)
+		var/formatted_message
+		var/raw_message = pick(examine_messages)
+		var/total_bulge = 0
+
+		formatted_message = replacetext(raw_message,"%belly",lowertext(name))
+		formatted_message = replacetext(formatted_message,"%pred",owner)
+		formatted_message = replacetext(formatted_message,"%prey",english_list(contents))
+		for(var/mob/living/P in contents)
+			if(!P.absorbed) //This is required first, in case there's a person absorbed and not absorbed in a stomach.
+				total_bulge += P.mob_size
+		if(total_bulge >= bulge_size && bulge_size != 0)
+			return("<span class='warning'>[formatted_message]</span><BR>")
+		else
+			return ""
+
+// The next function gets the messages set on the belly, in human-readable format.
+// This is useful in customization boxes and such. The delimiter right now is \n\n so
+// in message boxes, this looks nice and is easily delimited.
+/obj/belly/proc/get_messages(var/type, var/delim = "\n\n")
+	ASSERT(type == "smo" || type == "smi" || type == "dmo" || type == "dmp" || type == "em")
+	var/list/raw_messages
+
+	switch(type)
+		if("smo")
+			raw_messages = struggle_messages_outside
+		if("smi")
+			raw_messages = struggle_messages_inside
+		if("dmo")
+			raw_messages = digest_messages_owner
+		if("dmp")
+			raw_messages = digest_messages_prey
+		if("em")
+			raw_messages = examine_messages
+
+	var/messages = list2text(raw_messages,delim)
+	return messages
+
+// The next function sets the messages on the belly, from human-readable var
+// replacement strings and linebreaks as delimiters (two \n\n by default).
+// They also sanitize the messages.
+/obj/belly/proc/set_messages(var/raw_text, var/type, var/delim = "\n\n")
+	ASSERT(type == "smo" || type == "smi" || type == "dmo" || type == "dmp" || type == "em")
+
+	var/list/raw_list = text2list(html_encode(raw_text),delim)
+	if(raw_list.len > 10)
+		raw_list.Cut(11)
+		testing("[owner] tried to set [lowertext(name)] with 11+ messages")
+
+	for(var/i = 1, i <= raw_list.len, i++)
+		if(length(raw_list[i]) > 160 || length(raw_list[i]) < 10) //160 is fudged value due to htmlencoding increasing the size
+			raw_list.Cut(i,i)
+			testing("[owner] tried to set [lowertext(name)] with >121 or <10 char message")
+		else
+			raw_list[i] = readd_quotes(raw_list[i])
+			//Also fix % sign for var replacement
+			raw_list[i] = replacetext(raw_list[i],"&#37;","%")
+
+	ASSERT(raw_list.len <= 10) //Sanity
+
+	switch(type)
+		if("smo")
+			struggle_messages_outside = raw_list
+		if("smi")
+			struggle_messages_inside = raw_list
+		if("dmo")
+			digest_messages_owner = raw_list
+		if("dmp")
+			digest_messages_prey = raw_list
+		if("em")
+			examine_messages = raw_list
+
+	return
+
+// Handle the death of a mob via digestion.
+// Called from the process_Life() methods of bellies that digest prey.
+// Default implementation calls M.death() and removes from internal contents.
+// Indigestable items are removed, and M is deleted.
+/obj/belly/proc/digestion_death(var/mob/living/M)
+	//M.death(1) // "Stop it he's already dead..." Basically redundant and the reason behind screaming mouse carcasses.
+	if(M.ckey)
+		message_admins("[key_name(owner)] has digested [key_name(M)] in their [lowertext(name)] ([owner ? "<a href='?_src_=holder;adminplayerobservecoodjump=1;X=[owner.x];Y=[owner.y];Z=[owner.z]'>JMP</a>" : "null"])")
+		log_attack("[key_name(owner)] digested [key_name(M)].")
+
+	// If digested prey is also a pred... anyone inside their bellies gets moved up.
+	if(is_vore_predator(M))
+		for(var/belly in M.vore_organs)
+			var/obj/belly/B = belly
+			for(var/thing in B)
+				var/atom/movable/AM = thing
+				AM.forceMove(owner.loc)
+				if(isliving(AM))
+					to_chat(AM,"As [M] melts away around you, you find yourself in [owner]'s [lowertext(name)]")
+
+	//Drop all items into the belly
+	for(var/obj/item/W in M)
+		if(!M.dropItemToGround(W))
+			qdel(W)
+
+/*	//Reagent transfer //maybe someday
+	if(ishuman(owner))
+		var/mob/living/carbon/human/Pred = owner
+		if(ishuman(M))
+			var/mob/living/carbon/human/Prey = M
+			Prey.bloodstr.del_reagent("numbenzyme")
+			Prey.bloodstr.trans_to_holder(Pred.bloodstr, Prey.bloodstr.total_volume, 0.5, TRUE) // Copy=TRUE because we're deleted anyway
+			Prey.ingested.trans_to_holder(Pred.bloodstr, Prey.ingested.total_volume, 0.5, TRUE) // Therefore don't bother spending cpu
+			Prey.touching.trans_to_holder(Pred.bloodstr, Prey.touching.total_volume, 0.5, TRUE) // On updating the prey's reagents
+		else if(M.reagents)
+			M.reagents.trans_to_holder(Pred.bloodstr, M.reagents.total_volume, 0.5, TRUE) */
+
+	// Delete the digested mob
+	qdel(M)
+
+// Handle a mob being absorbed
+/obj/belly/proc/absorb_living(var/mob/living/M)
+	M.absorbed = TRUE
+	to_chat(M,"<span class='notice'>[owner]'s [lowertext(name)] absorbs your body, making you part of them.</span>")
+	to_chat(owner,"<span class='notice'>Your [lowertext(name)] absorbs [M]'s body, making them part of you.</span>")
+
+// Reagent sharing is neat, but eh. I'll figure it out later
+/*	if(ishuman(M) && ishuman(owner))
+		var/mob/living/carbon/human/Prey = M
+		var/mob/living/carbon/human/Pred = owner
+		//Reagent sharing for absorbed with pred - Copy so both pred and prey have these reagents.
+		Prey.bloodstr.trans_to_holder(Pred.bloodstr, Prey.bloodstr.total_volume, copy = TRUE)
+		Prey.ingested.trans_to_holder(Pred.bloodstr, Prey.ingested.total_volume, copy = TRUE)
+		Prey.touching.trans_to_holder(Pred.bloodstr, Prey.touching.total_volume, copy = TRUE)
+		// TODO - Find a way to make the absorbed prey share the effects with the pred.
+		// Currently this is infeasible because reagent containers are designed to have a single my_atom, and we get
+		// problems when A absorbs B, and then C absorbs A,  resulting in B holding onto an invalid reagent container.
+*/
+	//This is probably already the case, but for sub-prey, it won't be.
+	if(M.loc != src)
+		M.forceMove(src)
+
+	//Seek out absorbed prey of the prey, absorb them too.
+	//This in particular will recurse oddly because if there is absorbed prey of prey of prey...
+	//it will just move them up one belly. This should never happen though since... when they were
+	//absobred, they should have been absorbed as well!
+	for(var/belly in M.vore_organs)
+		var/obj/belly/B = belly
+		for(var/mob/living/Mm in B)
+			if(Mm.absorbed)
+				absorb_living(Mm)
+
+	//Update owner
+	owner.updateVRPanel()
+
+//Digest a single item
+//Receives a return value from digest_act that's how much nutrition
+//the item should be worth
+/obj/belly/proc/digest_item(var/obj/item/item)
+	var/digested = item.digest_act(src, owner)
+	if(!digested)
+		items_preserved |= item
+	else
+//		owner.nutrition += (5 * digested) // haha no.
+		if(iscyborg(owner))
+			var/mob/living/silicon/robot/R = owner
+			R.cell.charge += (50 * digested)
+
+//Determine where items should fall out of us into.
+//Typically just to the owner's location.
+/obj/belly/drop_location()
+	//Should be the case 99.99% of the time
+	if(owner)
+		return owner.loc
+	//Sketchy fallback for safety, put them somewhere safe.
+	else if(ismob(src))
+		testing("[src] (\ref[src]) doesn't have an owner, and dropped someone at a latespawn point!")
+		SSjob.SendToLateJoin(src)
+		// wew lad. let's see if this never gets used, hopefully
+	else
+		qdel(src) //final option, I guess.
+		testing("[src] (\ref[src]) was QDEL'd for not having a drop_location!")
+
+//Handle a mob struggling
+// Called from /mob/living/carbon/relaymove()
+/obj/belly/proc/relay_resist(var/mob/living/R)
+	if (!(R in contents))
+		return  // User is not in this belly
+
+	R.setClickCooldown(50)
+
+	if(owner.stat || !owner.client && R.a_intent != INTENT_HELP) //If owner is stat (dead, KO) we can actually escape
+		to_chat(R,"<span class='warning'>You attempt to climb out of \the [lowertext(name)]. (This will take around 5 seconds.)</span>")
+		to_chat(owner,"<span class='warning'>Someone is attempting to climb out of your [lowertext(name)]!</span>")
+
+		if(do_after(R, 50, owner))
+			if(owner.stat && (R in contents) && R.a_intent != INTENT_HELP) //Can still escape and want to?
+				release_specific_contents(R)
+				return
+			else if(!(R in contents)) //Aren't even in the belly. Quietly fail.
+				return
+			else //Belly became inescapable or mob revived
+				to_chat(R,"<span class='warning'>Your attempt to escape [lowertext(name)] has failed!</span>")
+				to_chat(owner,"<span class='notice'>The attempt to escape from your [lowertext(name)] has failed!</span>")
+				return
+			return
+	var/struggle_outer_message = pick(struggle_messages_outside)
+	var/struggle_user_message = pick(struggle_messages_inside)
+
+	struggle_outer_message = replacetext(struggle_outer_message,"%pred",owner)
+	struggle_outer_message = replacetext(struggle_outer_message,"%prey",R)
+	struggle_outer_message = replacetext(struggle_outer_message,"%belly",lowertext(name))
+
+	struggle_user_message = replacetext(struggle_user_message,"%pred",owner)
+	struggle_user_message = replacetext(struggle_user_message,"%prey",R)
+	struggle_user_message = replacetext(struggle_user_message,"%belly",lowertext(name))
+
+	struggle_outer_message = "<span class='alert'>" + struggle_outer_message + "</span>"
+	struggle_user_message = "<span class='alert'>" + struggle_user_message + "</span>"
+
+	for(var/mob/M in get_hearers_in_view(3, get_turf(owner)))
+		M.show_message(struggle_outer_message, 2) // hearable
+		to_chat(R,struggle_user_message)
+
+	if(!silent)
+		for(var/mob/M in get_hearers_in_view(5, get_turf(owner)))
+			if(M.client && M.client.prefs.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)
+
+	if(R.a_intent != INTENT_HELP) //If on non help intent
+		to_chat(R,"<span class='warning'>You start to climb out of \the [lowertext(name)].</span>")
+		to_chat(owner,"<span class='warning'>Someone is attempting to climb out of your [lowertext(name)]!</span>")
+		if(do_after(R, escapetime, owner))
+			if((owner.stat || !owner.client || escapable) && (R in contents))
+				release_specific_contents(R)
+				to_chat(R,"<span class='warning'>You climb out of \the [lowertext(name)].</span>")
+				to_chat(owner,"<span class='warning'>[R] climbs out of your [lowertext(name)]!</span>")
+				for(var/mob/M in hearers(4, owner))
+					M.show_message("<span class='warning'>[R] climbs out of [owner]'s [lowertext(name)]!</span>", 2)
+				return
+			else if(!istype(loc, /obj/belly)) //Aren't even in the belly. Quietly fail.
+				return
+			else //Belly became inescapable.
+				to_chat(R,"<span class='warning'>Your attempt to escape [lowertext(name)] has failed!</span>")
+				to_chat(owner,"<span class='notice'>The attempt to escape from your [lowertext(name)] has failed!</span>")
+				return
+
+	else if(prob(transferchance) && transferlocation) //Next, let's have it see if they end up getting into an even bigger mess then when they started.
+		var/obj/belly/dest_belly
+		for(var/belly in owner.vore_organs)
+			var/obj/belly/B = belly
+			if(B.name == transferlocation)
+				dest_belly = B
+				break
+		if(!dest_belly)
+			to_chat(owner, "<span class='warning'>Something went wrong with your belly transfer settings. Your <b>[lowertext(name)]</b> has had it's transfer chance and transfer location cleared as a precaution.</span>")
+			transferchance = 0
+			transferlocation = null
+			return
+
+		to_chat(R,"<span class='warning'>Your attempt to escape [lowertext(name)] has failed and your struggles only results in you sliding into [owner]'s [transferlocation]!</span>")
+		to_chat(owner,"<span class='warning'>Someone slid into your [transferlocation] due to their struggling inside your [lowertext(name)]!</span>")
+		transfer_contents(R, dest_belly)
+		return
+/*
+		else if(prob(absorbchance) && digest_mode != DM_ABSORB) //After that, let's have it run the absorb chance.
+			to_chat(R,"<span class='warning'>In response to your struggling, \the [lowertext(name)] begins to cling more tightly...</span>")
+			to_chat(owner,"<span class='warning'>You feel your [lowertext(name)] start to cling onto its contents...</span>")
+			digest_mode = DM_ABSORB
+			return
+
+		else if(prob(digestchance) && digest_mode != DM_ITEMWEAK && digest_mode != DM_DIGEST) //Finally, let's see if it should run the digest chance.
+			to_chat(R,"<span class='warning'>In response to your struggling, \the [lowertext(name)] begins to get more active...</span>")
+			to_chat(owner,"<span class='warning'>You feel your [lowertext(name)] beginning to become active!</span>")
+			digest_mode = DM_ITEMWEAK
+			return
+
+		else if(prob(digestchance) && digest_mode == DM_ITEMWEAK) //Oh god it gets even worse if you fail twice!
+			to_chat(R,"<span class='warning'>In response to your struggling, \the [lowertext(name)] begins to get even more active!</span>")
+			to_chat(owner,"<span class='warning'>You feel your [lowertext(name)] beginning to become even more active!</span>")
+			digest_mode = DM_DIGEST
+			return */
+	else if(prob(digestchance)) //Finally, let's see if it should run the digest chance.)
+		to_chat(R, "<span class='warning'>In response to your struggling, \the [name] begins to get more active...</span>")
+		to_chat(owner, "<span class='warning'>You feel your [name] beginning to become active!</span>")
+		digest_mode = DM_DIGEST
+		return
+
+	else //Nothing interesting happened.
+		to_chat(R,"<span class='warning'>You make no progress in escaping [owner]'s [lowertext(name)].</span>")
+		to_chat(owner,"<span class='warning'>Your prey appears to be unable to make any progress in escaping your [lowertext(name)].</span>")
+		return
+
+//Transfers contents from one belly to another
+/obj/belly/proc/transfer_contents(var/atom/movable/content, var/obj/belly/target, silent = FALSE)
+	if(!(content in src) || !istype(target))
+		return
+	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.toggles & EATING_NOISES)
+				playsound(get_turf(owner),"[src.vore_sound]",50,0,-5,0,ignore_walls = FALSE,channel=CHANNEL_PRED)
+	owner.updateVRPanel()
+	for(var/mob/living/M in contents)
+		M.updateVRPanel()
+
+// Belly copies and then returns the copy
+// Needs to be updated for any var changes
+/obj/belly/proc/copy(mob/new_owner)
+	var/obj/belly/dupe = new /obj/belly(new_owner)
+
+	//// Non-object variables
+	dupe.name = name
+	dupe.desc = desc
+	dupe.vore_sound = vore_sound
+	dupe.vore_verb = vore_verb
+	dupe.release_sound = release_sound
+	dupe.human_prey_swallow_time = human_prey_swallow_time
+	dupe.nonhuman_prey_swallow_time = nonhuman_prey_swallow_time
+	dupe.emote_time = emote_time
+	dupe.digest_brute = digest_brute
+	dupe.digest_burn = digest_burn
+	dupe.immutable = immutable
+	dupe.can_taste = can_taste
+	dupe.escapable = escapable
+	dupe.escapetime = escapetime
+	dupe.digestchance = digestchance
+	dupe.absorbchance = absorbchance
+	dupe.escapechance = escapechance
+	dupe.transferchance = transferchance
+	dupe.transferlocation = transferlocation
+	dupe.bulge_size = bulge_size
+//	dupe.shrink_grow_size = shrink_grow_size
+
+	//// Object-holding variables
+	//struggle_messages_outside - strings
+	dupe.struggle_messages_outside.Cut()
+	for(var/I in struggle_messages_outside)
+		dupe.struggle_messages_outside += I
+
+	//struggle_messages_inside - strings
+	dupe.struggle_messages_inside.Cut()
+	for(var/I in struggle_messages_inside)
+		dupe.struggle_messages_inside += I
+
+	//digest_messages_owner - strings
+	dupe.digest_messages_owner.Cut()
+	for(var/I in digest_messages_owner)
+		dupe.digest_messages_owner += I
+
+	//digest_messages_prey - strings
+	dupe.digest_messages_prey.Cut()
+	for(var/I in digest_messages_prey)
+		dupe.digest_messages_prey += I
+
+	//examine_messages - strings
+	dupe.examine_messages.Cut()
+	for(var/I in examine_messages)
+		dupe.examine_messages += I
+
+	//emote_lists - index: digest mode, key: list of strings
+	dupe.emote_lists.Cut()
+	for(var/K in emote_lists)
+		dupe.emote_lists[K] = list()
+		for(var/I in emote_lists[K])
+			dupe.emote_lists[K] += I
+	dupe.silent = silent
+
+	return dupe

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

@@ -0,0 +1,186 @@
+// Process the predator's effects upon the contents of its belly (i.e digestion/transformation etc)
+/obj/belly/proc/process_belly(var/times_fired,var/wait) //Passed by controller
+	if((times_fired < next_process) || !contents.len)
+		recent_sound = FALSE
+		return SSBELLIES_IGNORED
+
+	if(loc != owner)
+		if(istype(owner))
+			loc = owner
+		else
+			qdel(src)
+			return SSBELLIES_PROCESSED
+
+	next_process = times_fired + (6 SECONDS/wait) //Set up our next process time.
+
+/////////////////////////// Auto-Emotes ///////////////////////////
+	if(contents.len && next_emote <= times_fired)
+		next_emote = times_fired + round(emote_time/wait,1)
+		var/list/EL = emote_lists[digest_mode]
+		for(var/mob/living/M in contents)
+			if(M.digestable || !(digest_mode == DM_DIGEST)) // don't give digesty messages to indigestible people
+				to_chat(M,"<span class='notice'>[pick(EL)]</span>")
+
+/////////////////////////// Exit Early ////////////////////////////
+	var/list/touchable_items = contents - items_preserved
+	if(!length(touchable_items))
+		return SSBELLIES_PROCESSED
+
+////////////////////////// Sound vars /////////////////////////////
+	var/sound/prey_digest = sound(get_sfx("digest_prey"))
+	var/sound/prey_death = sound(get_sfx("death_prey"))
+
+
+///////////////////////////// DM_HOLD /////////////////////////////
+	if(digest_mode == DM_HOLD)
+		return SSBELLIES_PROCESSED
+
+//////////////////////////// DM_DIGEST ////////////////////////////
+	else if(digest_mode == DM_DIGEST)
+		for (var/mob/living/M in contents)
+			if(prob(25))
+				M.stop_sound_channel(CHANNEL_DIGEST)
+				for(var/mob/H in get_hearers_in_view(5, get_turf(owner)))
+					if(H.client && H.client.prefs.toggles & DIGESTION_NOISES)
+						playsound(get_turf(owner),"digest_pred",50,0,-5,0,ignore_walls = FALSE,channel=CHANNEL_DIGEST)
+				M.stop_sound_channel(CHANNEL_DIGEST)
+				M.playsound_local(get_turf(M), prey_digest, 45)
+
+			//Pref protection!
+			if (!M.digestable || M.absorbed)
+				continue
+
+			//Person just died in guts!
+			if(M.stat == DEAD)
+				var/digest_alert_owner = pick(digest_messages_owner)
+				var/digest_alert_prey = pick(digest_messages_prey)
+
+				//Replace placeholder vars
+				digest_alert_owner = replacetext(digest_alert_owner,"%pred",owner)
+				digest_alert_owner = replacetext(digest_alert_owner,"%prey",M)
+				digest_alert_owner = replacetext(digest_alert_owner,"%belly",lowertext(name))
+
+				digest_alert_prey = replacetext(digest_alert_prey,"%pred",owner)
+				digest_alert_prey = replacetext(digest_alert_prey,"%prey",M)
+				digest_alert_prey = replacetext(digest_alert_prey,"%belly",lowertext(name))
+
+				//Send messages
+				to_chat(owner, "<span class='warning'>[digest_alert_owner]</span>")
+				to_chat(M, "<span class='warning'>[digest_alert_prey]</span>")
+				M.visible_message("<span class='notice'>You watch as [owner]'s form loses its additions.</span>")
+
+				owner.nutrition += 400 // so eating dead mobs gives you *something*.
+				M.stop_sound_channel(DIGESTION_NOISES)
+				for(var/mob/H in get_hearers_in_view(5, get_turf(owner)))
+					if(H.client && H.client.prefs.toggles & DIGESTION_NOISES)
+						playsound(get_turf(owner),"death_pred",50,0,-5,0,ignore_walls = FALSE,channel=CHANNEL_DIGEST)
+				M.stop_sound_channel(DIGESTION_NOISES)
+				M.stop_sound_channel(CHANNEL_PREYLOOP)
+				M.playsound_local(get_turf(M), prey_death, 65)
+				digestion_death(M)
+				owner.update_icons()
+				continue
+
+
+			// Deal digestion damage (and feed the pred)
+			if(!(M.status_flags & GODMODE))
+				M.adjustFireLoss(digest_burn)
+				owner.nutrition += 1
+
+		//Contaminate or gurgle items
+		var/obj/item/T = pick(touchable_items)
+		if(istype(T))
+			if(istype(T,/obj/item/reagent_containers/food) || istype(T,/obj/item/organ))
+				digest_item(T)
+
+		owner.updateVRPanel()
+
+///////////////////////////// DM_HEAL /////////////////////////////
+	if(digest_mode == DM_HEAL)
+		for (var/mob/living/M in contents)
+			if(prob(25))
+				M.stop_sound_channel(CHANNEL_DIGEST)
+				for(var/mob/H in get_hearers_in_view(5, get_turf(owner)))
+					if(H.client && H.client.prefs.toggles & DIGESTION_NOISES)
+						playsound(get_turf(owner),"digest_pred",50,0,-5,0,ignore_walls = FALSE,channel=CHANNEL_DIGEST)
+				M.stop_sound_channel(CHANNEL_DIGEST)
+				M.playsound_local(get_turf(M), prey_digest, 65)
+
+			if(M.stat != DEAD)
+				if(owner.nutrition >= NUTRITION_LEVEL_STARVING && (M.health < M.maxHealth))
+					M.adjustBruteLoss(-3)
+					M.adjustFireLoss(-3)
+					owner.nutrition -= 5
+		return
+
+////////////////////////// DM_NOISY /////////////////////////////////
+//for when you just want people to squelch around
+	if(digest_mode == DM_NOISY)
+		for (var/mob/living/M in contents)
+			if(prob(35))
+				M.stop_sound_channel(CHANNEL_DIGEST)
+				for(var/mob/H in get_hearers_in_view(5, get_turf(owner)))
+					if(H.client && H.client.prefs.toggles & DIGESTION_NOISES)
+						playsound(get_turf(owner),"digest_pred",50,0,-5,0,ignore_walls = FALSE,channel=CHANNEL_DIGEST)
+				M.stop_sound_channel(CHANNEL_PRED)
+				M.playsound_local(get_turf(M), prey_digest, 65)
+
+
+//////////////////////////DM_DRAGON /////////////////////////////////////
+//because dragons need snowflake guts
+	if(digest_mode == DM_DRAGON)
+		for (var/mob/living/M in contents)
+			if(prob(25))
+				M.stop_sound_channel(CHANNEL_DIGEST)
+				for(var/mob/H in get_hearers_in_view(5, get_turf(owner)))
+					if(H.client && H.client.prefs.toggles & DIGESTION_NOISES)
+						playsound(get_turf(owner),"digest_pred",50,0,-5,0,ignore_walls = FALSE,channel=CHANNEL_DIGEST)
+				M.stop_sound_channel(CHANNEL_DIGEST)
+				M.playsound_local(get_turf(M), prey_digest, 65)
+
+		//No digestion protection for megafauna.
+
+		//Person just died in guts!
+			if(M.stat == DEAD)
+				var/digest_alert_owner = pick(digest_messages_owner)
+				var/digest_alert_prey = pick(digest_messages_prey)
+
+				//Replace placeholder vars
+				digest_alert_owner = replacetext(digest_alert_owner,"%pred",owner)
+				digest_alert_owner = replacetext(digest_alert_owner,"%prey",M)
+				digest_alert_owner = replacetext(digest_alert_owner,"%belly",lowertext(name))
+
+				digest_alert_prey = replacetext(digest_alert_prey,"%pred",owner)
+				digest_alert_prey = replacetext(digest_alert_prey,"%prey",M)
+				digest_alert_prey = replacetext(digest_alert_prey,"%belly",lowertext(name))
+
+				//Send messages
+				to_chat(owner, "<span class='warning'>[digest_alert_owner]</span>")
+				to_chat(M, "<span class='warning'>[digest_alert_prey]</span>")
+				M.visible_message("<span class='notice'>You watch as [owner]'s guts loudly rumble as it finishes off a meal.</span>")
+
+				M.stop_sound_channel(CHANNEL_DIGEST)
+				for(var/mob/H in get_hearers_in_view(5, get_turf(owner)))
+					if(H.client && H.client.prefs.toggles & DIGESTION_NOISES)
+						playsound(get_turf(owner),"death_pred",50,0,-5,0,ignore_walls = FALSE,channel=CHANNEL_DIGEST)
+				M.stop_sound_channel(CHANNEL_DIGEST)
+				M.playsound_local(get_turf(M), prey_death, 65)
+				M.spill_organs(FALSE,TRUE,TRUE)
+				M.stop_sound_channel(CHANNEL_PREYLOOP)
+				digestion_death(M)
+				owner.update_icons()
+				continue
+
+
+			// Deal digestion damage (and feed the pred)
+			if(!(M.status_flags & GODMODE))
+				M.adjustFireLoss(digest_burn)
+				M.adjustToxLoss(2) // something something plasma based acids
+				M.adjustCloneLoss(1) // eventually this'll kill you if you're healing everything else, you nerds.
+			//Contaminate or gurgle items
+		var/obj/item/T = pick(touchable_items)
+		if(istype(T))
+			if(istype(T,/obj/item/reagent_containers/food) || istype(T,/obj/item/organ))
+				digest_item(T)
+
+		owner.updateVRPanel()

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

@@ -0,0 +1,119 @@
+//Please make sure to:
+//return FALSE: You are not going away, stop asking me to digest.
+//return non-negative integer: Amount of nutrition/charge gained (scaled to nutrition, other end can multiply for charge scale).
+
+// Ye default implementation.
+/obj/item/proc/digest_act(var/atom/movable/item_storage = null)
+	for(var/obj/item/O in contents)
+		if(istype(O,/obj/item/storage/internal)) //Dump contents from dummy pockets.
+			for(var/obj/item/SO in O)
+				if(item_storage)
+					SO.forceMove(item_storage)
+				qdel(O)
+		else if(item_storage)
+			O.forceMove(item_storage)
+
+	qdel(src)
+	return w_class
+
+/////////////
+// Some indigestible stuff
+/////////////
+/obj/item/hand_tele/digest_act(...)
+	return FALSE
+/obj/item/card/id/digest_act(...)
+	return FALSE
+/obj/item/aicard/digest_act(...)
+	return FALSE
+/obj/item/paicard/digest_act(...)
+	return FALSE
+/obj/item/pinpointer/digest_act(...)
+	return FALSE
+/obj/item/disk/nuclear/digest_act(...)
+	return FALSE
+/obj/item/device/perfect_tele_beacon/digest_act(...)
+	return FALSE //Sorta important to not digest your own beacons.
+/obj/item/device/pda/digest_act(...)
+	return FALSE
+/obj/item/gun/digest_act(...)
+	return FALSE
+/obj/item/clothing/shoes/magboots/digest_act(...)
+	return FALSE
+/obj/item/clothing/head/helmet/space/digest_act(...)
+	return FALSE
+/obj/item/clothing/suit/space/digest_act(...)
+	return FALSE
+/obj/item/reagent_containers/hypospray/CMO/digest_act(...)
+	return FALSE
+/obj/item/tank/jetpack/oxygen/captain/digest_act(...)
+	return FALSE
+/obj/item/clothing/accessory/medal/gold/captain/digest_act(...)
+	return FALSE
+/obj/item/clothing/suit/armor/digest_act(...)
+	return FALSE
+/obj/item/documents/digest_act(...)
+	return FALSE
+/obj/item/nuke_core/digest_act(...)
+	return FALSE
+/obj/item/nuke_core_container/digest_act(...)
+	return FALSE
+/obj/item/areaeditor/blueprints/digest_act(...)
+	return FALSE
+/obj/item/documents/syndicate/digest_act(...)
+	return FALSE
+/obj/item/bombcore/digest_act(...)
+	return FALSE
+/obj/item/grenade/digest_act(...)
+	return FALSE
+/obj/item/storage/digest_act(...)
+	return FALSE
+
+/////////////
+// Some special treatment
+/////////////
+/*
+//PDAs need to lose their ID to not take it with them, so we can get a digested ID
+/obj/item/device/pda/digest_act(var/atom/movable/item_storage = null)
+	if(id)
+		id = null
+
+	. = ..()
+*/
+
+/obj/item/reagent_containers/food/digest_act(var/atom/movable/item_storage = null)
+	if(isbelly(item_storage))
+		var/obj/belly/B = item_storage
+		if(ishuman(B.owner))
+			var/mob/living/carbon/human/H = B.owner
+			reagents.trans_to(H, (reagents.total_volume * 0.3), 1, 0)
+		else if(iscyborg(B.owner))
+			var/mob/living/silicon/robot/R = B.owner
+			R.cell.charge += 150
+
+	. = ..()
+
+/*
+/obj/item/holder/digest_act(var/atom/movable/item_storage = null)
+	for(var/mob/living/M in contents)
+		if(item_storage)
+			M.forceMove(item_storage)
+	held_mob = null
+
+	. = ..() */
+
+/obj/item/organ/digest_act(var/atom/movable/item_storage = null)
+	if((. = ..()))
+		. += 70 //Organs give a little more
+
+/obj/item/storage/digest_act(var/atom/movable/item_storage = null)
+	for(var/obj/item/I in contents)
+		I.screen_loc = null
+
+	. = ..()
+
+/////////////
+// Some more complicated stuff
+/////////////
+/obj/item/device/mmi/digital/posibrain/digest_act(var/atom/movable/item_storage = null)
+	//Replace this with a VORE setting so all types of posibrains can/can't be digested on a whim
+	return FALSE

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

@@ -0,0 +1,459 @@
+///////////////////// Mob Living /////////////////////
+/mob/living
+	var/digestable = TRUE					// Can the mob be digested inside a belly?
+	var/obj/belly/vore_selected		// Default to no vore capability.
+	var/list/vore_organs = list()		// List of vore containers inside a mob
+	var/devourable = FALSE					// Can the mob be vored at all?
+//	var/feeding = FALSE					// Are we going to feed someone else?
+	var/vore_taste = null				// What the character tastes like
+	var/no_vore = FALSE 					// If the character/mob can vore.
+	var/openpanel = 0					// Is the vore panel open?
+	var/noisy = FALSE					// tummies are rumbly?
+	var/absorbed = FALSE				//are we absorbed?
+
+//
+// Hook for generic creation of stuff on new creatures
+//
+/hook/living_new/proc/vore_setup(mob/living/M)
+	M.verbs += /mob/living/proc/preyloop_refresh
+	M.verbs += /mob/living/proc/lick
+	if(M.no_vore) //If the mob isn't supposed to have a stomach, let's not give it an insidepanel so it can make one for itself, or a stomach.
+		return 1
+	M.verbs += /mob/living/proc/insidePanel
+
+	//Tries to load prefs if a client is present otherwise gives freebie stomach
+	if(!M.vore_organs || !M.vore_organs.len)
+		spawn(20) //Wait a couple of seconds to make sure copy_to or whatever has gone
+			if(!M) return
+
+			if(M.client && M.client.prefs_vr)
+				if(!M.copy_from_prefs_vr())
+					to_chat(M,"<span class='warning'>ERROR: You seem to have saved vore prefs, but they couldn't be loaded.</span>")
+					return 0
+				if(M.vore_organs && M.vore_organs.len)
+					M.vore_selected = M.vore_organs[1]
+
+			if(!M.vore_organs || !M.vore_organs.len)
+				if(!M.vore_organs)
+					M.vore_organs = list()
+				var/obj/belly/B = new /obj/belly(M)
+				M.vore_selected = B
+				B.immutable = TRUE
+				B.name = "Stomach"
+				B.desc = "It appears to be rather warm and wet. Makes sense, considering it's inside \the [M.name]."
+				B.can_taste = FALSE
+
+	//Return 1 to hook-caller
+	return 1
+
+/*
+// 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
+//
+
+			// Refactored to use centralized vore code system - Leshana
+
+			// Critical adjustments due to TG grab changes - Poojawa
+
+/mob/living/proc/vore_attack(var/mob/living/user, var/mob/living/prey)
+	if(!user || !prey)
+		return
+
+	if(prey == src && user.zone_selected == "mouth") //you click your target
+//		if(!feeding(src))
+//			return
+		if(!is_vore_predator(prey))
+			to_chat(user, "<span class='notice'>They aren't voracious enough.</span>")
+			return
+		feed_self_to_grabbed(user, src)
+
+	if(user == src) //you click yourself
+		if(!is_vore_predator(src))
+			to_chat(user, "<span class='notice'>You aren't voracious enough.</span>")
+			return
+		user.feed_grabbed_to_self(src, prey)
+
+	else // click someone other than you/prey
+//		if(!feeding(src))
+//			return
+		if(!is_vore_predator(src))
+			to_chat(user, "<span class='notice'>They aren't voracious enough.</span>")
+			return
+		feed_grabbed_to_other(user, prey, src)
+//
+// Eating procs depending on who clicked what
+//
+/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)
+
+//Dragon noms need to be faster
+/mob/living/proc/dragon_feeding(var/mob/living/user, var/mob/living/prey)
+	var/belly = user.vore_selected
+	return perform_dragon(user, prey, user, belly)
+
+/mob/living/proc/perform_dragon(var/mob/living/user, var/mob/living/prey, var/mob/living/pred, var/obj/belly/belly, swallow_time = 20)
+	//Sanity
+	if(!user || !prey || !pred || !istype(belly) || !(belly in pred.vore_organs))
+		testing("[user] attempted to feed [prey] to [pred], via [lowertext(belly.name)] but it went wrong.")
+		return
+
+	// The belly selected at the time of noms
+	var/attempt_msg = "ERROR: Vore message couldn't be created. Notify a dev. (at)"
+	var/success_msg = "ERROR: Vore message couldn't be created. Notify a dev. (sc)"
+
+/*	//Final distance check. Time has passed, menus have come and gone. Can't use do_after adjacent because doesn't behave for held micros
+	var/user_to_pred = get_dist(get_turf(user),get_turf(pred))
+	var/user_to_prey = get_dist(get_turf(user),get_turf(prey)) */
+
+		// Prepare messages
+	if(user == pred) //Feeding someone to yourself
+		attempt_msg = text("<span class='warning'>[] starts to [] [] into their []!</span>",pred,lowertext(belly.vore_verb),prey,lowertext(belly.name))
+		success_msg = text("<span class='warning'>[] manages to [] [] into their []!</span>",pred,lowertext(belly.vore_verb),prey,lowertext(belly.name))
+
+	// Announce that we start the attempt!
+	user.visible_message(attempt_msg)
+
+	if(!do_mob(src, user, swallow_time))
+		return FALSE // Prey escaped (or user disabled) before timer expired.
+
+	// If we got this far, nom successful! Announce it!
+	user.visible_message(success_msg)
+	playsound(get_turf(user), "[belly.vore_sound]",75,0,-6,0)
+
+	// Actually shove prey into the belly.
+	belly.nom_mob(prey, user)
+	if (pred == user)
+		message_admins("[key_name(pred)] ate [key_name(prey)].")
+		log_attack("[key_name(pred)] ate [key_name(prey)]")
+	return TRUE
+//
+// Master vore proc that actually does vore procedures
+//
+
+/mob/living/proc/perform_the_nom(var/mob/living/user, var/mob/living/prey, var/mob/living/pred, var/obj/belly/belly, var/delay)
+	//Sanity
+	if(!user || !prey || !pred || !istype(belly) || !(belly in pred.vore_organs))
+		testing("[user] attempted to feed [prey] to [pred], via [lowertext(belly.name)] but it went wrong.")
+		return
+	if (!prey.devourable)
+		to_chat(user, "This can't be eaten!")
+		return
+	// The belly selected at the time of noms
+	var/attempt_msg = "ERROR: Vore message couldn't be created. Notify a dev. (at)"
+	var/success_msg = "ERROR: Vore message couldn't be created. Notify a dev. (sc)"
+
+/*	//Final distance check. Time has passed, menus have come and gone. Can't use do_after adjacent because doesn't behave for held micros
+	var/user_to_pred = get_dist(get_turf(user),get_turf(pred))
+	var/user_to_prey = get_dist(get_turf(user),get_turf(prey)) */
+
+	// Prepare messages
+	if(user == pred) //Feeding someone to yourself
+		attempt_msg = text("<span class='warning'>[] is attemping to [] [] into their []!</span>",pred,lowertext(belly.vore_verb),prey,lowertext(belly.name))
+		success_msg = text("<span class='warning'>[] manages to [] [] into their []!</span>",pred,lowertext(belly.vore_verb),prey,lowertext(belly.name))
+	else //Feeding someone to another person
+		attempt_msg = text("<span class='warning'>[] is attempting to make [] [] [] into their []!</span>",user,pred,lowertext(belly.vore_verb),prey,lowertext(belly.name))
+		success_msg = text("<span class='warning'>[] manages to make [] [] [] into their []!</span>",user,pred,lowertext(belly.vore_verb),prey,lowertext(belly.name))
+
+	// Announce that we start the attempt!
+	user.visible_message(attempt_msg)
+
+	// Now give the prey time to escape... return if they did
+	var/swallow_time = delay || ishuman(prey) ? belly.human_prey_swallow_time : belly.nonhuman_prey_swallow_time
+
+
+	if(!do_mob(src, user, swallow_time))
+		return FALSE // Prey escaped (or user disabled) before timer expired.
+
+	// 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)))
+		if(M.client && M.client.prefs.toggles & EATING_NOISES)
+			playsound(get_turf(user),"[belly.vore_sound]",50,0,-5,0,ignore_walls = FALSE,channel=CHANNEL_PRED)
+
+	// Actually shove prey into the belly.
+	belly.nom_mob(prey, user)
+//	user.update_icons()
+	stop_pulling()
+
+	// Flavor handling
+	if(belly.can_taste && prey.get_taste_message(FALSE))
+		to_chat(belly.owner, "<span class='notice'>[prey] tastes of [prey.get_taste_message(FALSE)].</span>")
+
+	// Inform Admins
+	var/prey_braindead
+	var/prey_stat
+	if(prey.ckey)
+		prey_stat = prey.stat//only return this if they're not an unmonkey or whatever
+		if(!prey.client)//if they disconnected, tell us
+			prey_braindead = 1
+	if (pred == user)
+		message_admins("[ADMIN_LOOKUPFLW(pred)] ate [ADMIN_LOOKUPFLW(prey)][!prey_braindead ? "" : " (BRAINDEAD)"][prey_stat ? " (DEAD/UNCONSCIOUS)" : ""].")
+		log_attack("[key_name(pred)] ate [key_name(prey)]")
+	else
+		message_admins("[ADMIN_LOOKUPFLW(user)] forced [ADMIN_LOOKUPFLW(pred)] to eat [ADMIN_LOOKUPFLW(prey)].")
+		log_attack("[key_name(user)] forced [key_name(pred)] to eat [key_name(prey)].")
+	return TRUE
+
+//
+//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/device/radio/beacon
+		if(/obj/item/device/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
+*/
+
+//
+// Release everything in every vore organ
+//
+/mob/living/proc/release_vore_contents(var/include_absorbed = TRUE)
+	for(var/belly in vore_organs)
+		var/obj/belly/B = belly
+		B.release_all_contents(include_absorbed)
+
+//
+// Custom resist catches for /mob/living
+//
+/mob/living/proc/vore_process_resist()
+
+	//Are we resisting from inside a belly?
+	if(isbelly(loc))
+		var/obj/belly/B = loc
+		B.relay_resist(src)
+		return TRUE //resist() on living does this TRUE thing.
+
+	//Other overridden resists go here
+
+	return FALSE
+
+// internal slimy button in case the loop stops playing but the player wants to hear it
+/mob/living/proc/preyloop_refresh()
+	set name = "Internal loop refresh"
+	set category = "Vore"
+	if(istype(src.loc, /obj/belly))
+		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)
+	else
+		to_chat(src, "<span class='alert'>You aren't inside anything, you clod.</span>")
+
+// OOC Escape code for pref-breaking or AFK preds
+//
+/mob/living/proc/escapeOOC()
+	set name = "Animal Escape"
+	set category = "Vore"
+
+	//You're in an animal!
+	if(istype(src.loc,/mob/living/simple_animal))
+		var/mob/living/simple_animal/pred = src.loc
+		var/confirm = alert(src, "You're in a mob. Use this as a trick to get out of hostile animals. If you are in more than one pred, use this more than once.", "Confirmation", "Okay", "Cancel")
+		if(confirm == "Okay")
+			for(var/I in pred.vore_organs)
+				var/obj/belly/B = pred.vore_organs[I]
+				B.release_specific_contents(src)
+
+			for(var/mob/living/simple_animal/SA in range(10))
+				SA.prey_excludes += src
+				spawn(18000)
+					if(src && SA)
+						SA.prey_excludes -= src
+
+			pred.update_icons()
+
+	else
+		to_chat(src, "<span class='alert'>You aren't inside anything, you clod.</span>")
+
+//
+//	Verb for saving vore preferences to save file
+//
+/mob/living/proc/save_vore_prefs()
+	if(!(client || client.prefs_vr))
+		return FALSE
+	if(!copy_to_prefs_vr())
+		return FALSE
+	if(!client.prefs_vr.save_vore())
+		return FALSE
+
+	return TRUE
+
+/mob/living/proc/apply_vore_prefs()
+	if(!(client || client.prefs_vr))
+		return FALSE
+	if(!client.prefs_vr.load_vore())
+		return FALSE
+	if(!copy_from_prefs_vr())
+		return FALSE
+
+	return TRUE
+
+/mob/living/proc/copy_to_prefs_vr()
+	if(!client || !client.prefs_vr)
+		src << "<span class='warning'>You attempted to save your vore prefs but somehow you're in this character without a client.prefs_vr variable. Tell a dev.</span>"
+		return FALSE
+
+	var/datum/vore_preferences/P = client.prefs_vr
+
+	P.digestable = src.digestable
+	P.devourable = src.devourable
+	P.vore_taste = src.vore_taste
+
+	var/list/serialized = list()
+	for(var/belly in src.vore_organs)
+		var/obj/belly/B = belly
+		serialized += list(B.serialize()) //Can't add a list as an object to another list in Byond. Thanks.
+
+	P.belly_prefs = serialized
+
+	return TRUE
+
+//
+//	Proc for applying vore preferences, given bellies
+//
+/mob/living/proc/copy_from_prefs_vr()
+	if(!client || !client.prefs_vr)
+		src << "<span class='warning'>You attempted to apply your vore prefs but somehow you're in this character without a client.prefs_vr variable. Tell a dev.</span>"
+		return FALSE
+
+	var/datum/vore_preferences/P = client.prefs_vr
+
+	digestable = P.digestable
+	devourable = P.devourable
+	vore_taste = P.vore_taste
+
+	vore_organs.Cut()
+	for(var/entry in P.belly_prefs)
+		list_to_object(entry,src)
+
+	return TRUE
+
+//
+// Returns examine messages for bellies
+//
+/mob/living/proc/examine_bellies()
+	if(!show_pudge()) //Some clothing or equipment can hide this.
+		return ""
+
+	var/message = ""
+	for (var/belly in vore_organs)
+		var/obj/belly/B = belly
+		message += B.get_examine_msg()
+
+	return message
+
+//
+// Whether or not people can see our belly messages
+//
+/mob/living/proc/show_pudge()
+	return TRUE //Can override if you want.
+
+/mob/living/carbon/human/show_pudge()
+	//A uniform could hide it.
+	if(istype(w_uniform,/obj/item/clothing))
+		var/obj/item/clothing/under = w_uniform
+		if(under.hides_bulges)
+			return FALSE
+
+	//We return as soon as we find one, no need for 'else' really.
+	if(istype(wear_suit,/obj/item/clothing))
+		var/obj/item/clothing/suit = wear_suit
+		if(suit.hides_bulges)
+			return FALSE
+
+
+	return ..()
+
+//
+// Clearly super important. Obviously.
+//
+/mob/living/proc/lick(var/mob/living/tasted in oview(1))
+	set name = "Lick Someone"
+	set category = "Vore"
+	set desc = "Lick someone nearby!"
+
+	if(!istype(tasted))
+		return
+
+	if(src == stat)
+		return
+
+	src.setClickCooldown(50)
+
+	src.visible_message("<span class='warning'>[src] licks [tasted]!</span>","<span class='notice'>You lick [tasted]. They taste rather like [tasted.get_taste_message()].</span>","<b>Slurp!</b>")
+
+
+/mob/living/proc/get_taste_message(allow_generic = TRUE, datum/species/mrace)
+	if(!vore_taste && !allow_generic)
+		return FALSE
+
+	var/taste_message = ""
+	if(vore_taste && (vore_taste != ""))
+		taste_message += "[vore_taste]"
+	else
+		if(ishuman(src))
+			taste_message += "they haven't bothered to set their flavor text"
+		else
+			taste_message += "a plain old normal [src]"
+
+/*	if(ishuman(src))
+		var/mob/living/carbon/human/H = src
+		if(H.touching.reagent_list.len) //Just the first one otherwise I'll go insane.
+			var/datum/reagent/R = H.touching.reagent_list[1]
+			taste_message += " You also get the flavor of [R.taste_description] from something on them"*/
+	return taste_message

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

@@ -0,0 +1,44 @@
+///////////////////// Simple Animal /////////////////////
+/mob/living/simple_animal
+	var/isPredator = FALSE 					//Are they capable of performing and pre-defined vore actions for their species?
+	var/swallowTime = 5 SECONDS 				//How long it takes to eat its prey in 1/10 of a second. The default is 5 seconds.
+	var/list/prey_excludes = list()		//For excluding people from being eaten.
+
+//
+// Simple proc for animals to have their digestion toggled on/off externally
+//
+/mob/living/simple_animal/verb/toggle_digestion()
+	set name = "Toggle Animal's Digestion"
+	set desc = "Enables digestion on this mob for 20 minutes."
+	set category = "Object"
+	set src in oview(1)
+
+	var/datum/belly/B = vore_organs[vore_selected]
+	if(faction != usr.faction)
+		to_chat(usr,"<span class='warning'>This predator isn't friendly, and doesn't give a shit about your opinions of it digesting you.</span>")
+		return
+	if(B.digest_mode == "Hold")
+		var/confirm = alert(usr, "Enabling digestion on [name] will cause it to digest all stomach contents. Using this to break OOC prefs is against the rules. Digestion will disable itself after 20 minutes.", "Enabling [name]'s Digestion", "Enable", "Cancel")
+		if(confirm == "Enable")
+			B.digest_mode = "Digest"
+			sleep(20 MINUTES) //12000=20 minutes
+			B.digest_mode = "Hold"
+	else
+		var/confirm = alert(usr, "This mob is currently set to digest all stomach contents. Do you want to disable this?", "Disabling [name]'s Digestion", "Disable", "Cancel")
+		if(confirm == "Disable")
+			B.digest_mode = "Hold"
+
+//
+// Simple nom proc for if you get ckey'd into a simple_animal mob! Avoids grabs.
+//
+/mob/living/simple_animal/proc/animal_nom(var/mob/living/T in oview(1))
+	set name = "Animal Nom"
+	set category = "Vore"
+	set desc = "Since you can't grab, you get a verb!"
+
+	if (stat != CONSCIOUS)
+		return
+	if (T.devourable == FALSE)
+		to_chat(usr, "<span class='warning'>You can't eat this!</span>")
+		return
+	return feed_grabbed_to_self(src,T)

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

@@ -0,0 +1,168 @@
+
+/*
+VVVVVVVV           VVVVVVVV     OOOOOOOOO     RRRRRRRRRRRRRRRRR   EEEEEEEEEEEEEEEEEEEEEE
+V::::::V           V::::::V   OO:::::::::OO   R::::::::::::::::R  E::::::::::::::::::::E
+V::::::V           V::::::V OO:::::::::::::OO R::::::RRRRRR:::::R E::::::::::::::::::::E
+V::::::V           V::::::VO:::::::OOO:::::::ORR:::::R     R:::::REE::::::EEEEEEEEE::::E
+ V:::::V           V:::::V O::::::O   O::::::O  R::::R     R:::::R  E:::::E       EEEEEE
+  V:::::V         V:::::V  O:::::O     O:::::O  R::::R     R:::::R  E:::::E
+   V:::::V       V:::::V   O:::::O     O:::::O  R::::RRRRRR:::::R   E::::::EEEEEEEEEE
+    V:::::V     V:::::V    O:::::O     O:::::O  R:::::::::::::RR    E:::::::::::::::E
+     V:::::V   V:::::V     O:::::O     O:::::O  R::::RRRRRR:::::R   E:::::::::::::::E
+      V:::::V V:::::V      O:::::O     O:::::O  R::::R     R:::::R  E::::::EEEEEEEEEE
+       V:::::V:::::V       O:::::O     O:::::O  R::::R     R:::::R  E:::::E
+        V:::::::::V        O::::::O   O::::::O  R::::R     R:::::R  E:::::E       EEEEEE
+         V:::::::V         O:::::::OOO:::::::ORR:::::R     R:::::REE::::::EEEEEEEE:::::E
+          V:::::V           OO:::::::::::::OO R::::::R     R:::::RE::::::::::::::::::::E
+           V:::V              OO:::::::::OO   R::::::R     R:::::RE::::::::::::::::::::E
+            VVV                 OOOOOOOOO     RRRRRRRR     RRRRRRREEEEEEEEEEEEEEEEEEEEEE
+
+-Aro <3 */
+
+//
+// Overrides/additions to stock defines go here, as well as hooks. Sort them by
+// the object they are overriding. So all /mob/living together, etc.
+//
+
+//
+// The datum type bolted onto normal preferences datums for storing Vore stuff
+//
+/client
+	var/datum/vore_preferences/prefs_vr
+
+/hook/client_new/proc/add_prefs_vr(client/C)
+	C.prefs_vr = new/datum/vore_preferences(C)
+	if(C.prefs_vr)
+		return TRUE
+
+	return FALSE
+
+/datum/vore_preferences
+	//Actual preferences
+	var/digestable = TRUE
+	var/devourable = FALSE
+//	var/allowmobvore = TRUE
+	var/list/belly_prefs = list()
+	var/vore_taste = "nothing in particular"
+//	var/can_be_drop_prey = FALSE
+//	var/can_be_drop_pred = FALSE
+
+	//Mechanically required
+	var/path
+	var/slot
+	var/client/client
+	var/client_ckey
+
+/datum/vore_preferences/New(client/C)
+	if(istype(C))
+		client = C
+		client_ckey = C.ckey
+		load_vore()
+
+//
+//	Check if an object is capable of eating things, based on vore_organs
+//
+/proc/is_vore_predator(var/mob/living/O)
+	if(istype(O,/mob/living))
+		if(O.vore_organs.len > 0)
+			return TRUE
+
+	return FALSE
+
+//
+//	Belly searching for simplifying other procs
+//  Mostly redundant now with belly-objects and isbelly(loc)
+//
+/proc/check_belly(atom/movable/A)
+	return isbelly(A.loc)
+
+//
+// Save/Load Vore Preferences
+//
+/datum/vore_preferences/proc/load_path(ckey,slot,filename="character",ext="json")
+	if(!ckey || !slot)	return
+	path = "data/player_saves/[copytext(ckey,1,2)]/[ckey]/vore/[filename][slot].[ext]"
+
+
+/datum/vore_preferences/proc/load_vore()
+	if(!client || !client_ckey)
+		return FALSE //No client, how can we save?
+	if(!client.prefs || !client.prefs.default_slot)
+		return FALSE //Need to know what character to load!
+
+	slot = client.prefs.default_slot
+
+	load_path(client_ckey,slot)
+
+	if(!path) return FALSE //Path couldn't be set?
+	if(!fexists(path)) //Never saved before
+		save_vore() //Make the file first
+		return TRUE
+
+	var/list/json_from_file = json_decode(file2text(path))
+	if(!json_from_file)
+		return FALSE //My concern grows
+
+	var/version = json_from_file["version"]
+	json_from_file = patch_version(json_from_file,version)
+
+	digestable = json_from_file["digestable"]
+	devourable = json_from_file["devourable"]
+//	allowmobvore = json_from_file["allowmobvore"]
+	vore_taste = json_from_file["vore_taste"]
+//	can_be_drop_prey = json_from_file["can_be_drop_prey"]
+//	can_be_drop_prey = json_from_file["can_be_drop_pred"]
+	belly_prefs = json_from_file["belly_prefs"]
+
+	//Quick sanitize
+	if(isnull(digestable))
+		digestable = TRUE
+	if(isnull(devourable))
+		devourable = FALSE
+/*	if(isnull(allowmobvore))
+		allowmobvore = TRUE
+	if(isnull(can_be_drop_prey))
+		allowmobvore = FALSE
+	if(isnull(can_be_drop_pred))
+		allowmobvore = FALSE */
+	if(isnull(belly_prefs))
+		belly_prefs = list()
+
+	return TRUE
+
+/datum/vore_preferences/proc/save_vore()
+	if(!path)				return FALSE
+
+	var/version = 1	//For "good times" use in the future
+	var/list/settings_list = list(
+			"version"				= version,
+			"digestable"			= digestable,
+			"devourable"			= devourable,
+			"vore_taste"			= vore_taste,
+			"belly_prefs"			= belly_prefs,
+		)
+
+	/* commented out list things
+	"allowmobvore"			= allowmobvore,
+	"can_be_drop_prey"		= can_be_drop_prey,
+	"can_be_drop_pred"		= can_be_drop_pred, */
+
+	//List to JSON
+	var/json_to_file = json_encode(settings_list)
+	if(!json_to_file)
+		testing("Saving: [path] failed jsonencode")
+		return FALSE
+
+	//Write it out
+	if(fexists(path))
+		fdel(path) //Byond only supports APPENDING to files, not replacing.
+	text2file(json_to_file,path)
+	if(!fexists(path))
+		testing("Saving: [path] failed file write")
+		return FALSE
+
+	return TRUE
+
+//Can do conversions here
+/datum/vore_preferences/proc/patch_version(var/list/json_from_file,var/version)
+	return json_from_file

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

@@ -0,0 +1,62 @@
+// -------------- Sickshot -------------
+/obj/item/gun/energy/sickshot
+	name = "\improper MPA6 \'Sickshot\'"
+	desc = "A device that can trigger convusions in specific areas to eject foreign material from a host. Must be used very close to a target. Not for Combat usage."
+
+	icon_state = "dragnet"
+	item_state = "dragnet"
+	ammo_x_offset = 1
+	ammo_type = list(/obj/item/ammo_casing/energy/sickshot)
+
+/obj/item/ammo_casing/energy/sickshot
+	projectile_type = /obj/item/projectile/sickshot
+	e_cost = 100
+
+//Projectile
+/obj/item/projectile/sickshot
+	name = "sickshot pulse"
+	icon_state = "e_netting"
+	damage = 0
+	damage_type = STAMINA
+	range = 2
+
+/obj/item/projectile/sickshot/on_hit(var/atom/movable/target, var/blocked = 0)
+	if(iscarbon(target))
+		var/mob/living/carbon/H = target
+		if(prob(5))
+			for(var/X in H.vore_organs)
+				H.release_vore_contents()
+				H.visible_message("<span class='danger'>[H] contracts strangely, spewing out contents on the floor!</span>", \
+ 						"<span class='userdanger'>You spew out everything inside you on the floor!</span>")
+		return
+
+
+////////////////////////// Anti-Noms Drugs //////////////////////////
+/*
+/datum/reagent/medicine/ickypak
+	name = "Ickypak"
+	id = "ickypak"
+	description = "A foul-smelling green liquid, for inducing muscle contractions to expel accidentally ingested things."
+	reagent_state = LIQUID
+	color = "#0E900E"
+	metabolization_rate = 0.25 * REAGENTS_METABOLISM
+
+/datum/reagent/medicine/ickypak/on_mob_life(var/mob/living/M, method=INGEST)
+	if(prob(10))
+		M.visible_message("<span class='danger'>[M] retches!</span>", \
+ 						"<span class='userdanger'>You don't feel good...</span>")
+	for(var/I in M.vore_organs)
+		var/datum/belly/B = M.vore_organs[I]
+		for(var/atom/movable/A in B.internal_contents)
+			if(prob(55))
+				playsound(M, 'sound/effects/splat.ogg', 50, 1)
+				B.release_specific_contents(A)
+				M.visible_message("<span class='danger'>[M] contracts strangely, spewing out something!</span>", \
+ 						"<span class='userdanger'>You spew out something from inside you!</span>")
+	return ..()
+
+/datum/chemical_reaction/ickypak
+	name = "Ickypak"
+	id = "ickypak"
+	results = list("ickypak" = 2)
+	required_reagents = list("chlorine" = 2 , "oil" = 1) */

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

@@ -0,0 +1,721 @@
+//
+// Vore management panel for players
+//
+
+#define BELLIES_MAX 20
+#define BELLIES_NAME_MIN 2
+#define BELLIES_NAME_MAX 12
+#define BELLIES_DESC_MAX 1024
+#define FLAVOR_MAX 40
+
+/mob/living/proc/insidePanel()
+	set name = "Vore Panel"
+	set category = "Vore"
+
+	var/datum/vore_look/picker_holder = new()
+	picker_holder.loop = picker_holder
+	picker_holder.selected = vore_selected
+
+	var/dat = picker_holder.gen_vui(src)
+
+	picker_holder.popup = new(src, "insidePanel","Vore Panel", 400, 600, picker_holder)
+	picker_holder.popup.set_content(dat)
+	picker_holder.popup.open()
+
+/mob/living/proc/updateVRPanel() //Panel popup update call from belly events.
+	if(src.openpanel == 1)
+		var/datum/vore_look/picker_holder = new()
+		picker_holder.loop = picker_holder
+		picker_holder.selected = vore_selected
+
+		var/dat = picker_holder.gen_vui(src)
+
+		picker_holder.popup = new(src, "insidePanel","Vore Panel", 400, 600, picker_holder)
+		picker_holder.popup.set_content(dat)
+		picker_holder.popup.open()
+
+//
+// Callback Handler for the Inside form
+//
+/datum/vore_look
+	var/obj/belly/selected
+	var/show_interacts = TRUE
+	var/datum/browser/popup
+	var/loop = null;  // Magic self-reference to stop the handler from being GC'd before user takes action.
+
+/datum/vore_look/Destroy()
+	loop = null
+	selected = null
+	return QDEL_HINT_HARDDEL
+
+/datum/vore_look/Topic(href,href_list[])
+	if (vp_interact(href, href_list))
+		popup.set_content(gen_vui(usr))
+		usr << output(popup.get_content(), "insidePanel.browser")
+
+/datum/vore_look/proc/gen_vui(var/mob/living/user)
+	var/dat
+
+	var/atom/userloc = user.loc
+	if (isbelly(userloc))
+		var/obj/belly/inside_belly = userloc
+		var/mob/living/eater = inside_belly.owner
+
+	//Don't display this part if we couldn't find the belly since could be held in hand.
+		if(inside_belly)
+			dat += "<font color = 'green'>You are currently [user.absorbed ? "absorbed into " : "inside "]</font> <font color = 'yellow'>[eater]'s</font> <font color = 'red'>[inside_belly]</font>!<br><br>"
+
+			if(inside_belly.desc)
+				dat += "[inside_belly.desc]<br><br>"
+
+			if (inside_belly.contents.len > 1)
+				dat += "You can see the following around you:<br>"
+				for (var/atom/movable/O in inside_belly)
+					if(istype(O,/mob/living))
+						var/mob/living/M = O
+						//That's just you
+						if(M == user)
+							continue
+
+						//That's an absorbed person you're checking
+						if(M.absorbed)
+							if(user.absorbed)
+								dat += "<a href='?src=\ref[src];outsidepick=\ref[O];outsidebelly=\ref[inside_belly]'><span style='color:purple;'>[O]</span></a>"
+								continue
+							else
+								continue
+
+					//Anything else
+					dat += "<a href='?src=\ref[src];outsidepick=\ref[O];outsidebelly=\ref[inside_belly]'>[O]&#8203;</a>"
+
+					//Zero-width space, for wrapping
+					dat += "&#8203;"
+	else
+		dat += "You aren't inside anyone."
+
+	dat += "<HR>"
+
+	dat += "<ol style='list-style: none; padding: 0; overflow: auto;'>"
+	for(var/belly in user.vore_organs)
+		var/obj/belly/B = belly
+		if(B == selected)
+			dat += "<li style='float: left'><a href='?src=\ref[src];bellypick=\ref[B]'><b>[B.name]</b>"
+		else
+			dat += "<li style='float: left'><a href='?src=\ref[src];bellypick=\ref[B]'>[B.name]"
+
+		var/spanstyle
+		switch(B.digest_mode)
+			if(DM_HOLD)
+				spanstyle = ""
+			if(DM_DIGEST)
+				spanstyle = "color:red;"
+			if(DM_HEAL)
+				spanstyle = "color:green;"
+			if(DM_NOISY)
+				spanstyle = "color:purple;"
+
+		dat += "<span style='[spanstyle]'> ([B.contents.len])</span></a></li>"
+
+	if(user.vore_organs.len < BELLIES_MAX)
+		dat += "<li style='float: left'><a href='?src=\ref[src];newbelly=1'>New+</a></li>"
+	dat += "</ol>"
+	dat += "<HR>"
+
+	// Selected Belly (contents, configuration)
+	if(!selected)
+		dat += "No belly selected. Click one to select it."
+	else
+		if(selected.contents.len)
+			dat += "<b>Contents:</b> "
+			for(var/O in selected)
+
+				//Mobs can be absorbed, so treat them separately from everything else
+				if(istype(O,/mob/living))
+					var/mob/living/M = O
+
+					//Absorbed gets special color OOoOOOOoooo
+					if(M.absorbed)
+						dat += "<a href='?src=\ref[src];insidepick=\ref[O]'><span style='color:purple;'>[O]</span></a>"
+						continue
+
+				//Anything else
+				dat += "<a href='?src=\ref[src];insidepick=\ref[O]'>[O]</a>"
+
+				//Zero-width space, for wrapping
+				dat += "&#8203;"
+
+			//If there's more than one thing, add an [All] button
+			if(selected.contents.len > 1)
+				dat += "<a href='?src=\ref[src];insidepick=1;pickall=1'>\[All\]</a>"
+
+			dat += "<HR>"
+
+		//Belly Name Button
+		dat += "<a href='?src=\ref[src];b_name=\ref[selected]'>Name:</a>"
+		dat += " '[selected.name]'"
+
+		//Digest Mode Button
+		dat += "<br><a href='?src=\ref[src];b_mode=\ref[selected]'>Belly Mode:</a>"
+		dat += " [selected.digest_mode]"
+
+		//Belly verb
+		dat += "<br><a href='?src=\ref[src];b_verb=\ref[selected]'>Vore Verb:</a>"
+		dat += " '[selected.vore_verb]'"
+
+		//Inside flavortext
+		dat += "<br><a href='?src=\ref[src];b_desc=\ref[selected]'>Flavor Text:</a>"
+		dat += " '[selected.desc]'"
+
+		//Belly sound
+		dat += "<br><a href='?src=\ref[src];b_sound=\ref[selected]'>Set Vore Sound</a>"
+		dat += "<a href='?src=\ref[src];b_soundtest=\ref[selected]'>Test</a>"
+
+		//Release sound
+		dat += "<br><a href='?src=\ref[src];b_release=\ref[selected]'>Set Release Sound</a>"
+		dat += "<a href='?src=\ref[src];b_releasesoundtest=\ref[selected]'>Test</a>"
+
+		//Belly messages
+		dat += "<br><a href='?src=\ref[src];b_msgs=\ref[selected]'>Belly Messages</a>"
+
+		//Can belly taste?
+		dat += "<br><a href='?src=\ref[src];b_tastes=\ref[selected]'>Can Taste:</a>"
+		dat += " [selected.can_taste ? "Yes" : "No"]"
+
+		//Minimum size prey must be to show up.
+		dat += "<br><a href='?src=\ref[src];b_bulge_size=\ref[selected]'>Required examine size:</a>"
+		dat += " [selected.bulge_size*100]%"
+
+		//Belly escapability
+		dat += "<br><a href='?src=\ref[src];b_escapable=\ref[selected]'>Belly Interactions ([selected.escapable ? "On" : "Off"])</a>"
+		if(selected.escapable)
+			dat += "<a href='?src=\ref[src];show_int=\ref[selected]'>[show_interacts ? "Hide" : "Show"]</a>"
+
+		if(show_interacts && selected.escapable)
+			dat += "<HR>"
+			dat += "Interaction Settings <a href='?src=\ref[src];int_help=\ref[selected]'>?</a>"
+			dat += "<br><a href='?src=\ref[src];b_escapechance=\ref[selected]'>Set Belly Escape Chance</a>"
+			dat += " [selected.escapechance]%"
+
+			dat += "<br><a href='?src=\ref[src];b_escapetime=\ref[selected]'>Set Belly Escape Time</a>"
+			dat += " [selected.escapetime/10]s"
+
+			//Special <br> here to add a gap
+			dat += "<br style='line-height:5px;'>"
+			dat += "<br><a href='?src=\ref[src];b_transferchance=\ref[selected]'>Set Belly Transfer Chance</a>"
+			dat += " [selected.transferchance]%"
+
+			dat += "<br><a href='?src=\ref[src];b_transferlocation=\ref[selected]'>Set Belly Transfer Location</a>"
+			dat += " [selected.transferlocation ? selected.transferlocation : "Disabled"]"
+
+			//Special <br> here to add a gap
+			dat += "<br style='line-height:5px;'>"
+			dat += "<br><a href='?src=\ref[src];b_digestchance=\ref[selected]'>Set Belly Digest Chance</a>"
+			dat += " [selected.digestchance]%"
+			dat += "<HR>"
+
+			// Belly Silence
+			dat += "<br><a href='?src=\ref[src];b_silent=\ref[selected]'>Belly Silence (for not belly bellies):</a>"
+			dat += " [selected.silent ? "Yes" : "No"]"
+
+		//Delete button
+		dat += "<br><a style='background:#990000;' href='?src=\ref[src];b_del=\ref[selected]'>Delete Belly</a>"
+
+	dat += "<a href='?src=\ref[src];setflavor=1'>Set Flavor</a>"
+	dat += "<a href='?src=\ref[src];togglenoisy=1'>Toggle Hunger Noises</a>"
+
+	dat += "<HR>"
+
+	//Under the last HR, save and stuff.
+	dat += "<a href='?src=\ref[src];saveprefs=1'>Save Prefs</a>"
+	dat += "<a href='?src=\ref[src];refresh=1'>Refresh</a>"
+
+	dat += "<HR>"
+	switch(user.digestable)
+		if(TRUE)
+			dat += "<a href='?src=\ref[src];toggledg=1'>Toggle Digestable (Currently: ON)</a>"
+		if(FALSE)
+			dat += "<a href='?src=\ref[src];toggledg=1'>Toggle Digestable (Currently: OFF)</a>"
+
+	switch(user.devourable)
+		if(TRUE)
+			dat += "<a href='?src=\ref[src];toggledvor=1'>Toggle Devourable (Currently: ON)</a>"
+		if(FALSE)
+			dat += "<a href='?src=\ref[src];toggledvor=1'>Toggle Devourable (Currently: OFF)</a>"
+
+	//Returns the dat html to the vore_look
+	return dat
+
+/datum/vore_look/proc/vp_interact(href, href_list)
+	var/mob/living/user = usr
+	for(var/H in href_list)
+
+	if(href_list["close"])
+		qdel(src)  // Cleanup
+		return
+
+	if(href_list["show_int"])
+		show_interacts = !show_interacts
+		return TRUE //Force update
+
+	if(href_list["int_help"])
+		to_chat(usr,"These control how your belly responds to someone using 'resist' while inside you. The percent chance to trigger each is listed below, \
+				and you can change them to whatever you see fit. Setting them to 0% will disable the possibility of that interaction. \
+				These only function as long as interactions are turned on in general. Keep in mind, the 'belly mode' interactions (digest) \
+				will affect all prey in that belly, if one resists and triggers digestion. If multiple trigger at the same time, \
+				only the first in the order of 'Escape > Transfer > Digest' will occur.")
+		return TRUE //Force update
+
+	if(href_list["outsidepick"])
+		var/atom/movable/tgt = locate(href_list["outsidepick"])
+		var/obj/belly/OB = locate(href_list["outsidebelly"])
+		if(!(tgt in OB)) //Aren't here anymore, need to update menu.
+			return TRUE
+		var/intent = "Examine"
+
+		if(istype(tgt,/mob/living))
+			var/mob/living/M = tgt
+			intent = alert("What do you want to do to them?","Query","Examine","Help Out","Devour")
+			switch(intent)
+				if("Examine") //Examine a mob inside another mob
+					M.examine(user)
+
+				if("Help Out") //Help the inside-mob out
+					if(user.stat || user.absorbed || M.absorbed)
+						to_chat(user,"<span class='warning'>You can't do that in your state!</span>")
+						return 1
+
+					to_chat(user,"<font color='green'>You begin to push [M] to freedom!</font>")
+					to_chat(M,"[usr] begins to push you to freedom!")
+					to_chat(M.loc,"<span class='warning'>Someone is trying to escape from inside you!</span>")
+					sleep(50)
+					if(prob(33))
+						OB.release_specific_contents(M)
+						to_chat(usr,"<font color='green'>You manage to help [M] to safety!</font>")
+						to_chat(M,"<font color='green'>[user] pushes you free!</font>")
+						to_chat(OB.owner,"<span class='alert'>[M] forces free of the confines of your body!</span>")
+					else
+						to_chat(user,"<span class='alert'>[M] slips back down inside despite your efforts.</span>")
+						to_chat(M,"<span class='alert'> Even with [user]'s help, you slip back inside again.</span>")
+						to_chat(OB.owner,"<font color='green'>Your body efficiently shoves [M] back where they belong.</font>")
+
+
+				if("Devour") //Eat the inside mob
+					if(user.absorbed || user.stat)
+						to_chat(user,"<span class='warning'>You can't do that in your state!</span>")
+						return 1
+
+					if(!user.vore_selected)
+						to_chat(user,"<span class='warning'>Pick a belly on yourself first!</span>")
+						return 1
+
+					var/obj/belly/TB = user.vore_selected
+					to_chat(user,"<span class='warning'>You begin to [lowertext(TB.vore_verb)] [M] into your [lowertext(TB.name)]!</span>")
+					to_chat(M,"<span class='warning'>[user] begins to [lowertext(TB.vore_verb)] you into their [lowertext(TB.name)]!</span>")
+					to_chat(OB.owner,"<span class='warning'>Someone inside you is eating someone else!</span>")
+
+					sleep(TB.nonhuman_prey_swallow_time) //Can't do after, in a stomach, weird things abound.
+					if((user in OB) && (M in OB)) //Make sure they're still here.
+						to_chat(user,"<span class='warning'>You manage to [lowertext(TB.vore_verb)] [M] into your [lowertext(TB.name)]!</span>")
+						to_chat(M,"<span class='warning'>[user] manages to [lowertext(TB.vore_verb)] you into their [lowertext(TB.name)]!</span>")
+						to_chat(OB.owner,"<span class='warning'>Someone inside you has eaten someone else!</span>")
+						TB.nom_mob(M)
+
+		else if(istype(tgt,/obj/item))
+			var/obj/item/T = tgt
+			if(!(tgt in OB.contents))
+				//Doesn't exist anymore, update.
+				return TRUE
+			intent = alert("What do you want to do to that?","Query","Examine","Use Hand")
+			switch(intent)
+				if("Examine")
+					T.examine(user)
+
+				if("Use Hand")
+					if(user.stat)
+						to_chat(user, "<span class='warning'>You can't do that in your state!</span>")
+						return
+
+					user.ClickOn(T)
+					sleep(5) //Seems to exit too fast for the panel to update
+
+	if(href_list["insidepick"])
+		var/intent
+
+		//Handle the [All] choice. Ugh inelegant. Someone make this pretty.
+		if(href_list["pickall"])
+			intent = alert("Eject all, Move all?","Query","Eject all","Cancel","Move all")
+			switch(intent)
+				if("Cancel")
+					return
+
+				if("Eject all")
+					if(user.stat)
+						to_chat(user, "<span class='warning'>You can't do that in your state!</span>")
+						return
+
+					selected.release_all_contents()
+					for(var/mob/M in get_hearers_in_view(5, get_turf(user)))
+						if(M.client && M.client.prefs.toggles & EATING_NOISES)
+							playsound(get_turf(user),'sound/vore/pred/escape.ogg',50,0,-5,0,ignore_walls = FALSE,channel=CHANNEL_PRED)
+					to_chat(user.loc,"<span class='danger'>Everything is released from [user]!</span>")
+
+				if("Move all")
+					if(user.stat)
+						to_chat(user, "<span class='warning'>You can't do that in your state!</span>")
+						return FALSE
+
+					var/obj/belly/choice = input("Move all where?","Select Belly") as null|anything in user.vore_organs
+					if(!choice)
+						return FALSE
+
+					for(var/atom/movable/tgt in selected)
+						selected.transfer_contents(tgt, choice, 1)
+						for(var/mob/M in get_hearers_in_view(5, get_turf(user)))
+							if(M.client && M.client.prefs.toggles & EATING_NOISES)
+								playsound(get_turf(user),'sound/vore/pred/stomachmove.ogg',50,0,-5,0,ignore_walls = FALSE,channel=CHANNEL_PRED)
+						to_chat(tgt,"<span class='warning'>You're squished from [user]'s [lowertext(selected)] to their [lowertext(choice.name)]!</span>")
+
+		var/atom/movable/tgt = locate(href_list["insidepick"])
+		if(!(tgt in selected)) //Old menu, needs updating because they aren't really there.
+			return TRUE//Forces update
+		intent = "Examine"
+		intent = alert("Examine, Eject, Move? Examine if you want to leave this box.","Query","Examine","Eject","Move")
+		switch(intent)
+			if("Examine")
+				tgt.examine(user)
+
+			if("Eject")
+				if(user.stat)
+					to_chat(user, "<span class='warning'>You can't do that in your state!</span>")
+					return FALSE
+
+				selected.release_specific_contents(tgt)
+				for(var/mob/M in get_hearers_in_view(5, get_turf(user)))
+					if(M.client && M.client.prefs.toggles & EATING_NOISES)
+						playsound(get_turf(user),'sound/vore/pred/escape.ogg',50,0,-5,0,ignore_walls = FALSE,channel=CHANNEL_PRED)
+				user.loc << "<span class='danger'>[tgt] is released from [user]!</span>"
+
+			if("Move")
+				if(user.stat)
+					to_chat(user,"<span class='warning'>You can't do that in your state!</span>")
+					return 0
+
+				var/obj/belly/choice = input("Move [tgt] where?","Select Belly") as null|anything in user.vore_organs
+				if(!choice || !(tgt in selected))
+					return 0
+
+				to_chat(tgt,"<span class='warning'>You're squished from [user]'s [lowertext(selected.name)] to their [lowertext(choice.name)]!</span>")
+				selected.transfer_contents(tgt, choice)
+				for(var/mob/M in get_hearers_in_view(5, get_turf(user)))
+					if(M.client && M.client.prefs.toggles & EATING_NOISES)
+						playsound(get_turf(user),'sound/vore/pred/stomachmove.ogg',50,0,-5,0,ignore_walls = FALSE,channel=CHANNEL_PRED)
+
+	if(href_list["newbelly"])
+		if(user.vore_organs.len >= BELLIES_MAX)
+			return 0
+
+		var/new_name = html_encode(input(usr,"New belly's name:","New Belly") as text|null)
+
+		var/failure_msg
+		if(length(new_name) > BELLIES_NAME_MAX || length(new_name) < BELLIES_NAME_MIN)
+			failure_msg = "Entered belly name length invalid (must be longer than [BELLIES_NAME_MIN], no more than than [BELLIES_NAME_MAX])."
+		// else if(whatever) //Next test here.
+		else
+			for(var/belly in user.vore_organs)
+				var/obj/belly/B = belly
+				if(lowertext(new_name) == lowertext(B.name))
+					failure_msg = "No duplicate belly names, please."
+					break
+
+		if(failure_msg) //Something went wrong.
+			alert(user,failure_msg,"Error!")
+			return 0
+
+		var/obj/belly/NB = new(user)
+		NB.name = new_name
+		selected = NB
+
+	if(href_list["bellypick"])
+		selected = locate(href_list["bellypick"])
+		user.vore_selected = selected
+
+	////
+	//Please keep these the same order they are on the panel UI for ease of coding
+	////
+	if(href_list["b_name"])
+		var/new_name = html_encode(input(usr,"Belly's new name:","New Name") as text|null)
+
+		var/failure_msg
+		if(length(new_name) > BELLIES_NAME_MAX || length(new_name) < BELLIES_NAME_MIN)
+			failure_msg = "Entered belly name length invalid (must be longer than [BELLIES_NAME_MIN], no more than than [BELLIES_NAME_MAX])."
+		// else if(whatever) //Next test here.
+		else
+			for(var/belly in user.vore_organs)
+				var/obj/belly/B = belly
+				if(lowertext(new_name) == lowertext(B.name))
+					failure_msg = "No duplicate belly names, please."
+					break
+
+		if(failure_msg) //Something went wrong.
+			alert(user,failure_msg,"Error!")
+			return 0
+
+		selected.name = new_name
+
+	if(href_list["b_mode"])
+		var/list/menu_list = selected.digest_modes
+
+		var/new_mode = input("Choose Mode (currently [selected.digest_mode])") as null|anything in menu_list
+		if(!new_mode)
+			return 0
+		selected.digest_mode = new_mode
+
+	if(href_list["b_desc"])
+		var/new_desc = html_encode(input(usr,"Belly Description ([BELLIES_DESC_MAX] char limit):","New Description",selected.desc) as message|null)
+
+		if(new_desc)
+			new_desc = readd_quotes(new_desc)
+			if(length(new_desc) > BELLIES_DESC_MAX)
+				alert("Entered belly desc too long. [BELLIES_DESC_MAX] character limit.","Error")
+				return FALSE
+			selected.desc = new_desc
+		else //Returned null
+			return FALSE
+
+	if(href_list["b_msgs"])
+		var/list/messages = list(
+			"Digest Message (to prey)",
+			"Digest Message (to you)",
+			"Struggle Message (outside)",
+			"Struggle Message (inside)",
+			"Examine Message (when full)",
+			"Reset All To Default"
+		)
+
+		alert(user,"Setting abusive or deceptive messages will result in a ban. Consider this your warning. Max 150 characters per message, max 10 messages per topic.","Really, don't.")
+		var/choice = input(user,"Select a type to modify. Messages from each topic are pulled at random when needed.","Pick Type") as null|anything in messages
+		var/help = " Press enter twice to separate messages. '%pred' will be replaced with your name. '%prey' will be replaced with the prey's name. '%belly' will be replaced with your belly's name."
+
+		switch(choice)
+			if("Digest Message (to prey)")
+				var/new_message = input(user,"These are sent to prey when they expire. Write them in 2nd person ('you feel X'). Avoid using %prey in this type."+help,"Digest Message (to prey)",selected.get_messages("dmp")) as message
+				if(new_message)
+					selected.set_messages(new_message,"dmp")
+
+			if("Digest Message (to you)")
+				var/new_message = input(user,"These are sent to you when prey expires in you. Write them in 2nd person ('you feel X'). Avoid using %pred in this type."+help,"Digest Message (to you)",selected.get_messages("dmo")) as message
+				if(new_message)
+					selected.set_messages(new_message,"dmo")
+
+			if("Struggle Message (outside)")
+				var/new_message = input(user,"These are sent to those nearby when prey struggles. Write them in 3rd person ('X's Y bulges')."+help,"Struggle Message (outside)",selected.get_messages("smo")) as message
+				if(new_message)
+					selected.set_messages(new_message,"smo")
+
+			if("Struggle Message (inside)")
+				var/new_message = input(user,"These are sent to prey when they struggle. Write them in 2nd person ('you feel X'). Avoid using %prey in this type."+help,"Struggle Message (inside)",selected.get_messages("smi")) as message
+				if(new_message)
+					selected.set_messages(new_message,"smi")
+
+			if("Examine Message (when full)")
+				var/new_message = input(user,"These are sent to people who examine you when this belly has contents. Write them in 3rd person ('Their %belly is bulging')."+help,"Examine Message (when full)",selected.get_messages("em")) as message
+				if(new_message)
+					selected.set_messages(new_message,"em")
+
+			if("Reset All To Default")
+				var/confirm = alert(user,"This will delete any custom messages. Are you sure?","Confirmation","DELETE","Cancel")
+				if(confirm == "DELETE")
+					selected.digest_messages_prey = initial(selected.digest_messages_prey)
+					selected.digest_messages_owner = initial(selected.digest_messages_owner)
+					selected.struggle_messages_outside = initial(selected.struggle_messages_outside)
+					selected.struggle_messages_inside = initial(selected.struggle_messages_inside)
+
+	if(href_list["b_verb"])
+		var/new_verb = html_encode(input(usr,"New verb when eating (infinitive tense, e.g. nom or swallow):","New Verb") as text|null)
+
+		if(length(new_verb) > BELLIES_NAME_MAX || length(new_verb) < BELLIES_NAME_MIN)
+			alert("Entered verb length invalid (must be longer than [BELLIES_NAME_MIN], no longer than [BELLIES_NAME_MAX]).","Error")
+			return 0
+
+		selected.vore_verb = new_verb
+
+	if(href_list["b_release"])
+		var/choice = input(user,"Currently set to [selected.release_sound]","Select Sound") as null|anything in GLOB.release_sound
+
+		if(!choice)
+			return
+
+		selected.release_sound = GLOB.release_sound[choice]
+
+	if(href_list["b_releasesoundtest"])
+		var/soundfile = GLOB.release_sound[selected.release_sound]
+		if(soundfile)
+			user << soundfile
+
+	if(href_list["b_sound"])
+		var/choice = input(user,"Currently set to [selected.vore_sound]","Select Sound") as null|anything in GLOB.pred_vore_sounds
+
+		if(!choice)
+			return
+
+		selected.vore_sound = GLOB.pred_vore_sounds[choice]
+
+	if(href_list["b_soundtest"])
+		var/soundfile = GLOB.pred_vore_sounds[selected.vore_sound]
+		if(soundfile)
+			user << soundfile
+
+	if(href_list["b_tastes"])
+		selected.can_taste = !selected.can_taste
+
+	if(href_list["b_bulge_size"])
+		var/new_bulge = input(user, "Choose the required size prey must be to show up on examine, ranging from 25% to 200% Set this to 0 for no text on examine.", "Set Belly Examine Size.") as num|null
+		if(new_bulge == null)
+			return
+		if(new_bulge == 0) //Disable.
+			selected.bulge_size = 0
+			to_chat(user,"<span class='notice'>Your stomach will not be seen on examine.</span>")
+		else if (!IsInRange(new_bulge,25,200))
+			selected.bulge_size = 0.25 //Set it to the default.
+			to_chat(user,"<span class='notice'>Invalid size.</span>")
+		else if(new_bulge)
+			selected.bulge_size = (new_bulge/100)
+
+	if(href_list["b_escapable"])
+		if(selected.escapable == FALSE) //Possibly escapable and special interactions.
+			selected.escapable = TRUE
+			to_chat(usr,"<span class='warning'>Prey now have special interactions with your [selected.name] depending on your settings.</span>")
+		else if(selected.escapable == TRUE) //Never escapable.
+			selected.escapable = FALSE
+			to_chat(usr,"<span class='warning'>Prey will not be able to have special interactions with your [selected.name].</span>")
+			show_interacts = FALSE //Force the hiding of the panel
+		else
+			to_chat(usr,"<span class='warning'>Something went wrong. Your stomach will now not have special interactions. Press the button enable them again and tell a dev.") //If they somehow have a varable that's not 0 or 1
+			selected.escapable = TRUE
+			show_interacts = FALSE //Force the hiding of the panel
+
+	if(href_list["b_escapechance"])
+		var/escape_chance_input = input(user, "Set prey escape chance on resist (as %)", "Prey Escape Chance") as num|null
+		if(!isnull(escape_chance_input)) //These have to be 'null' because both cancel and 0 are valid, separate options
+			selected.escapechance = sanitize_integer(escape_chance_input, 0, 100, initial(selected.escapechance))
+
+	if(href_list["b_escapetime"])
+		var/escape_time_input = input(user, "Set number of seconds for prey to escape on resist (1-60)", "Prey Escape Time") as num|null
+		if(!isnull(escape_time_input))
+			selected.escapetime = sanitize_integer(escape_time_input*10, 10, 600, initial(selected.escapetime))
+
+	if(href_list["b_transferchance"])
+		var/transfer_chance_input = input(user, "Set belly transfer chance on resist (as %). You must also set the location for this to have any effect.", "Prey Escape Time") as num|null
+		if(!isnull(transfer_chance_input))
+			selected.transferchance = sanitize_integer(transfer_chance_input, 0, 100, initial(selected.transferchance))
+
+	if(href_list["b_transferlocation"])
+		var/choice = input("Where do you want your [selected.name] to lead if prey resists?","Select Belly") as null|anything in (user.vore_organs + "None - Remove" - selected.name)
+
+		if(!choice) //They cancelled, no changes
+			return FALSE
+		else if(choice == "None - Remove")
+			selected.transferlocation = null
+		else
+			selected.transferlocation = user.vore_organs[choice]
+
+	if(href_list["b_absorbchance"])
+		var/absorb_chance_input = input(user, "Set belly absorb mode chance on resist (as %)", "Prey Absorb Chance") as num|null
+		if(!isnull(absorb_chance_input))
+			selected.absorbchance = sanitize_integer(absorb_chance_input, 0, 100, initial(selected.absorbchance))
+
+	if(href_list["b_digestchance"])
+		var/digest_chance_input = input(user, "Set belly digest mode chance on resist (as %)", "Prey Digest Chance") as num|null
+		if(!isnull(digest_chance_input))
+			selected.digestchance = sanitize_integer(digest_chance_input, 0, 100, initial(selected.digestchance))
+
+	if(href_list["b_silent"])
+		selected.silent = !selected.silent
+
+	if(href_list["b_del"])
+		var/alert = alert("Are you sure you want to delete your [lowertext(selected.name)]?","Confirmation","Delete","Cancel")
+		if(!alert == "Delete")
+			return FALSE
+
+		var/failure_msg = ""
+
+		var/dest_for //Check to see if it's the destination of another vore organ.
+		for(var/belly in user.vore_organs)
+			var/obj/belly/B = belly
+			if(B.transferlocation == selected)
+				dest_for = B.name
+				failure_msg += "This is the destiantion for at least '[dest_for]' belly transfers. Remove it as the destination from any bellies before deleting it. "
+				break
+
+		if(selected.contents.len)
+			failure_msg += "You cannot delete bellies with contents! " //These end with spaces, to be nice looking. Make sure you do the same.
+		if(selected.immutable)
+			failure_msg += "This belly is marked as undeletable. "
+		if(user.vore_organs.len == 1)
+			failure_msg += "You must have at least one belly. "
+
+		if(failure_msg)
+			alert(user,failure_msg,"Error!")
+			return FALSE
+
+		qdel(selected)
+		selected = user.vore_organs[1]
+		user.vore_selected = user.vore_organs[1]
+
+	if(href_list["saveprefs"])
+		if(!user.save_vore_prefs())
+			to_chat(user, "<span class='warning'>Belly Preferences not saved!</span>")
+
+		else
+			to_chat(user, "<span class='notice'>Belly Preferences were saved!</span>")
+			log_admin("Could not save vore prefs on USER: [user].")
+
+	if(href_list["setflavor"])
+		var/new_flavor = html_encode(input(usr,"What your character tastes like (40ch limit). This text will be printed to the pred after 'X tastes of...' so just put something like 'strawberries and cream':","Character Flavor",user.vore_taste) as text|null)
+		if(!new_flavor)
+			return 0
+
+		new_flavor = readd_quotes(new_flavor)
+		if(length(new_flavor) > FLAVOR_MAX)
+			alert("Entered flavor/taste text too long. [FLAVOR_MAX] character limit.","Error!")
+			return 0
+		user.vore_taste = new_flavor
+
+	if(href_list["toggledg"])
+		var/choice = alert(user, "This button is for those who don't like being digested. It can make you undigestable to all mobs. Digesting you is currently: [user.digestable ? "Allowed" : "Prevented"]", "", "Allow Digestion", "Cancel", "Prevent Digestion")
+		switch(choice)
+			if("Cancel")
+				return
+			if("Allow Digestion")
+				user.digestable = TRUE
+			if("Prevent Digestion")
+				user.digestable = FALSE
+
+		if(user.client.prefs_vr)
+			user.client.prefs_vr.digestable = user.digestable
+
+	if(href_list["toggledvor"])
+		var/choice = alert(user, "This button is for those who don't like vore at all. Devouring you is currently: [user.devourable ? "Allowed" : "Prevented"]", "", "Allow Devourment", "Cancel", "Prevent Devourment")
+		switch(choice)
+			if("Cancel")
+				return
+			if("Allow Devourment")
+				user.devourable = TRUE
+			if("Prevent Devourment")
+				user.devourable = FALSE
+
+		if(user.client.prefs_vr)
+			user.client.prefs_vr.devourable = user.devourable
+
+	if(href_list["togglenoisy"])
+		var/choice = alert(user, "Toggle audible hunger noises. Currently: [user.noisy ? "Enabled" : "Disabled"]", "", "Enable audible hunger", "Cancel", "Disable audible hunger")
+		switch(choice)
+			if("Cancel")
+				return 0
+			if("Enable audible hunger")
+				user.noisy = TRUE
+			if("Disable audible hunger")
+				user.noisy = FALSE
+
+	//Refresh when interacted with, returning 1 makes vore_look.Topic update
+	return 1

modular_citadel/code/modules/vore/hook-defs_vr.dm

@@ -0,0 +1,37 @@
+//The base hooks themselves
+
+//New() hooks
+/hook/client_new
+
+/hook/mob_new
+
+/hook/living_new
+
+/hook/carbon_new
+
+/hook/human_new
+
+/hook/simple_animal_new
+
+//Hooks for interactions
+/hook/living_attackby
+
+//
+//Hook helpers to expand hooks to others
+//
+/hook/mob_new/proc/chain_hooks(mob/M)
+	var/result = 1
+	if(isliving(M))
+		if(!hook_vr("living_new",args))
+			result = 0
+
+	if(iscarbon(M))
+		if(!hook_vr("carbon_new",args))
+			result = 0
+
+	if(ishuman(M))
+		if(!hook_vr("human_new",args))
+			result = 0
+
+	//Return 1 to superhook
+	return result

modular_citadel/code/modules/vore/persistence.dm

@@ -0,0 +1,90 @@
+/*
+* Returns a byond list that can be passed to the "deserialize" proc
+* to bring a new instance of this atom to its original state
+*
+* If we want to store this info, we can pass it to `json_encode` or some other
+* interface that suits our fancy, to make it into an easily-handled string
+*/
+/datum/proc/serialize()
+	var/data = list("type" = "[type]")
+	return data
+
+/*
+* This is given the byond list from above, to bring this atom to the state
+* described in the list.
+* This will be called after `New` but before `initialize`, so linking and stuff
+* would probably be handled in `initialize`
+*
+* Also, this should only be called by `list_to_object` in persistence.dm - at least
+* with current plans - that way it can actually initialize the type from the list
+*/
+/datum/proc/deserialize(var/list/data)
+	return
+
+/atom
+	// This var isn't actually used for anything, but is present so that
+	// DM's map reader doesn't forfeit on reading a JSON-serialized map
+	var/map_json_data
+
+// This is so specific atoms can override these, and ignore certain ones
+/atom/proc/vars_to_save()
+ 	return list("color","dir","icon","icon_state","name","pixel_x","pixel_y")
+
+/atom/proc/map_important_vars()
+	// A list of important things to save in the map editor
+ 	return list("color","dir","icon","icon_state","layer","name","pixel_x","pixel_y")
+
+/area/map_important_vars()
+	// Keep the area default icons, to keep things nice and legible
+	return list("name")
+
+// No need to save any state of an area by default
+/area/vars_to_save()
+	return list("name")
+
+/atom/serialize()
+	var/list/data = ..()
+	for(var/thing in vars_to_save())
+		if(vars[thing] != initial(vars[thing]))
+			data[thing] = vars[thing]
+	return data
+
+
+/atom/deserialize(var/list/data)
+	for(var/thing in vars_to_save())
+		if(thing in data)
+			vars[thing] = data[thing]
+	..()
+
+
+/*
+Whoops, forgot to put documentation here.
+What this does, is take a JSON string produced by running
+BYOND's native `json_encode` on a list from `serialize` above, and
+turns that string into a new instance of that object.
+
+You can also easily get an instance of this string by calling "Serialize Marked Datum"
+in the "Debug" tab.
+
+If you're clever, you can do neat things with SDQL and this, though be careful -
+some objects, like humans, are dependent that certain extra things are defined
+in their list
+*/
+/proc/object_to_json(var/atom/movable/thing)
+	return json_encode(thing.serialize())
+
+/proc/json_to_object(var/json_data, var/loc)
+	return list_to_object(json_decode(json_data), loc)
+
+/proc/list_to_object(var/list/data, var/loc)
+	if(!islist(data))
+		throw EXCEPTION("You didn't give me a list, bucko")
+	if(!("type" in data))
+		throw EXCEPTION("No 'type' field in the data")
+	var/path = text2path(data["type"])
+	if(!path)
+		throw EXCEPTION("Path not found: [path]")
+
+	var/atom/movable/thing = new path(loc)
+	thing.deserialize(data)
+	return thing

modular_citadel/code/modules/vore/resizing/grav_pull_vr.dm

@@ -0,0 +1,63 @@
+//
+//	Gravity Pull effect which draws in movable objects to its center.
+//	In this case, "number" refers to the range.  directions is ignored.
+//
+/datum/effect/effect/system/grav_pull
+	var/pull_radius = 3
+	var/pull_anchored = 0
+	var/break_windows = 0
+
+/datum/effect/effect/system/grav_pull/set_up(range, num, loca)
+	pull_radius = range
+	number = num
+	if(istype(loca, /turf/))
+		location = loca
+	else
+		location = get_turf(loca)
+
+/datum/effect/effect/system/grav_pull/start()
+	spawn(0)
+		if(holder)
+			src.location = get_turf(holder)
+		for(var/i=0, i < number, i++)
+			do_pull()
+			sleep(25)
+
+/datum/effect/effect/system/grav_pull/proc/do_pull()
+	//following is adapted from supermatter and singulo code
+	if(defer_powernet_rebuild != 2)
+		defer_powernet_rebuild = 1
+
+	// Let's just make this one loop.
+	for(var/atom/X in orange(pull_radius, location))
+		// Movable atoms only
+		if(istype(X, /atom/movable))
+			if(istype(X, /obj/effect/overlay)) continue
+			if(X && !istype(X, /mob/living/carbon/human))
+				if(break_windows && istype(X, /obj/structure/window)) //shatter windows
+					var/obj/structure/window/W = X
+					W.ex_act(2.0)
+
+				if(istype(X, /obj))
+					var/obj/O = X
+					if(O.anchored)
+						if (!pull_anchored) continue // Don't pull anchored stuff unless configured
+						step_towards(X, location)  // step just once if anchored
+						continue
+
+				step_towards(X, location) // Step twice
+				step_towards(X, location)
+
+			else if(istype(X,/mob/living/carbon/human))
+				var/mob/living/carbon/human/H = X
+				if(istype(H.shoes,/obj/item/clothing/shoes/magboots))
+					var/obj/item/clothing/shoes/magboots/M = H.shoes
+					if(M.magpulse)
+						step_towards(H, location) //step just once with magboots
+						continue
+				step_towards(H, location) //step twice
+				step_towards(H, location)
+
+	if(defer_powernet_rebuild != 2)
+		defer_powernet_rebuild = 0
+	return

modular_citadel/code/modules/vore/resizing/holder_micro_vr.dm

@@ -0,0 +1,33 @@
+// Micro Holders - Extends /obj/item/holder
+
+/obj/item/holder/micro
+	name = "micro"
+	desc = "Another crewmember, small enough to fit in your hand."
+	icon_state = "micro"
+	slot_flags = SLOT_FEET | SLOT_HEAD | SLOT_ID
+	w_class = 2
+	item_icons = null 	// Override value from parent. We don't have magic sprites.
+	pixel_y = 0			// Override value from parent.
+
+/obj/item/holder/micro/examine(var/mob/user)
+	for(var/mob/living/M in contents)
+		M.examine(user)
+
+/obj/item/holder/MouseDrop(mob/M as mob)
+	..()
+	if(M != usr) return
+	if(usr == src) return
+	if(!Adjacent(usr)) return
+	if(istype(M,/mob/living/silicon/ai)) return
+	for(var/mob/living/carbon/human/O in contents)
+		O.show_inv(usr)
+
+/obj/item/holder/micro/attack_self(var/mob/living/user)
+	for(var/mob/living/carbon/human/M in contents)
+		M.help_shake_act(user)
+
+/obj/item/holder/micro/update_state()
+	// If any items have been dropped by contained mob, drop them to floor.
+	for(var/obj/O in contents)
+		O.forceMove(get_turf(src))
+	..()

modular_citadel/code/modules/vore/resizing/resize_vr.dm

@@ -0,0 +1,207 @@
+/*
+//these aren't defines so they can stay in this file
+GLOBAL_VAR_CONST(SIZESCALE_HUGE, 2)
+GLOBAL_VAR_CONST(SIZESCALE_BIG, 1.5)
+GLOBAL_VAR_CONST(SIZESCALE_NORMAL, 1)
+GLOBAL_VAR_CONST(SIZESCALE_SMALL, 0.85)
+GLOBAL_VAR_CONST(SIZESCALE_TINY, 0.60)
+
+GLOBAL_VAR_CONST(SIZESCALE_A_HUGEBIG, (GLOB.SIZESCALE_HUGE + GLOB.SIZESCALE_BIG) / 2)
+GLOBAL_VAR_CONST(SIZESCALE_A_BIGNORMAL, (GLOB.SIZESCALE_BIG + GLOB.SIZESCALE_NORMAL) / 2)
+GLOBAL_VAR_CONST(SIZESCALE_A_NORMALSMALL,(GLOB.SIZESCALE_NORMAL + GLOB.SIZESCALE_SMALL) / 2)
+GLOBAL_VAR_CONST(SIZESCALE_A_SMALLTINY,(GLOB.SIZESCALE_SMALL + GLOB.SIZESCALE_TINY) / 2)
+*/
+// Adding needed defines to /mob/living
+// Note: Polaris had this on /mob/living/carbon/human We need it higher up for animals and stuff.
+/mob/living
+	var/size_multiplier = 1 //multiplier for the mob's icon size
+
+// Define holder_type on types we want to be scoop-able
+//mob/living/carbon/human
+//	holder_type = /obj/item/holder/micro
+
+/**
+ * Scale up the size of a mob's icon by the size_multiplier.
+ * NOTE: mob/living/carbon/human/update_transform() has a more complicated system and
+ * 	is already applying this transform.   BUT, it does not call ..()
+ *	as long as that is true, we should be fine.  If that changes we need to
+ *	re-evaluate.
+ */
+/mob/living/update_transform()
+	ASSERT(!iscarbon(src))
+	var/matrix/M = matrix()
+	M.Scale(size_multiplier)
+	M.Translate(0, 16*(size_multiplier-1))
+	src.transform = M
+
+/**
+ * Get the effective size of a mob.
+ * Currently this is based only on size_multiplier for micro/macro stuff,
+ * but in the future we may also incorporate the "mob_size", so that
+ * a macro mouse is still only effectively "normal" or a micro dragon is still large etc.
+ */
+/mob/living/proc/get_effective_size()
+	return src.size_multiplier
+
+/**
+ * Resizes the mob immediately to the desired mod, animating it growing/shrinking.
+ * It can be used by anything that calls it.
+ */
+/mob/living/proc/sizescale(var/new_size)
+	var/matrix/sizescale = matrix() // Defines the matrix to change the player's size
+	sizescale.Scale(new_size) //Change the size of the matrix
+
+	if(new_size >= SIZESCALE_NORMAL)
+		sizescale.Translate(0, -1 * (1 - new_size) * 16) //Move the player up in the tile so their feet align with the bottom
+
+	animate(src, transform = sizescale, time = 5) //Animate the player resizing
+	size_multiplier = new_size //Change size_multiplier so that other items can interact with them
+
+/*
+ * Verb proc for a command that lets players change their size OOCly.
+ * Ace was here! Redid this a little so we'd use math for shrinking characters. This is the old code.
+
+/mob/living/proc/set_size()
+	set name = "Set Character Size"
+	set category = "Vore"
+	var/nagmessage = "DO NOT ABUSE THESE COMMANDS. They are not here for you to play with. \
+			We were originally going to remove them but kept them for popular demand. \
+			Do not abuse their existence outside of ERP scenes where they apply, \
+			or reverting OOCly unwanted changes like someone lolshooting the crew with a shrink ray. -Ace"
+
+	var/size_name = input(nagmessage, "Pick a Size") in player_sizes_list
+	if (size_name && player_sizes_list[size_name])
+		src.sizescale(player_sizes_list[size_name])
+		message_admins("[key_name(src)] used the sizescale command in-game to be [size_name]. \
+			([src ? "<a href='?_src_=holder;adminplayerobservecoodjump=1;X=[src.x];Y=[src.y];Z=[src.z]'>JMP</a>" : "null"])")
+
+/** Add the set_size() proc to usable verbs. */
+/hook/living_new/proc/sizescale_setup(mob/living/M)
+	M.verbs += /mob/living/proc/set_size
+	return 1
+
+
+ * Attempt to scoop up this mob up into M's hands, if the size difference is large enough.
+ * @return false if normal code should continue, 1 to prevent normal code.
+
+/mob/living/proc/attempt_to_scoop(var/mob/living/carbon/human/M)
+	if(!istype(M))
+		return 0;
+	if(M.buckled)
+		usr << "<span class='notice'>You have to unbuckle \the [M] before you pick them up.</span>"
+		return 0
+	if(M.get_effective_size() - src.get_effective_size() >= 0.75)
+		var/obj/item/holder/m_holder = get_scooped(M)
+		if (m_holder)
+			return 1
+		else
+			return 0; // Unable to scoop, let other code run
+*/
+/*
+ * Handle bumping into someone with helping intent.
+ * Called from /mob/living/Bump() in the 'brohugs all around' section.
+ * @return false if normal code should continue, 1 to prevent normal code.
+ * // TODO - can the now_pushing = 0 be moved up? What does it do anyway?
+ */
+/mob/living/proc/handle_micro_bump_helping(var/mob/living/tmob)
+	if(src.get_effective_size() <= SIZESCALE_A_SMALLTINY && tmob.get_effective_size() <= SIZESCALE_A_SMALLTINY)
+		// Both small! Go ahead and
+		now_pushing = 0
+		src.forceMove(tmob.loc)
+		return 1
+	if(abs(src.get_effective_size() - tmob.get_effective_size()) >= 0.20)
+		now_pushing = 0
+		src.forceMove(tmob.loc)
+
+		if(src.get_effective_size() > tmob.get_effective_size())
+/*			var/mob/living/carbon/human/tmob = src
+			if(istype(tmob) && istype(tmob.tail_style, /datum/sprite_accessory/tail/taur/naga))
+				src << "You carefully slither around [tmob]."
+				M << "[src]'s huge tail slithers past beside you!"
+			else
+*/
+			src.forceMove(tmob.loc)
+			src << "You carefully step over [tmob]."
+			tmob << "[src] steps over you carefully!"
+		if(tmob.get_effective_size() > src.get_effective_size())
+/*			var/mob/living/carbon/human/M = M
+			if(istype(M) && istype(M.tail_style, /datum/sprite_accessory/tail/taur/naga))
+				src << "You jump over [M]'s thick tail."
+				M << "[src] bounds over your tail."
+			else
+*/
+			src.forceMove(tmob.loc)
+			src << "You run between [tmob]'s legs."
+			tmob << "[src] runs between your legs."
+		return 1
+
+/**
+ * Handle bumping into someone without mutual help intent.
+ * Called from /mob/living/Bump()
+ * NW was here, adding even more options for stomping!
+ *
+ * @return false if normal code should continue, 1 to prevent normal code.
+ */
+/mob/living/proc/handle_micro_bump_other(var/mob/living/tmob)
+	ASSERT(isliving(tmob)) // Baby don't hurt me
+
+	if(src.a_intent == "disarm" && src.canmove && !src.buckled)
+		// If bigger than them by at least 0.75, move onto them and print message.
+		if((src.get_effective_size() - tmob.get_effective_size()) >= 0.20)
+			now_pushing = 0
+			src.forceMove(tmob.loc)
+			tmob.Stun(4)
+/*
+			var/mob/living/carbon/human/H = src
+			if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/naga))
+				src << "You carefully squish [tmob] under your tail!"
+				tmob << "[src] pins you under their tail!"
+			else
+*/
+			src << "You pin [tmob] beneath your foot!"
+			tmob << "[src] pins you beneath their foot!"
+		return 1
+
+	if(src.a_intent == "harm" && src.canmove && !src.buckled)
+		if((src.get_effective_size() - tmob.get_effective_size()) >= 0.20)
+			now_pushing = 0
+			src.forceMove(tmob.loc)
+			tmob.adjustStaminaLoss(35)
+			tmob.adjustBruteLoss(5)
+/*			var/mob/living/carbon/human/M = src
+			if(istype(M) && istype(M.tail_style, /datum/sprite_accessory/tail/taur/naga))
+				src << "You steamroller over [tmob] with your heavy tail!"
+				tmob << "[src] ploughs you down mercilessly with their heavy tail!"
+			else
+*/
+			src << "You bring your foot down heavily upon [tmob]!"
+			tmob << "[src] steps carelessly on your body!"
+		return 1
+
+ // until I figure out grabbing micros with the godawful pull code...
+	if(src.a_intent == "grab" && src.canmove && !src.buckled)
+		if((src.get_effective_size() - tmob.get_effective_size()) >= 0.20)
+			now_pushing = 0
+			tmob.adjustStaminaLoss(15)
+			src.forceMove(tmob.loc)
+			src << "You press [tmob] beneath your foot!"
+			tmob << "[src] presses you beneath their foot!"
+/*
+			var/mob/living/carbon/human/M = src
+			if(istype(M) && !M.shoes)
+				// User is a human (capable of scooping) and not wearing shoes! Scoop into foot slot!
+				equip_to_slot_if_possible(tmob.get_scooped(M), slot_shoes, 0, 1)
+				if(istype(M.tail_style, /datum/sprite_accessory/tail/taur/naga))
+					src << "You wrap up [tmob] with your powerful tail!"
+					tmob << "[src] binds you with their powerful tail!"
+				else
+				src << "You clench your toes around [tmob]'s body!"
+				tmob << "[src] grabs your body with their toes!"
+			else if(istype(M) && istype(M.tail_style, /datum/sprite_accessory/tail/taur/naga))
+				src << "You carefully squish [tmob] under your tail!"
+				tmob << "[src] pins you under their tail!"
+			else
+				src << "You pin [tmob] beneath your foot!"
+				tmob << "[src] pins you beneath their foot!"
+			return 1
+*/

modular_citadel/code/modules/vore/resizing/sizechemicals.dm

@@ -0,0 +1,115 @@
+
+////////////////////////////
+///    shrinking serum   ///
+////////////////////////////
+
+/datum/reagent/medicine/macrocillin
+	name = "Macrocillin"
+	id = "macrocillin"
+	description = "Glowing yellow liquid."
+	reagent_state = LIQUID
+	color = "#FFFF00" // rgb: 255, 255, 0
+	overdose_threshold = 20
+
+/datum/reagent/medicine/macrocillin/on_mob_life(mob/living/M, method=INGEST)
+	for(var/size in list(SIZESCALE_SMALL, SIZESCALE_NORMAL, SIZESCALE_BIG, SIZESCALE_HUGE))
+		if(M.size_multiplier < size)
+			M.sizescale(size)
+			M << "<font color='green'>You grow!</font>"
+			break
+	if(M.reagents.has_reagent("macrocillin"))
+		M.reagents.remove_reagent("macrocillin", 20)
+	..()
+
+/datum/reagent/medicine/microcillin
+	name = "Microcillin"
+	id = "microcillin"
+	description = "Murky purple liquid."
+	reagent_state = LIQUID
+	color = "#800080"
+	overdose_threshold = 20
+
+/datum/reagent/microcillin/on_mob_life(mob/living/M, method=INGEST)
+	for(var/size in list(SIZESCALE_BIG, SIZESCALE_NORMAL, SIZESCALE_SMALL, SIZESCALE_TINY))
+		if(M.size_multiplier > size)
+			M.sizescale(size)
+			M << "<span class='alert'>You shrink!</span>"
+			break;
+	if(M.reagents.has_reagent("microcillin"))
+		M.reagents.remove_reagent("microcillin", 20)
+
+	..()
+
+/datum/reagent/medicine/normalcillin
+	name = "Normalcillin"
+	id = "normalcillin"
+	description = "Translucent cyan liquid."
+	reagent_state = LIQUID
+	color = "#00FFFF"
+	overdose_threshold = 20
+
+/datum/reagent/medicine/normalcillin/on_mob_life(mob/living/M, method=INGEST)
+	if(M.size_multiplier > SIZESCALE_BIG)
+		M.sizescale(SIZESCALE_BIG)
+		M << "<span class='alert'>You shrink!</span>"
+	else if(M.size_multiplier > SIZESCALE_NORMAL)
+		M.sizescale(SIZESCALE_NORMAL)
+		M << "<span class='alert'>You shrink!</span>"
+	else if(M.size_multiplier < SIZESCALE_NORMAL)
+		M.sizescale(SIZESCALE_NORMAL)
+		M << "<font color='green'>You grow!</font>"
+	else if(M.size_multiplier < SIZESCALE_SMALL)
+		M.sizescale(SIZESCALE_SMALL)
+		M << "<font color='green'>You grow!</font>"
+
+	if(M.reagents.has_reagent("normalcillin"))
+		M.reagents.remove_reagent("normalcillin", 20)
+	..()
+
+
+/datum/reagent/medicine/sizeoxadone
+	name = "Sizeoxadone"
+	id = "sizeoxadone"
+	description = "A volatile liquid used as a precursor to size-altering chemicals. Causes dizziness if taken unprocessed."
+	reagent_state = LIQUID
+	color = "#1E90FF"
+	overdose_threshold = 30
+	metabolization_rate = 0.8 * REAGENTS_METABOLISM
+
+/datum/reagent/sizeoxadone/on_mob_life(var/mob/living/carbon/M, var/removed)
+	if(M.hallucination < volume && prob(20))
+		M.hallucination += 5
+	if(!M.confused) M.confused = 1
+	M.confused = max(M.confused, 20)
+	return
+
+/datum/reagent/medicine/sizeoxadone/overdose_process(mob/living/M)
+	M.adjustBrainLoss(1)
+	M.adjustToxLoss(1)
+	..()
+	. = 1
+
+////////////////////////// Anti-Noms Drugs //////////////////////////
+
+/datum/reagent/medicine/ickypak
+	name = "Ickypak"
+	id = "ickypak"
+	description = "A foul-smelling green liquid, for inducing muscle contractions to expel accidentally ingested things."
+	reagent_state = LIQUID
+	color = "#0E900E"
+	metabolization_rate = 0.25 * REAGENTS_METABOLISM
+
+/datum/reagent/medicine/ickypak/on_mob_life(var/mob/living/M, method=INGEST)
+	..()
+	if(M.hallucination < volume && prob(20))
+		M.hallucination += 5
+	M.adjustToxLoss(-5)
+
+	for(var/I in M.vore_organs)
+		var/datum/belly/B = M.vore_organs[I]
+		for(var/atom/movable/A in B.internal_contents)
+			if(prob(55))
+				playsound(M, 'sound/effects/splat.ogg', 50, 1)
+				B.release_vore_contents(A)
+	..()
+	. = 1

modular_citadel/code/modules/vore/resizing/sizegun_vr.dm

@@ -0,0 +1,169 @@
+//
+// Size Gun
+//
+/*
+/obj/item/gun/energy/sizegun
+	name = "shrink ray"
+	desc = "A highly advanced ray gun with two settings: Shrink and Grow. Warning: Do not insert into mouth."
+	icon = 'icons/obj/gun_vr.dmi'
+	icon_state = "sizegun-shrink100" // Someone can probably do better. -Ace
+	item_state = null	//so the human update icon uses the icon_state instead
+	fire_sound = 'sound/weapons/wave.ogg'
+	charge_cost = 100
+	projectile_type = /obj/item/projectile/beam/shrinklaser
+	modifystate = "sizegun-shrink"
+	selfcharge = 1
+	firemodes = list(
+		list(mode_name		= "grow",
+			projectile_type	= /obj/item/projectile/beam/growlaser,
+			modifystate		= "sizegun-grow",
+			fire_sound		= 'sound/weapons/pulse3.ogg'
+		),
+		list(mode_name		= "shrink",
+			projectile_type	= /obj/item/projectile/beam/shrinklaser,
+			modifystate		= "sizegun-shrink",
+			fire_sound		= 'sound/weapons/wave.ogg'
+		))
+
+//
+// Beams for size gun
+//
+// tracers TBD
+
+/obj/item/projectile/beam/shrinklaser
+	name = "shrink beam"
+	icon_state = "xray"
+	nodamage = 1
+	damage = 0
+	check_armour = "laser"
+
+	muzzle_type = /obj/effect/projectile/xray/muzzle
+	tracer_type = /obj/effect/projectile/xray/tracer
+	impact_type = /obj/effect/projectile/xray/impact
+
+/obj/item/projectile/beam/shrinklaser/on_hit(var/atom/target, var/blocked = 0)
+	if(istype(target, /mob/living))
+		var/mob/living/M = target
+		switch(M.size_multiplier)
+			if(SIZESCALE_HUGE to INFINITY)
+				M.sizescale(SIZESCALE_BIG)
+			if(SIZESCALE_BIG to SIZESCALE_HUGE)
+				M.sizescale(SIZESCALE_NORMAL)
+			if(SIZESCALE_NORMAL to SIZESCALE_BIG)
+				M.sizescale(SIZESCALE_SMALL)
+			if((0 - INFINITY) to SIZESCALE_NORMAL)
+				M.sizescale(SIZESCALE_TINY)
+		M.update_transform()
+	return 1
+
+/obj/item/projectile/beam/growlaser
+	name = "growth beam"
+	icon_state = "bluelaser"
+	nodamage = 1
+	damage = 0
+	check_armour = "laser"
+
+	muzzle_type = /obj/effect/projectile/laser_blue/muzzle
+	tracer_type = /obj/effect/projectile/laser_blue/tracer
+	impact_type = /obj/effect/projectile/laser_blue/impact
+
+/obj/item/projectile/beam/growlaser/on_hit(var/atom/target, var/blocked = 0)
+	if(istype(target, /mob/living))
+		var/mob/living/M = target
+		switch(M.size_multiplier)
+			if(SIZESCALE_BIG to SIZESCALE_HUGE)
+				M.sizescale(SIZESCALE_HUGE)
+			if(SIZESCALE_NORMAL to SIZESCALE_BIG)
+				M.sizescale(SIZESCALE_BIG)
+			if(SIZESCALE_SMALL to SIZESCALE_NORMAL)
+				M.sizescale(SIZESCALE_NORMAL)
+			if((0 - INFINITY) to SIZESCALE_TINY)
+				M.sizescale(SIZESCALE_SMALL)
+		M.update_transform()
+	return 1
+*/
+
+datum/design/sizeray
+	name = "Size Ray"
+	desc = "Abuse bluespace tech to alter living matter scale."
+	id = "sizeray"
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = 1000, MAT_GLASS = 1000, MAT_DIAMOND = 2500, MAT_URANIUM = 2500, MAT_TITANIUM = 1000)
+	build_path = /obj/item/gun/energy/laser/sizeray
+	category = list("Weapons")
+
+/obj/item/projectile/sizeray
+	name = "sizeray beam"
+	icon_state = "omnilaser"
+	hitsound = null
+	damage = 0
+	damage_type = STAMINA
+	flag = "laser"
+	pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
+
+/obj/item/projectile/sizeray/shrinkray
+	icon_state="bluelaser"
+
+/obj/item/projectile/sizeray/growthray
+	icon_state="laser"
+
+/obj/item/projectile/sizeray/shrinkray/on_hit(var/atom/target, var/blocked = 0)
+	if(istype(target, /mob/living))
+		var/mob/living/M = target
+		switch(M.size_multiplier)
+			if(SIZESCALE_HUGE to INFINITY)
+				M.sizescale(SIZESCALE_BIG)
+			if(SIZESCALE_BIG to SIZESCALE_HUGE)
+				M.sizescale(SIZESCALE_NORMAL)
+			if(SIZESCALE_NORMAL to SIZESCALE_BIG)
+				M.sizescale(SIZESCALE_SMALL)
+			if((0 - INFINITY) to SIZESCALE_NORMAL)
+				M.sizescale(SIZESCALE_TINY)
+		M.update_transform()
+	return 1
+
+/obj/item/projectile/sizeray/growthray/on_hit(var/atom/target, var/blocked = 0)
+	if(istype(target, /mob/living))
+		var/mob/living/M = target
+		switch(M.size_multiplier)
+			if(SIZESCALE_BIG to SIZESCALE_HUGE)
+				M.sizescale(SIZESCALE_HUGE)
+			if(SIZESCALE_NORMAL to SIZESCALE_BIG)
+				M.sizescale(SIZESCALE_BIG)
+			if(SIZESCALE_SMALL to SIZESCALE_NORMAL)
+				M.sizescale(SIZESCALE_NORMAL)
+			if((0 - INFINITY) to SIZESCALE_TINY)
+				M.sizescale(SIZESCALE_SMALL)
+		M.update_transform()
+	return 1
+
+/obj/item/ammo_casing/energy/laser/growthray
+	projectile_type = /obj/item/projectile/sizeray/growthray
+	select_name = "Growth"
+
+/obj/item/ammo_casing/energy/laser/shrinkray
+	projectile_type = /obj/item/projectile/sizeray/shrinkray
+	select_name = "Shrink"
+
+
+//Gun here
+/obj/item/gun/energy/laser/sizeray
+	name = "size ray"
+	icon_state = "bluetag"
+	desc = "Size manipulator using bluespace breakthroughs."
+	item_state = null	//so the human update icon uses the icon_state instead.
+	ammo_type = list(/obj/item/ammo_casing/energy/laser/shrinkray, /obj/item/ammo_casing/energy/laser/growthray)
+	selfcharge = 1
+	charge_delay = 5
+	ammo_x_offset = 2
+	clumsy_check = 1
+
+	attackby(obj/item/W, mob/user)
+		if(W==src)
+			if(icon_state=="bluetag")
+				icon_state="redtag"
+				ammo_type = list(/obj/item/ammo_casing/energy/laser/growthray)
+			else
+				icon_state="bluetag"
+				ammo_type = list(/obj/item/ammo_casing/energy/laser/shrinkray)
+		return ..()

modular_citadel/code/modules/vore/trycatch_vr.dm

@@ -0,0 +1,62 @@
+/*
+This file is for jamming single-line procs into Polaris procs.
+It will prevent runtimes and allow their code to run if these fail.
+It will also log when we mess up our code rather than making it vague.
+
+Call it at the top of a stock proc with...
+
+if(attempt_vr(object,proc to call,args)) return
+
+...if you are replacing an entire proc.
+
+The proc you're attemping should return nonzero values on success.
+*/
+
+/proc/attempt_vr(callon, procname, list/args=null)
+	try
+		if(!callon || !procname)
+			CRASH("attempt_vr: Invalid obj/proc: [callon]/[procname]")
+			return 0
+
+		var/result = call(callon,procname)(arglist(args))
+
+		return result
+
+	catch(var/exception/e)
+		CRASH("attempt_vr runtimed when calling [procname] on [callon].")
+		CRASH("attempt_vr catch: [e] on [e.file]:[e.line]")
+		return 0
+
+/*
+This is the _vr version of calling hooks.
+It's meant to have different messages, and also the try/catch block.
+For when you want hooks and want to know when you ruin everything,
+vs when Polaris ruins everything.
+
+Call it at the top of a stock proc with...
+
+if(hook_vr(proc,args)) return
+
+...if you are replacing an entire proc.
+
+The hooks you're calling should return nonzero values on success.
+*/
+/proc/hook_vr(hook, list/args=null)
+	try
+		var/hook_path = text2path("/hook/[hook]")
+		if(!hook_path)
+			CRASH("hook_vr: Invalid hook '/hook/[hook]' called.")
+			return 0
+
+		var/caller = new hook_path
+		var/status = 1
+		for(var/P in typesof("[hook_path]/proc"))
+			if(!call(caller, P)(arglist(args)))
+				CRASH("hook_vr: Hook '[P]' failed or runtimed.")
+				status = 0
+
+		return status
+
+	catch(var/exception/e)
+		CRASH("hook_vr itself failed or runtimed. Exception below.")
+		CRASH("hook_vr catch: [e] on [e.file]:[e.line]")