Merge pull request #5994 from Poojawa/beepboop

Adds IPCs refractors preferences
2018-03-21 19:20:43 +00:00
parent 4403ccf908 8377bdf9a8
commit 0a331a26ee
116 changed files with 2031 additions and 1335 deletions
@@ -47,3 +47,28 @@
 	name = "Top Hat"
 	category = slot_head
 	path = /obj/item/clothing/head/that
+
+//trek fancy Hats!
+/datum/gear/trekcap
+	name = "Federation Officer's Cap"
+	category = slot_head
+	path = /obj/item/clothing/head/caphat/formal/fedcover
+	restricted_roles = list("Captain","Head of Personnel")
+
+/datum/gear/trekcapmedisci
+	name = "Federation Officer's Cap"
+	category = slot_head
+	path = /obj/item/clothing/head/caphat/formal/fedcover/medsci
+	restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist")
+
+/datum/gear/trekcapeng
+	name = "Federation Officer's Cap"
+	category = slot_head
+	path = /obj/item/clothing/head/caphat/formal/fedcover/eng
+	restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
+
+/datum/gear/trekcapsec
+	name = "Federation Officer's Cap"
+	category = slot_head
+	path = /obj/item/clothing/head/caphat/formal/fedcover/sec
+	restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
@@ -67,3 +67,36 @@
 	name = "Ian Shirt"
 	category = slot_wear_suit
 	path = /obj/item/clothing/suit/ianshirt
+
+/datum/gear/trekds9_coat
+	name = "DS9 Overcoat (use uniform)"
+	category = slot_wear_suit
+	path = /obj/item/clothing/suit/storage/trek/ds9
+	restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster",
+							"Medical Doctor","Chemist","Virologist","Geneticist","Scientist", "Roboticist",
+							"Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer",
+							"Cargo Technician", "Shaft Miner") //everyone who actually deserves a job.
+//Federation jackets from movies
+/datum/gear/trekcmdcap
+	name = "fed (movie) uniform, Captain"
+	category = slot_wear_suit
+	path = /obj/item/clothing/suit/storage/fluff/fedcoat/capt
+	restricted_roles = list("Captain","Head of Personnel")
+
+/datum/gear/trekcmdmov
+	name = "fed (movie) uniform, sec"
+	category = slot_wear_suit
+	path = /obj/item/clothing/suit/storage/fluff/fedcoat
+	restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster","Warden","Detective","Security Officer")
+
+/datum/gear/trekmedscimov
+	name = "fed (movie) uniform, med/sci"
+	category = slot_wear_suit
+	path = /obj/item/clothing/suit/storage/fluff/fedcoat/medsci
+	restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist")
+
+/datum/gear/trekengmov
+	name = "fed (movie) uniform, ops/eng"
+	category = slot_wear_suit
+	path = /obj/item/clothing/suit/storage/fluff/fedcoat/eng
+	restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Cargo Technician", "Shaft Miner", "Quartermaster")
@@ -122,3 +122,99 @@
 	name = "Tactitool Turtleneck"
 	category = slot_w_uniform
 	path = /obj/item/clothing/under/syndicate/cosmetic
+
+// Trekie things
+//TOS
+/datum/gear/trekcmdtos
+	name = "TOS uniform, cmd"
+	category = slot_w_uniform
+	path = /obj/item/clothing/under/rank/trek/command
+	restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster")
+
+/datum/gear/trekmedscitos
+	name = "TOS uniform, med/sci"
+	category = slot_w_uniform
+	path = /obj/item/clothing/under/rank/trek/medsci
+	restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist")
+
+/datum/gear/trekengtos
+	name = "TOS uniform, ops/sec"
+	category = slot_w_uniform
+	path = /obj/item/clothing/under/rank/trek/engsec
+	restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
+
+//TNG
+/datum/gear/trekcmdtng
+	name = "TNG uniform, cmd"
+	category = slot_w_uniform
+	path = /obj/item/clothing/under/rank/trek/command/next
+	restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster")
+
+/datum/gear/trekmedscitng
+	name = "TNG uniform, med/sci"
+	category = slot_w_uniform
+	path = /obj/item/clothing/under/rank/trek/medsci/next
+	restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist")
+
+/datum/gear/trekengtng
+	name = "TNG uniform, ops/sec"
+	category = slot_w_uniform
+	path = /obj/item/clothing/under/rank/trek/engsec/next
+	restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
+
+//VOY
+/datum/gear/trekcmdvoy
+	name = "VOY uniform, cmd"
+	category = slot_w_uniform
+	path = /obj/item/clothing/under/rank/trek/command/voy
+	restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster")
+
+/datum/gear/trekmedscivoy
+	name = "VOY uniform, med/sci"
+	category = slot_w_uniform
+	path = /obj/item/clothing/under/rank/trek/medsci/voy
+	restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist")
+
+/datum/gear/trekengvoy
+	name = "VOY uniform, ops/sec"
+	category = slot_w_uniform
+	path = /obj/item/clothing/under/rank/trek/engsec/voy
+	restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
+
+//DS9
+/datum/gear/trekcmdds9
+	name = "DS9 uniform, cmd"
+	category = slot_w_uniform
+	path = /obj/item/clothing/under/rank/trek/command/ds9
+	restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster")
+
+/datum/gear/trekmedscids9
+	name = "DS9 uniform, med/sci"
+	category = slot_w_uniform
+	path = /obj/item/clothing/under/rank/trek/medsci/ds9
+	restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist")
+
+/datum/gear/trekengds9
+	name = "DS9 uniform, ops/sec"
+	category = slot_w_uniform
+	path = /obj/item/clothing/under/rank/trek/engsec/ds9
+	restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
+
+//ENT
+/datum/gear/trekcmdent
+	name = "ENT uniform, cmd"
+	category = slot_w_uniform
+	path = /obj/item/clothing/under/rank/trek/command/ent
+	restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster")
+
+/datum/gear/trekmedscient
+	name = "ENT uniform, med/sci"
+	category = slot_w_uniform
+	path = /obj/item/clothing/under/rank/trek/medsci/ent
+	restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist")
+
+/datum/gear/trekengent
+	name = "ENT uniform, ops/sec"
+	category = slot_w_uniform
+	path = /obj/item/clothing/under/rank/trek/engsec/ent
+	restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
@@ -1,156 +0,0 @@
-// Trekie things
-//TOS
-/datum/gear/uniform/job_trek/cmd/tos
-	name = "TOS uniform, cmd"
-	category = slot_w_uniform
-	path = /obj/item/clothing/under/rank/trek/command
-	restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster")
-
-/datum/gear/uniform/job_trek/medsci/tos
-	name = "TOS uniform, med/sci"
-	category = slot_w_uniform
-	path = /obj/item/clothing/under/rank/trek/medsci
-	restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist")
-
-/datum/gear/uniform/job_trek/eng/tos
-	name = "TOS uniform, ops/sec"
-	category = slot_w_uniform
-	path = /obj/item/clothing/under/rank/trek/engsec
-	restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
-
-//Federation jackets from movies
-/datum/gear/uniform/job_trek/cmd/cap
-	name = "fed (movie) uniform, Captain"
-	category = slot_wear_suit
-	path = /obj/item/clothing/suit/storage/fluff/fedcoat/capt
-	restricted_roles = list("Captain","Head of Personnel")
-
-/datum/gear/uniform/job_trek/cmd/mov
-	name = "fed (movie) uniform, sec"
-	category = slot_wear_suit
-	path = /obj/item/clothing/suit/storage/fluff/fedcoat
-	restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster","Warden","Detective","Security Officer")
-
-/datum/gear/suit/job_trek/medsci/mov
-	name = "fed (movie) uniform, med/sci"
-	category = slot_wear_suit
-	path = /obj/item/clothing/suit/storage/fluff/fedcoat/medsci
-	restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist")
-
-/datum/gear/suit/job_trek/eng/mov
-	name = "fed (movie) uniform, ops/eng"
-	category = slot_wear_suit
-	path = /obj/item/clothing/suit/storage/fluff/fedcoat/eng
-	restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Cargo Technician", "Shaft Miner", "Quartermaster")
-
-//TNG
-/datum/gear/uniform/job_trek/cmd/tng
-	name = "TNG uniform, cmd"
-	category = slot_w_uniform
-	path = /obj/item/clothing/under/rank/trek/command/next
-	restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster")
-
-/datum/gear/uniform/job_trek/medsci/tng
-	name = "TNG uniform, med/sci"
-	category = slot_w_uniform
-	path = /obj/item/clothing/under/rank/trek/medsci/next
-	restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist")
-
-/datum/gear/uniform/job_trek/eng/tng
-	name = "TNG uniform, ops/sec"
-	category = slot_w_uniform
-	path = /obj/item/clothing/under/rank/trek/engsec/next
-	restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
-
-//VOY
-/datum/gear/uniform/job_trek/cmd/voy
-	name = "VOY uniform, cmd"
-	category = slot_w_uniform
-	path = /obj/item/clothing/under/rank/trek/command/voy
-	restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster")
-
-/datum/gear/uniform/job_trek/medsci/voy
-	name = "VOY uniform, med/sci"
-	category = slot_w_uniform
-	path = /obj/item/clothing/under/rank/trek/medsci/voy
-	restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist")
-
-/datum/gear/uniform/job_trek/eng/voy
-	name = "VOY uniform, ops/sec"
-	category = slot_w_uniform
-	path = /obj/item/clothing/under/rank/trek/engsec/voy
-	restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
-
-//DS9
-
-/datum/gear/suit/job_trek/ds9_coat
-	name = "DS9 Overcoat (use uniform)"
-	category = slot_wear_suit
-	path = /obj/item/clothing/suit/storage/trek/ds9
-	restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster",
-							"Medical Doctor","Chemist","Virologist","Geneticist","Scientist", "Roboticist",
-							"Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer",
-							"Cargo Technician", "Shaft Miner") //everyone who actually deserves a job.
-
-/datum/gear/uniform/job_trek/cmd/ds9
-	name = "DS9 uniform, cmd"
-	category = slot_w_uniform
-	path = /obj/item/clothing/under/rank/trek/command/ds9
-	restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster")
-
-/datum/gear/uniform/job_trek/medsci/ds9
-	name = "DS9 uniform, med/sci"
-	category = slot_w_uniform
-	path = /obj/item/clothing/under/rank/trek/medsci/ds9
-	restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist")
-
-/datum/gear/uniform/job_trek/eng/ds9
-	name = "DS9 uniform, ops/sec"
-	category = slot_w_uniform
-	path = /obj/item/clothing/under/rank/trek/engsec/ds9
-	restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
-
-
-//ENT
-/datum/gear/uniform/job_trek/cmd/ent
-	name = "ENT uniform, cmd"
-	category = slot_w_uniform
-	path = /obj/item/clothing/under/rank/trek/command/ent
-	restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster")
-
-/datum/gear/uniform/job_trek/medsci/ent
-	name = "ENT uniform, med/sci"
-	category = slot_w_uniform
-	path = /obj/item/clothing/under/rank/trek/medsci/ent
-	restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist")
-
-/datum/gear/uniform/job_trek/eng/ent
-	name = "ENT uniform, ops/sec"
-	category = slot_w_uniform
-	path = /obj/item/clothing/under/rank/trek/engsec/ent
-	restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
-
-//Hats!
-/datum/gear/hat/job_trek/cap
-	name = "Federation Officer's Cap"
-	category = slot_head
-	path = /obj/item/clothing/head/caphat/formal/fedcover
-	restricted_roles = list("Captain","Head of Personnel")
-
-/datum/gear/hat/job_trek/cap/medisci
-	name = "Federation Officer's Cap"
-	category = slot_head
-	path = /obj/item/clothing/head/caphat/formal/fedcover/medsci
-	restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist")
-
-/datum/gear/hat/job_trek/cap/eng
-	name = "Federation Officer's Cap"
-	category = slot_head
-	path = /obj/item/clothing/head/caphat/formal/fedcover/eng
-	restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
-
-/datum/gear/hat/job_trek/cap/sec
-	name = "Federation Officer's Cap"
-	category = slot_head
-	path = /obj/item/clothing/head/caphat/formal/fedcover/sec
-	restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
@@ -3,20 +3,650 @@
 #define BACKPACK_SLOT_AMT	4

 /datum/preferences
+	//gear
 	var/gear_points = 10
 	var/list/gear_categories
 	var/list/chosen_gear
 	var/gear_tab
+
+	//pref vars
 	var/screenshake = 100
 	var/damagescreenshake = 2
 	var/arousable = TRUE
 	var/widescreenpref = TRUE
 	var/autostand = TRUE

+	//vore prefs
+	var/toggleeatingnoise = TRUE
+	var/toggledigestionnoise = TRUE
+	var/hound_sleeper = TRUE
+	var/cit_toggles = TOGGLES_CITADEL
+
+	// stuff that was in base
+	max_save_slots = 10
+	features = list("mcolor" = "FFF",
+		"tail_lizard" = "Smooth",
+		"tail_human" = "None",
+		"snout" = "Round",
+		"horns" = "None",
+		"ears" = "None",
+		"wings" = "None",
+		"frills" = "None",
+		"spines" = "None",
+		"body_markings" = "None",
+		"legs" = "Normal Legs",
+		"moth_wings" = "Plain",
+		"mcolor2" = "FFF",
+		"mcolor3" = "FFF",
+		"mam_body_markings" = "None",
+		"mam_ears" = "None",
+		"mam_tail" = "None",
+		"mam_tail_animated" = "None",
+		"xenodorsal" = "None",
+		"xenohead" = "None",
+		"xenotail" = "None",
+		"taur" = "None",
+		"exhibitionist" = FALSE,
+		"genitals_use_skintone" = FALSE,
+		"has_cock" = FALSE,
+		"cock_shape" = "Human",
+		"cock_length" = 6,
+		"cock_girth_ratio" = COCK_GIRTH_RATIO_DEF,
+		"cock_color" = "fff",
+		"has_sheath" = FALSE,
+		"sheath_color" = "fff",
+		"has_balls" = FALSE,
+		"balls_internal" = FALSE,
+		"balls_color" = "fff",
+		"balls_amount" = 2,
+		"balls_sack_size" = BALLS_SACK_SIZE_DEF,
+		"balls_size" = BALLS_SIZE_DEF,
+		"balls_cum_rate" = CUM_RATE,
+		"balls_cum_mult" = CUM_RATE_MULT,
+		"balls_efficiency" = CUM_EFFICIENCY,
+		"balls_fluid" = "semen",
+		"has_ovi" = FALSE,
+		"ovi_shape" = "knotted",
+		"ovi_length" = 6,
+		"ovi_color" = "fff",
+		"has_eggsack" = FALSE,
+		"eggsack_internal" = TRUE,
+		"eggsack_color" = "fff",
+		"eggsack_size" = BALLS_SACK_SIZE_DEF,
+		"eggsack_egg_color" = "fff",
+		"eggsack_egg_size" = EGG_GIRTH_DEF,
+		"has_breasts" = FALSE,
+		"breasts_color" = "fff",
+		"breasts_size" = "C",
+		"breasts_shape" = "Pair",
+		"breasts_fluid" = "milk",
+		"has_vag" = FALSE,
+		"vag_shape" = "Human",
+		"vag_color" = "fff",
+		"vag_clits" = 1,
+		"vag_clit_diam" = 0.25,
+		"has_womb" = FALSE,
+		"womb_cum_rate" = CUM_RATE,
+		"womb_cum_mult" = CUM_RATE_MULT,
+		"womb_efficiency" = CUM_EFFICIENCY,
+		"womb_fluid" = "femcum",
+		"ipc_screen" = "Sunburst",
+		"flavor_text" = ""
+		)
+
 /datum/preferences/New(client/C)
 	..()
 	LAZYINITLIST(chosen_gear)

+/datum/preferences/proc/citadel_dat_replace(current_tab)
+	var/mob/user
+	//This proc is for menus other than game pref and char pref
+	. = "<center>"
+	. += "<a href='?_src_=prefs;preference=tab;tab=0' [current_tab == 0 ? "class='linkOn'" : ""]>Character Settings</a>"
+	. += "<a href='?_src_=prefs;preference=tab;tab=2' [current_tab == 2 ? "class='linkOn'" : ""]>Character Appearance</a>"
+	. += "<a href='?_src_=prefs;preference=tab;tab=3' [current_tab == 3 ? "class='linkOn'" : ""]>Loadout</a>"
+	. += "<a href='?_src_=prefs;preference=tab;tab=1' [current_tab == 1 ? "class='linkOn'" : ""]>Game Preferences</a>"
+
+	if(!path)
+		. += "<div class='notice'>Please create an account to save your preferences</div>"
+
+	. += "</center>"
+
+	. += "<HR>"
+			
+	//Character Appearance
+	if(current_tab == 2)
+		update_preview_icon(nude=TRUE)
+		user << browse_rsc(preview_icon, "previewicon.png")
+		. += "<table><tr><td width='340px' height='300px' valign='top'>"
+		. += "<div class='statusDisplay'><center><img src=previewicon.png width=[preview_icon.Width()] height=[preview_icon.Height()]></center></div>"
+		. += "<a href='?_src_=prefs;preference=flavor_text;task=input'><b>Set Flavor Text</b></a><br>"
+		if(lentext(features["flavor_text"]) <= 40)
+			if(!lentext(features["flavor_text"]))
+				. += "\[...\]"
+			else
+				. += "[features["flavor_text"]]"
+		else
+			. += "[TextPreview(features["flavor_text"])]...<BR>"
+		. += "<h2>Body</h2>"
+		. += "<b>Gender:</b> <a href='?_src_=prefs;preference=gender'>[gender == MALE ? "Male" : "Female"]</a><BR>"
+		. += "<b>Species:</b><a href='?_src_=prefs;preference=species;task=input'>[pref_species.id]</a><BR>"
+		. += "<a href='?_src_=prefs;preference=all;task=random'>Random Body</A><BR>"
+		. += "<a href='?_src_=prefs;preference=all'>Always Random Body: [be_random_body ? "Yes" : "No"]</A><BR>"
+		if((MUTCOLORS in pref_species.species_traits) || (MUTCOLORS_PARTSONLY in pref_species.species_traits))
+			. += "<b>Primary Color: </b><span style='border: 1px solid #161616; background-color: #[features["mcolor"]];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=mutant_color;task=input'>Change</a><BR>"
+			. += "<b>Secondary Color: </b><span style='border: 1px solid #161616; background-color: #[features["mcolor2"]];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=mutant_color2;task=input'>Change</a><BR>"
+			. += "<b>Tertiary Color: </b><span style='border: 1px solid #161616; background-color: #[features["mcolor3"]];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=mutant_color3;task=input'>Change</a><BR>"
+		if(pref_species.use_skintones)
+			. += "<b>Skin Tone: </b><a href='?_src_=prefs;preference=s_tone;task=input'>[skin_tone]</a><BR>"
+			. += "<b>Genitals Use Skintone:</b><a href='?_src_=prefs;preference=genital_colour'>[features["genitals_use_skintone"] == TRUE ? "Enabled" : "Disabled"]</a><BR>"
+
+		if(HAIR in pref_species.species_traits)
+			. += "<b>Hair Style: </b><a href='?_src_=prefs;preference=hair_style;task=input'>[hair_style]</a><BR>"
+			. += "<b>Hair Color: </b><span style='border:1px solid #161616; background-color: #[hair_color];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=hair;task=input'>Change</a><BR>"
+			. += "<b>Facial Hair Style: </b><a href='?_src_=prefs;preference=facial_hair_style;task=input'>[facial_hair_style]</a><BR>"
+			. += "<b>Facial Hair Color: </b><span style='border: 1px solid #161616; background-color: #[facial_hair_color];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=facial;task=input'>Change</a><BR>"
+		if(EYECOLOR in pref_species.species_traits)
+			. += "<b>Eye Color: </b><span style='border: 1px solid #161616; background-color: #[eye_color];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=eyes;task=input'>Change</a><BR>"
+		if("tail_lizard" in pref_species.mutant_bodyparts)
+			. += "<b>Tail: </b><a href='?_src_=prefs;preference=tail_lizard;task=input'>[features["tail_lizard"]]</a><BR>"
+		else if("mam_tail" in pref_species.mutant_bodyparts)
+			. += "<b>Tail: </b><a href='?_src_=prefs;preference=mam_tail;task=input'>[features["mam_tail"]]</a><BR>"
+		else if("tail_human" in pref_species.mutant_bodyparts)
+			. += "<b>Tail: </b><a href='?_src_=prefs;preference=tail_human;task=input'>[features["tail_human"]]</a><BR>"
+		if("snout" in pref_species.mutant_bodyparts)
+			. += "<b>Snout: </b><a href='?_src_=prefs;preference=snout;task=input'>[features["snout"]]</a><BR>"
+		if("horns" in pref_species.mutant_bodyparts)
+			. += "<b>Horns: </b><a href='?_src_=prefs;preference=horns;task=input'>[features["horns"]]</a><BR>"
+		if("frills" in pref_species.mutant_bodyparts)
+			. += "<b>Frills: </b><a href='?_src_=prefs;preference=frills;task=input'>[features["frills"]]</a><BR>"
+		if("spines" in pref_species.mutant_bodyparts)
+			. += "<b>Spines: </b><a href='?_src_=prefs;preference=spines;task=input'>[features["spines"]]</a><BR>"
+		if("body_markings" in pref_species.mutant_bodyparts)
+			. += "<b>Body Markings: </b><a href='?_src_=prefs;preference=body_markings;task=input'>[features["body_markings"]]</a><BR>"
+		else if("mam_body_markings" in pref_species.mutant_bodyparts)
+			. += "<b>Body Markings: </b><a href='?_src_=prefs;preference=mam_body_markings;task=input'>[features["mam_body_markings"]]</a><BR>"
+		if("mam_ears" in pref_species.mutant_bodyparts)
+			. += "<b>Ears: </b><a href='?_src_=prefs;preference=mam_ears;task=input'>[features["mam_ears"]]</a><BR>"
+		else if("ears" in pref_species.mutant_bodyparts)
+			. += "<b>Ears: </b><a href='?_src_=prefs;preference=ears;task=input'>[features["ears"]]</a><BR>"
+		if("legs" in pref_species.mutant_bodyparts)
+			. += "<b>Legs: </b><a href='?_src_=prefs;preference=legs;task=input'>[features["legs"]]</a><BR>"
+		if("moth_wings" in pref_species.mutant_bodyparts)
+			. += "<b>Moth wings</b><a href='?_src_=prefs;preference=moth_wings;task=input'>[features["moth_wings"]]</a><BR>"
+		if("taur" in pref_species.mutant_bodyparts)
+			. += "<b>Taur: </b><a href='?_src_=prefs;preference=taur;task=input'>[features["taur"]]</a><BR>"
+		if("wings" in pref_species.mutant_bodyparts && GLOB.r_wings_list.len >1)
+			. += "<b>Wings: </b><a href='?_src_=prefs;preference=wings;task=input'>[features["wings"]]</a><BR>"
+		if("xenohead" in pref_species.mutant_bodyparts)
+			. += "<b>Caste: </b><a href='?_src_=prefs;preference=xenohead;task=input'>[features["xenohead"]]</a><BR>"
+		if("xenotail" in pref_species.mutant_bodyparts)
+			. += "<b>Tail: </b><a href='?_src_=prefs;preference=xenotail;task=input'>[features["xenotail"]]</a><BR>"
+		if("xenodorsal" in pref_species.mutant_bodyparts)
+			. += "<b>Dorsal Tubes: </b><a href='?_src_=prefs;preference=xenodorsal;task=input'>[features["xenodorsal"]]</a><BR>"
+		if("ipc_screen" in pref_species.mutant_bodyparts)	
+			. += "<b>Screen:</b><a href='?_src_=prefs;preference=ipc_screen;task=input'>[features["ipc_screen"]]</a><BR>"
+
+		. += "</td><td width='300px' height='300px' valign='top'>"
+
+		. += "<h2>Clothing & Equipment</h2>"
+
+		. += "<b>Underwear:</b><a href ='?_src_=prefs;preference=underwear;task=input'>[underwear]</a><br>"
+		. += "<b>Undershirt:</b><a href ='?_src_=prefs;preference=undershirt;task=input'>[undershirt]</a><br>"
+		. += "<b>Socks:</b><a href ='?_src_=prefs;preference=socks;task=input'>[socks]</a><br>"
+		. += "<b>Backpack:</b><a href ='?_src_=prefs;preference=bag;task=input'>[backbag]</a><br>"
+		. += "<b>Uplink Location:</b><a href ='?_src_=prefs;preference=uplink_loc;task=input'>[uplink_spawn_loc]</a><br>"
+
+		. += "<h2>Genitals</h2>"
+		if(NOGENITALS in pref_species.species_traits)
+			. += "<b>Your species ([pref_species.name]) does not support genitals!</b><br>"
+		else
+			. += "<b>Has Penis:</b><a href='?_src_=prefs;preference=has_cock'>[features["has_cock"] == TRUE ? "Yes" : "No"]</a><BR>"
+			if(features["has_cock"] == TRUE)
+				if(pref_species.use_skintones && features["genitals_use_skintone"] == TRUE)
+					. += "<b>Penis Color:</b><span style='border: 1px solid #161616; background-color: #[skintone2hex(skin_tone)];'>&nbsp;&nbsp;&nbsp;</span>(Skin tone overriding)<BR>"
+				else
+					. += "<b>Penis Color:</b><span style='border: 1px solid #161616; background-color: #[features["cock_color"]];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=cock_color;task=input'>Change</a><BR>"
+				. += "<b>Penis Shape:</b> <a href='?_src_=prefs;preference=cock_shape;task=input'>[features["cock_shape"]]</a><BR>"
+				. += "<b>Penis Length:</b> <a href='?_src_=prefs;preference=cock_length;task=input'>[features["cock_length"]] inch(es)</a><BR>"
+				. += "<b>Has Testicles:</b><a href='?_src_=prefs;preference=has_balls'>[features["has_balls"] == TRUE ? "Yes" : "No"]</a><BR>"
+				if(features["has_balls"] == TRUE)
+					if(pref_species.use_skintones && features["genitals_use_skintone"] == TRUE)
+						. += "<b>Testicles Color:</b><span style='border: 1px solid #161616; background-color: #[skintone2hex(skin_tone)];'>&nbsp;&nbsp;&nbsp;</span>(Skin tone overriding)<BR>"
+					else
+						. += "<b>Testicles Color:</b><span style='border: 1px solid #161616; background-color: #[features["balls_color"]];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=balls_color;task=input'>Change</a><BR>"
+			. += "<b>Has Vagina:</b><a href='?_src_=prefs;preference=has_vag'>[features["has_vag"] == TRUE ? "Yes" : "No"]</a><BR>"
+			if(features["has_vag"])
+				. += "<b>Vagina Type:</b> <a href='?_src_=prefs;preference=vag_shape;task=input'>[features["vag_shape"]]</a><BR>"
+				if(pref_species.use_skintones && features["genitals_use_skintone"] == TRUE)
+					. += "<b>Vagina Color:</b><span style='border: 1px solid #161616; background-color: #[skintone2hex(skin_tone)];'>&nbsp;&nbsp;&nbsp;</span>(Skin tone overriding)<BR>"
+				else
+					. += "<b>Vagina Color:</b><span style='border: 1px solid #161616; background-color: #[features["vag_color"]];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=vag_color;task=input'>Change</a><BR>"
+				. += "<b>Has Womb:</b><a href='?_src_=prefs;preference=has_womb'>[features["has_womb"] == TRUE ? "Yes" : "No"]</a><BR>"
+			. += "<b>Has Breasts:</b><a href='?_src_=prefs;preference=has_breasts'>[features["has_breasts"] == TRUE ? "Yes" : "No"]</a><BR>"
+			if(features["has_breasts"])
+				if(pref_species.use_skintones && features["genitals_use_skintone"] == TRUE)
+					. += "<b>Color:</b><span style='border: 1px solid #161616; background-color: #[skintone2hex(skin_tone)];'>&nbsp;&nbsp;&nbsp;</span>(Skin tone overriding)<BR>"
+				else
+					. += "<b>Color:</b><span style='border: 1px solid #161616; background-color: #[features["breasts_color"]];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=breasts_color;task=input'>Change</a><BR>"
+				. += "<b>Cup Size:</b><a href='?_src_=prefs;preference=breasts_size;task=input'>[features["breasts_size"]]</a><br>"
+				. += "<b>Breast Shape:</b><a href='?_src_=prefs;preference=breasts_shape;task=input'>[features["breasts_shape"]]</a><br>"
+			/*
+			. += "<h3>Ovipositor</h3>"
+			. += "<b>Has Ovipositor:</b><a href='?_src_=prefs;preference=has_ovi'>[features["has_ovi"] == TRUE ? "Yes" : "No"]</a>"
+			if(features["has_ovi"])
+				. += "<b>Ovi Color:</b><span style='border: 1px solid #161616; background-color: #[features["ovi_color"]];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=ovi_color;task=input'>Change</a>"
+				. += "<h3>Eggsack</h3>"
+				. += "<b>Has Eggsack:</b><a href='?_src_=prefs;preference=has_eggsack'>[features["has_eggsack"] == TRUE ? "Yes" : "No"]</a><BR>"
+				if(features["has_eggsack"] == TRUE)
+					. += "<b>Color:</b><span style='border: 1px solid #161616; background-color: #[features["eggsack_color"]];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=eggsack_color;task=input'>Change</a>"
+					. += "<b>Egg Color:</b><span style='border: 1px solid #161616; background-color: #[features["eggsack_egg_color"]];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=egg_color;task=input'>Change</a>"
+					. += "<b>Egg Size:</b><a href='?_src_=prefs;preference=egg_size;task=input'>[features["eggsack_egg_size"]]\" Diameter</a>"
+			. += "</td>"
+			*/
+			. += "</td></tr></table>"
+
+/datum/preferences/proc/process_citadel_link(mob/user, list/href_list)
+	if("input")
+		switch(href_list["preference"])
+			if("flavor_text")
+				var/msg = stripped_multiline_input(usr,"Set the flavor text in your 'examine' verb. This can also be used for OOC notes and preferences!","Flavor Text",html_decode(features["flavor_text"]), MAX_MESSAGE_LEN*2, TRUE) as message
+				if(msg != null)
+					msg = copytext(msg, 1, MAX_MESSAGE_LEN*2)
+					features["flavor_text"] = msg
+
+			if("hair")
+				var/new_hair = input(user, "Choose your character's hair colour:", "Character Preference","#"+hair_color) as color|null
+				if(new_hair)
+					hair_color = sanitize_hexcolor(new_hair)
+
+			if("hair_style")
+				var/new_hair_style
+				if(gender == MALE)
+					new_hair_style = input(user, "Choose your character's hair style:", "Character Preference")  as null|anything in GLOB.hair_styles_male_list
+				else
+					new_hair_style = input(user, "Choose your character's hair style:", "Character Preference")  as null|anything in GLOB.hair_styles_female_list
+				if(new_hair_style)
+					hair_style = new_hair_style
+
+			if("next_hair_style")
+				if (gender == MALE)
+					hair_style = next_list_item(hair_style, GLOB.hair_styles_male_list)
+				else
+					hair_style = next_list_item(hair_style, GLOB.hair_styles_female_list)
+
+			if("previous_hair_style")
+				if (gender == MALE)
+					hair_style = previous_list_item(hair_style, GLOB.hair_styles_male_list)
+				else
+					hair_style = previous_list_item(hair_style, GLOB.hair_styles_female_list)
+
+			if("facial")
+				var/new_facial = input(user, "Choose your character's facial-hair colour:", "Character Preference","#"+facial_hair_color) as color|null
+				if(new_facial)
+					facial_hair_color = sanitize_hexcolor(new_facial)
+				if("facial_hair_style")
+					var/new_facial_hair_style
+					if(gender == MALE)
+						new_facial_hair_style = input(user, "Choose your character's facial-hair style:", "Character Preference")  as null|anything in GLOB.facial_hair_styles_male_list
+					else
+						new_facial_hair_style = input(user, "Choose your character's facial-hair style:", "Character Preference")  as null|anything in GLOB.facial_hair_styles_female_list
+					if(new_facial_hair_style)
+						facial_hair_style = new_facial_hair_style
+
+			if("next_facehair_style")
+				if (gender == MALE)
+					facial_hair_style = next_list_item(facial_hair_style, GLOB.facial_hair_styles_male_list)
+				else
+					facial_hair_style = next_list_item(facial_hair_style, GLOB.facial_hair_styles_female_list)
+				if("previous_facehair_style")
+					if (gender == MALE)
+						facial_hair_style = previous_list_item(facial_hair_style, GLOB.facial_hair_styles_male_list)
+					else
+						facial_hair_style = previous_list_item(facial_hair_style, GLOB.facial_hair_styles_female_list)
+
+			if("underwear")
+				var/new_underwear
+				if(gender == MALE)
+					new_underwear = input(user, "Choose your character's underwear:", "Character Preference")  as null|anything in GLOB.underwear_m
+				else
+					new_underwear = input(user, "Choose your character's underwear:", "Character Preference")  as null|anything in GLOB.underwear_f
+				if(new_underwear)
+					underwear = new_underwear
+
+			if("undershirt")
+				var/new_undershirt
+				if(gender == MALE)
+					new_undershirt = input(user, "Choose your character's undershirt:", "Character Preference") as null|anything in GLOB.undershirt_m
+				else
+					new_undershirt = input(user, "Choose your character's undershirt:", "Character Preference") as null|anything in GLOB.undershirt_f
+				if(new_undershirt)
+					undershirt = new_undershirt
+
+			if("socks")
+				var/new_socks
+				new_socks = input(user, "Choose your character's socks:", "Character Preference") as null|anything in GLOB.socks_list
+				if(new_socks)
+					socks = new_socks
+
+			if("eyes")
+				var/new_eyes = input(user, "Choose your character's eye colour:", "Character Preference","#"+eye_color) as color|null
+				if(new_eyes)
+					eye_color = sanitize_hexcolor(new_eyes)
+			
+			if("species")
+				var/result = input(user, "Select a species", "Species Selection") as null|anything in GLOB.roundstart_races
+				if(result)
+					var/newtype = GLOB.species_list[result]
+					pref_species = new newtype()
+					//Now that we changed our species, we must verify that the mutant colour is still allowed.
+					var/temp_hsv = RGBtoHSV(features["mcolor"])
+					if(features["mcolor"] == "#000" || (!(MUTCOLORS_PARTSONLY in pref_species.species_traits) && ReadHSV(temp_hsv)[3] < ReadHSV("#202020")[3]))
+						features["mcolor"] = pref_species.default_color
+					if(features["mcolor2"] == "#000" || (!(MUTCOLORS_PARTSONLY in pref_species.species_traits) && ReadHSV(temp_hsv)[3] < ReadHSV("#202020")[3]))
+						features["mcolor2"] = pref_species.default_color
+					if(features["mcolor3"] == "#000" || (!(MUTCOLORS_PARTSONLY in pref_species.species_traits) && ReadHSV(temp_hsv)[3] < ReadHSV("#202020")[3]))
+						features["mcolor3"] = pref_species.default_color
+
+			if("mutant_color")
+				var/new_mutantcolor = input(user, "Choose your character's alien/mutant color:", "Character Preference","#"+features["mcolor"]) as color|null
+				if(new_mutantcolor)
+					var/temp_hsv = RGBtoHSV(new_mutantcolor)
+					if(new_mutantcolor == "#000000")
+						features["mcolor"] = pref_species.default_color
+					else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3]) // mutantcolors must be bright, but only if they affect the skin
+						features["mcolor"] = sanitize_hexcolor(new_mutantcolor)
+					else
+						to_chat(user, "<span class='danger'>Invalid color. Your color is not bright enough.</span>")
+			
+			if("mutant_color2")
+				var/new_mutantcolor = input(user, "Choose your character's secondary alien/mutant color:", "Character Preference") as color|null
+				if(new_mutantcolor)
+					var/temp_hsv = RGBtoHSV(new_mutantcolor)
+					if(new_mutantcolor == "#000000")
+						features["mcolor2"] = pref_species.default_color
+					else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3]) // mutantcolors must be bright, but only if they affect the skin
+						features["mcolor2"] = sanitize_hexcolor(new_mutantcolor)
+					else
+						to_chat(user, "<span class='danger'>Invalid color. Your color is not bright enough.</span>")
+
+			if("mutant_color3")
+				var/new_mutantcolor = input(user, "Choose your character's tertiary alien/mutant color:", "Character Preference") as color|null
+				if(new_mutantcolor)
+					var/temp_hsv = RGBtoHSV(new_mutantcolor)
+					if(new_mutantcolor == "#000000")
+						features["mcolor3"] = pref_species.default_color
+					else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3]) // mutantcolors must be bright, but only if they affect the skin
+						features["mcolor3"] = sanitize_hexcolor(new_mutantcolor)
+					else
+						to_chat(user, "<span class='danger'>Invalid color. Your color is not bright enough.</span>")
+
+			if("ipc_screen")
+				var/new_ipc_screen
+				new_ipc_screen = input(user, "Choose your character's screen:", "Character Preference") as null|anything in GLOB.ipc_screens_list
+				if(new_ipc_screen)
+					features["ipc_screen"] = new_ipc_screen
+
+			if("tail_lizard")
+				var/new_tail
+				new_tail = input(user, "Choose your character's tail:", "Character Preference") as null|anything in GLOB.tails_list_lizard
+				if(new_tail)
+					features["tail_lizard"] = new_tail
+					if(new_tail != "None")
+						features["taur"] = "None"
+
+			if("tail_human")
+				var/list/snowflake_tails_list = list("Normal" = null)
+				for(var/path in GLOB.tails_list_human)
+					var/datum/sprite_accessory/tails/human/instance = GLOB.tails_list_human[path]
+					if(istype(instance, /datum/sprite_accessory))
+						var/datum/sprite_accessory/S = instance
+						if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(user.client.ckey)))
+							snowflake_tails_list[S.name] = path
+				var/new_tail
+				new_tail = input(user, "Choose your character's tail:", "Character Preference") as null|anything in snowflake_tails_list
+				if(new_tail)
+					features["tail_human"] = new_tail
+					if(new_tail != "None")
+						features["taur"] = "None"
+
+			if("mam_tail")
+				var/list/snowflake_tails_list = list("Normal" = null)
+				for(var/path in GLOB.mam_tails_list)
+					var/datum/sprite_accessory/mam_tails/instance = GLOB.mam_tails_list[path]
+					if(istype(instance, /datum/sprite_accessory))
+						var/datum/sprite_accessory/S = instance
+						if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(user.client.ckey)))
+							snowflake_tails_list[S.name] = path
+				var/new_tail
+				new_tail = input(user, "Choose your character's tail:", "Character Preference") as null|anything in snowflake_tails_list
+				if(new_tail)
+					features["mam_tail"] = new_tail
+					if(new_tail != "None")
+						features["taur"] = "None"
+
+			if("snout")
+				var/new_snout
+				new_snout = input(user, "Choose your character's snout:", "Character Preference") as null|anything in GLOB.snouts_list
+				if(new_snout)
+					features["snout"] = new_snout
+
+			if("horns")
+				var/new_horns
+				new_horns = input(user, "Choose your character's horns:", "Character Preference") as null|anything in GLOB.horns_list
+				if(new_horns)
+					features["horns"] = new_horns
+
+			if("ears")
+				var/new_ears
+				new_ears = input(user, "Choose your character's ears:", "Character Preference") as null|anything in GLOB.ears_list
+				if(new_ears)
+					features["ears"] = new_ears
+
+			if("wings")
+				var/new_wings
+				new_wings = input(user, "Choose your character's wings:", "Character Preference") as null|anything in GLOB.r_wings_list
+				if(new_wings)
+					features["wings"] = new_wings
+
+			if("frills")
+				var/new_frills
+				new_frills = input(user, "Choose your character's frills:", "Character Preference") as null|anything in GLOB.frills_list
+				if(new_frills)
+					features["frills"] = new_frills
+
+			if("spines")
+				var/new_spines
+				new_spines = input(user, "Choose your character's spines:", "Character Preference") as null|anything in GLOB.spines_list
+				if(new_spines)
+					features["spines"] = new_spines
+
+			if("body_markings")
+				var/new_body_markings
+				new_body_markings = input(user, "Choose your character's body markings:", "Character Preference") as null|anything in GLOB.body_markings_list
+				if(new_body_markings)
+					features["body_markings"] = new_body_markings
+
+			if("legs")
+				var/new_legs
+				new_legs = input(user, "Choose your character's legs:", "Character Preference") as null|anything in GLOB.legs_list
+				if(new_legs)
+					features["legs"] = new_legs
+
+			if("moth_wings")
+				var/new_moth_wings
+				new_moth_wings = input(user, "Choose your character's wings:", "Character Preference") as null|anything in GLOB.moth_wings_list
+				if(new_moth_wings)
+					features["moth_wings"] = new_moth_wings
+
+			if("s_tone")
+				var/new_s_tone = input(user, "Choose your character's skin-tone:", "Character Preference")  as null|anything in GLOB.skin_tones
+				if(new_s_tone)
+					skin_tone = new_s_tone
+
+			if("taur")
+				var/list/snowflake_taur_list = list("Normal" = null)
+				for(var/path in GLOB.taur_list)
+					var/datum/sprite_accessory/taur/instance = GLOB.taur_list[path]
+					if(istype(instance, /datum/sprite_accessory))
+						var/datum/sprite_accessory/S = instance
+						if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(user.client.ckey)))
+							snowflake_taur_list[S.name] = path
+				var/new_taur
+				new_taur = input(user, "Choose your character's tauric body:", "Character Preference") as null|anything in snowflake_taur_list
+				if(new_taur)
+					features["taur"] = new_taur
+					if(new_taur != "None")
+						features["mam_tail"] = "None"
+						features["xenotail"] = "None"
+		
+			if("ears")
+				var/list/snowflake_ears_list = list("Normal" = null)
+				for(var/path in GLOB.ears_list)
+					var/datum/sprite_accessory/ears/instance = GLOB.ears_list[path]
+					if(istype(instance, /datum/sprite_accessory))
+						var/datum/sprite_accessory/S = instance
+						if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(user.client.ckey)))
+							snowflake_ears_list[S.name] = path
+				var/new_ears
+				new_ears = input(user, "Choose your character's ears:", "Character Preference") as null|anything in snowflake_ears_list
+				if(new_ears)
+					features["ears"] = new_ears
+
+			if("mam_ears")
+				var/list/snowflake_ears_list = list("Normal" = null)
+				for(var/path in GLOB.mam_ears_list)
+					var/datum/sprite_accessory/mam_ears/instance = GLOB.mam_ears_list[path]
+					if(istype(instance, /datum/sprite_accessory))
+						var/datum/sprite_accessory/S = instance
+						if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(user.client.ckey)))
+							snowflake_ears_list[S.name] = path
+				var/new_ears
+				new_ears = input(user, "Choose your character's ears:", "Character Preference") as null|anything in snowflake_ears_list
+				if(new_ears)
+					features["mam_ears"] = new_ears
+
+			if("mam_body_markings")
+				var/list/snowflake_markings_list = list("Normal" = null)
+				for(var/path in GLOB.mam_body_markings_list)
+					var/datum/sprite_accessory/mam_body_markings/instance = GLOB.mam_body_markings_list[path]
+					if(istype(instance, /datum/sprite_accessory))
+						var/datum/sprite_accessory/S = instance
+						if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(user.client.ckey)))
+							snowflake_markings_list[S.name] = path
+				var/new_mam_body_markings
+				new_mam_body_markings = input(user, "Choose your character's body markings:", "Character Preference") as null|anything in snowflake_markings_list
+				if(new_mam_body_markings)
+					features["mam_body_markings"] = new_mam_body_markings
+
+			//Xeno Bodyparts
+			if("xenohead")//Head or caste type
+				var/new_head
+				new_head = input(user, "Choose your character's caste:", "Character Preference") as null|anything in GLOB.xeno_head_list
+				if(new_head)
+					features["xenohead"] = new_head
+
+			if("xenotail")//Currently one one type, more maybe later if someone sprites them. Might include animated variants in the future.
+				var/new_tail
+				new_tail = input(user, "Choose your character's tail:", "Character Preference") as null|anything in GLOB.xeno_tail_list
+				if(new_tail)
+					features["xenotail"] = new_tail
+
+			if("xenodorsal")
+				var/new_dors
+				new_dors = input(user, "Choose your character's dorsal tube type:", "Character Preference") as null|anything in GLOB.xeno_dorsal_list
+				if(new_dors)
+					features["xenodorsal"] = new_dors
+			//Genital code
+			if("cock_color")
+				var/new_cockcolor = input(user, "Penis color:", "Character Preference") as color|null
+				if(new_cockcolor)
+					var/temp_hsv = RGBtoHSV(new_cockcolor)
+					if(new_cockcolor == "#000000")
+						features["cock_color"] = pref_species.default_color
+					else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3])
+						features["cock_color"] = sanitize_hexcolor(new_cockcolor)
+					else
+						user << "<span class='danger'>Invalid color. Your color is not bright enough.</span>"
+
+			if("cock_length")
+				var/new_length = input(user, "Penis length in inches:\n([COCK_SIZE_MIN]-[COCK_SIZE_MAX])", "Character Preference") as num|null
+				if(new_length)
+					features["cock_length"] = max(min( round(text2num(new_length)), COCK_SIZE_MAX),COCK_SIZE_MIN)
+
+			if("cock_shape")
+				var/new_shape
+				new_shape = input(user, "Penis shape:", "Character Preference") as null|anything in GLOB.cock_shapes_list
+				if(new_shape)
+					features["cock_shape"] = new_shape
+
+			if("balls_color")
+				var/new_ballscolor = input(user, "Testicle Color:", "Character Preference") as color|null
+				if(new_ballscolor)
+					var/temp_hsv = RGBtoHSV(new_ballscolor)
+					if(new_ballscolor == "#000000")
+						features["balls_color"] = pref_species.default_color
+					else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3])
+						features["balls_color"] = sanitize_hexcolor(new_ballscolor)
+					else
+						user << "<span class='danger'>Invalid color. Your color is not bright enough.</span>"
+
+			if("egg_size")
+				var/new_size
+				var/list/egg_sizes = list(1,2,3)
+				new_size = input(user, "Egg Diameter(inches):", "Egg Size") as null|anything in egg_sizes
+				if(new_size)
+					features["eggsack_egg_size"] = new_size
+
+			if("egg_color")
+				var/new_egg_color = input(user, "Egg Color:", "Character Preference") as color|null
+				if(new_egg_color)
+					var/temp_hsv = RGBtoHSV(new_egg_color)
+					if(ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3])
+						features["eggsack_egg_color"] = sanitize_hexcolor(new_egg_color)
+					else
+						user << "<span class='danger'>Invalid color. Your color is not bright enough.</span>"
+
+			if("breasts_size")
+				var/new_size
+				new_size = input(user, "Breast Size", "Character Preference") as null|anything in GLOB.breasts_size_list
+				if(new_size)
+					features["breasts_size"] = new_size
+
+			if("breasts_shape")
+				var/new_shape
+				new_shape = input(user, "Breast Shape", "Character Preference") as null|anything in GLOB.breasts_shapes_list
+				if(new_shape)
+					features["breasts_shape"] = new_shape
+
+			if("breasts_color")
+				var/new_breasts_color = input(user, "Breast Color:", "Character Preference") as color|null
+				if(new_breasts_color)
+					var/temp_hsv = RGBtoHSV(new_breasts_color)
+					if(new_breasts_color == "#000000")
+						features["breasts_color"] = pref_species.default_color
+					else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3])
+						features["breasts_color"] = sanitize_hexcolor(new_breasts_color)
+					else
+						user << "<span class='danger'>Invalid color. Your color is not bright enough.</span>"
+
+			if("vag_shape")
+				var/new_shape
+				new_shape = input(user, "Vagina Type", "Character Preference") as null|anything in GLOB.vagina_shapes_list
+				if(new_shape)
+					features["vag_shape"] = new_shape
+
+			if("vag_color")
+				var/new_vagcolor = input(user, "Vagina color:", "Character Preference") as color|null
+				if(new_vagcolor)
+					var/temp_hsv = RGBtoHSV(new_vagcolor)
+					if(new_vagcolor == "#000000")
+						features["vag_color"] = pref_species.default_color
+					else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3])
+						features["vag_color"] = sanitize_hexcolor(new_vagcolor)
+					else
+						user << "<span class='danger'>Invalid color. Your color is not bright enough.</span>"
+
 /datum/preferences/proc/is_loadout_slot_available(slot)
 	var/list/L
 	LAZYINITLIST(L)
@@ -34,3 +664,11 @@
 		else
 			if(L[slot_to_string(slot)] < DEFAULT_SLOT_AMT)
 				return TRUE
+
+datum/preferences/copy_to(mob/living/carbon/human/character, icon_updates = 1)
+	..()
+	character.give_genitals(TRUE)
+	character.flavor_text = features["flavor_text"] //Let's update their flavor_text at least initially
+	character.canbearoused = arousable
+	if(icon_updates)
+		character.update_genitals()
@@ -1,4 +1,11 @@
 /datum/preferences/proc/cit_character_pref_load(savefile/S)
+	//ipcs
+	S["feature_ipc_screen"] >> features["ipc_screen"]
+
+	//Citadel toggles
+	S["cit_toggles"] >> cit_toggles
+	
+	features["ipc_screen"] 	= sanitize_inlist(features["ipc_screen"], GLOB.ipc_screens_list)
 	//Citadel
 	features["flavor_text"]		= sanitize_text(features["flavor_text"], initial(features["flavor_text"]))
 	if(!features["mcolor2"] || features["mcolor"] == "#000")
@@ -7,6 +14,7 @@
 		features["mcolor3"] = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F")
 	features["mcolor2"]	= sanitize_hexcolor(features["mcolor2"], 3, 0)
 	features["mcolor3"]	= sanitize_hexcolor(features["mcolor3"], 3, 0)
+	cit_toggles			= sanitize_integer(toggles, 0, 65535, initial(toggles))

 	//gear loadout
 	var/text_to_load
@@ -19,8 +27,10 @@
 		if(path)
 			LAZYADD(chosen_gear, path)
 			gear_points -= initial(path.cost)
-
+			
 /datum/preferences/proc/cit_character_pref_save(savefile/S)
+	//ipcs
+	WRITE_FILE(S["feature_ipc_screen"], features["ipc_screen"])
 	//Citadel
 	WRITE_FILE(S["feature_genitals_use_skintone"], features["genitals_use_skintone"])
 	WRITE_FILE(S["feature_exhibitionist"], features["exhibitionist"])
@@ -63,6 +73,8 @@
 	//flavor text
 	WRITE_FILE(S["feature_flavor_text"], features["flavor_text"])

+	WRITE_FILE(S["cit_toggles"], cit_toggles)
+
 	//gear loadout
 	if(islist(chosen_gear))
 		if(chosen_gear.len)
@@ -2,35 +2,35 @@ 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.cit_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.")
+	to_chat(usr, "You will [(usr.client.prefs.cit_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)
+	return C.prefs.cit_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.cit_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.")
+	to_chat(usr, "You will [(usr.client.prefs.cit_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)
+	return C.prefs.cit_toggles & DIGESTION_NOISES

 TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Sound, togglehoundsleeper)()
 	set name = "Allow/Deny Hound Sleeper"
 	set category = "Preferences"
 	set desc = "Allow MediHound Sleepers"
-	usr.client.prefs.toggles ^= MEDIHOUND_SLEEPER
+	usr.client.prefs.cit_toggles ^= MEDIHOUND_SLEEPER
 	usr.client.prefs.save_preferences()
-	if(usr.client.prefs.toggles & MEDIHOUND_SLEEPER)
+	if(usr.client.prefs.cit_toggles & MEDIHOUND_SLEEPER)
 		to_chat(usr, "You will now allow MediHounds to place you in their sleeper.")
 	else
 		to_chat(usr, "You will no longer allow MediHounds to place you in their sleeper.")
-	SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle MediHound Sleeper", "[usr.client.prefs.toggles & MEDIHOUND_SLEEPER ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+	SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle MediHound Sleeper", "[usr.client.prefs.cit_toggles & MEDIHOUND_SLEEPER ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 /datum/verbs/menu/Settings/Sound/togglehoundsleeper/Get_checked(client/C)
-	return C.prefs.toggles & MEDIHOUND_SLEEPER
+	return C.prefs.cit_toggles & MEDIHOUND_SLEEPER
@@ -8,6 +8,6 @@
 /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'
+	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
 	icon_state = "hostrench"
 	item_state = "hostrench"
@@ -43,8 +43,8 @@
 	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'
+	icon = 'modular_citadel/icons/obj/clothing/turtlenecks.dmi'
+	icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'

 /obj/item/clothing/under/bb_sweater/black
 	name = "black sweater"
@@ -8,17 +8,17 @@
 /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 = 'modular_citadel/icons/obj/clothing/cit_clothes.dmi'
 	icon_state = "secskirt"
-	icon_override = 'icons/mob/citadel/uniforms.dmi'
+	icon_override = 'modular_citadel/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 = 'modular_citadel/icons/obj/clothing/cit_clothes.dmi'
 	icon_state = "hosskirt"
-	icon_override = 'icons/mob/citadel/uniforms.dmi'
+	icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
 	item_state = "gy_suit"
 	item_color = "hosskirt"
@@ -1,3 +1,103 @@
+/mob
+	var/nextsoundemote = 1
+
 //Disables the custom emote blacklist from TG that normally applies to slimes.
 /datum/emote/living/custom
-	mob_type_blacklist_typecache = list(/mob/living/brain)
+	mob_type_blacklist_typecache = list(/mob/living/brain)
+
+/datum/emote/living/scream/run_emote(mob/living/user, params) //I can't not port this shit, come on.
+	if(user.nextsoundemote >= world.time || user.stat != CONSCIOUS)
+		return
+	var/sound
+	var/miming = user.mind ? user.mind.miming : 0
+	if(!user.is_muzzled() && !miming)
+		user.nextsoundemote = world.time + 7
+		if(issilicon(user))
+			sound = 'modular_citadel/sound/voice/scream_silicon.ogg'
+			if(iscyborg(user))
+				var/mob/living/silicon/robot/S = user
+				if(S.cell.charge < 20)
+					to_chat(S, "<span class='warning'>Scream module deactivated. Please recharge.</span>")
+					return
+				S.cell.use(200)
+		if(ismonkey(user))
+			sound = 'modular_citadel/sound/voice/scream_monkey.ogg'
+		if(istype(user, /mob/living/simple_animal/hostile/gorilla))
+			sound = 'sound/creatures/gorilla.ogg'
+		if(ishuman(user))
+			user.adjustOxyLoss(5)
+			sound = pick('modular_citadel/sound/voice/scream_m1.ogg', 'modular_citadel/sound/voice/scream_m2.ogg')
+			if(user.gender == FEMALE)
+				sound = pick('modular_citadel/sound/voice/scream_f1.ogg', 'modular_citadel/sound/voice/scream_f2.ogg')
+			if(is_species(user, /datum/species/android) || is_species(user, /datum/species/synth) || is_species(user, /datum/species/ipc))
+				sound = 'modular_citadel/sound/voice/scream_silicon.ogg'
+			if(is_species(user, /datum/species/lizard))
+				sound = 'modular_citadel/sound/voice/scream_lizard.ogg'
+			if(is_species(user, /datum/species/skeleton))
+				sound = 'modular_citadel/sound/voice/scream_skeleton.ogg'
+			if (is_species(user, /datum/species/fly) || is_species(user, /datum/species/insect))
+				sound = 'modular_citadel/sound/voice/scream_moth.ogg'
+		if(isalien(user))
+			sound = 'sound/voice/hiss6.ogg'
+		LAZYINITLIST(user.alternate_screams)
+		if(LAZYLEN(user.alternate_screams))
+			sound = pick(user.alternate_screams)
+		playsound(user.loc, sound, 50, 1, 4, 1.2)
+		message = "screams!"
+	else if(miming)
+		message = "acts out a scream."
+	else
+		message = "makes a very loud noise."
+	. = ..()
+
+/datum/emote/sound/carbon/snap
+	key = "snap"
+	key_third_person = "snaps"
+	muzzle_ignore = TRUE
+	restraint_check = TRUE
+	emote_type = EMOTE_AUDIBLE
+	sound = 'sound/effects/snap01.ogg'
+	mob_type_allowed_typecache = list(/mob/living/carbon/)
+
+
+/datum/emote/living/snap
+	key = "snap"
+	key_third_person = "snaps"
+	message = "snaps their fingers."
+	emote_type = EMOTE_AUDIBLE
+
+/datum/emote/living/snap/run_emote(mob/living/user, params)
+	if(ishuman(user))
+		if(user.nextsoundemote >= world.time)
+			return
+		user.nextsoundemote = world.time + 7
+		playsound(user, 'modular_citadel/sound/voice/snap.ogg', 50, 1, -1)
+	. = ..()
+
+/datum/emote/living/snap2
+	key = "snap2"
+	key_third_person = "snaps twice"
+	message = "snaps twice."
+	emote_type = EMOTE_AUDIBLE
+
+/datum/emote/living/snap2/run_emote(mob/living/user, params)
+	if(ishuman(user))
+		if(user.nextsoundemote >= world.time)
+			return
+		user.nextsoundemote = world.time + 7
+		playsound(user, 'modular_citadel/sound/voice/snap2.ogg', 50, 1, -1)
+	. = ..()
+
+/datum/emote/living/snap3
+	key = "snap3"
+	key_third_person = "snaps thrice"
+	message = "snaps thrice."
+	emote_type = EMOTE_AUDIBLE
+
+/datum/emote/living/snap3/run_emote(mob/living/user, params)
+	if(ishuman(user))
+		if(user.nextsoundemote >= world.time)
+			return
+		user.nextsoundemote = world.time + 7
+		playsound(user, 'modular_citadel/sound/voice/snap3.ogg', 50, 1, -1)
+	. = ..()
@@ -55,3 +55,41 @@
 		playsound(target, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
 		target.visible_message("<span class='danger'>[user] attempted to push [target]!</span>", \
 						"<span class='userdanger'>[user] attemped to push [target]!</span>", null, COMBAT_MESSAGE_RANGE)
+
+////////////////////
+/////BODYPARTS/////
+////////////////////
+
+
+/obj/item/bodypart/var/should_draw_citadel = FALSE
+
+/mob/living/carbon/proc/draw_citadel_parts(undo = FALSE)
+	if(!undo)
+		for(var/O in bodyparts)
+			var/obj/item/bodypart/B = O
+			B.should_draw_citadel = TRUE
+	else
+		for(var/O in bodyparts)
+			var/obj/item/bodypart/B = O
+			B.should_draw_citadel = FALSE
+
+/datum/species/proc/citadel_mutant_bodyparts(bodypart, mob/living/carbon/human/H)
+	switch(bodypart)
+		if("ipc_screen")
+			return GLOB.ipc_screens_list[H.dna.features["ipc_screen"]]
+		if("mam_tail")
+			return GLOB.mam_tails_list[H.dna.features["mam_tail"]]
+		if("mam_waggingtail")
+			return GLOB.mam_tails_animated_list[H.dna.features["mam_tail"]]
+		if("mam_body_markings")
+			return GLOB.mam_body_markings_list[H.dna.features["mam_body_markings"]]
+		if("mam_ears")
+			return GLOB.mam_ears_list[H.dna.features["mam_ears"]]
+		if("taur")
+			return GLOB.taur_list[H.dna.features["taur"]]
+		if("xenodorsal")
+			return GLOB.xeno_dorsal_list[H.dna.features["xenodorsal"]]
+		if("xenohead")
+			return GLOB.xeno_head_list[H.dna.features["xenohead"]]
+		if("xenotail")
+			return GLOB.xeno_tail_list[H.dna.features["xenotail"]]
@@ -0,0 +1,209 @@
+/datum/species/mammal
+	name = "Mammal"
+	id = "mammal"
+	default_color = "4B4B4B"
+	species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR,SPECIES_ORGANIC)
+	mutant_bodyparts = list("mam_tail", "mam_ears", "mam_body_markings", "snout", "taur")
+	default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "body_markings" = "husky", "mam_tail" = "husky", "mam_ears" = "husky", "mam_body_markings" = "husky", "taur" = "None")
+	attack_verb = "claw"
+	attack_sound = 'sound/weapons/slash.ogg'
+	miss_sound = 'sound/weapons/slashmiss.ogg'
+	meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/mammal
+	liked_food = MEAT | FRIED
+	disliked_food = TOXIC
+
+/datum/species/mammal/spec_death(gibbed, mob/living/carbon/human/H)
+	if(H)
+		H.endTailWag()
+
+/datum/species/mammal/qualifies_for_rank(rank, list/features)
+	return TRUE
+
+/datum/species/mammal/on_species_gain(mob/living/carbon/human/C)
+	C.draw_citadel_parts()
+	. = ..()
+
+/datum/species/mammal/on_species_loss(mob/living/carbon/human/C)
+	C.draw_citadel_parts(TRUE)
+	. = ..()
+//AVIAN//
+/datum/species/avian
+	name = "Avian"
+	id = "avian"
+	say_mod = "chirps"
+	default_color = "BCAC9B"
+	species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR,SPECIES_ORGANIC)
+	mutant_bodyparts = list("snout", "wings", "taur", "mam_tail", "mam_body_markings", "taur")
+	default_features = list("snout" = "Sharp", "wings" = "None", "taur" = "None", "mam_body_markings" = "Hawk")
+	attack_verb = "peck"
+	attack_sound = 'sound/weapons/slash.ogg'
+	miss_sound = 'sound/weapons/slashmiss.ogg'
+	liked_food = MEAT | FRUIT
+	disliked_food = TOXIC
+
+/datum/species/avian/spec_death(gibbed, mob/living/carbon/human/H)
+	if(H)
+		H.endTailWag()
+
+/datum/species/avian/qualifies_for_rank(rank, list/features)
+	return TRUE
+
+/datum/species/avian/on_species_gain(mob/living/carbon/human/C)
+	C.draw_citadel_parts()
+	. = ..()
+
+/datum/species/avian/on_species_loss(mob/living/carbon/human/C)
+	C.draw_citadel_parts(TRUE)
+	. = ..()
+
+//AQUATIC//
+/datum/species/aquatic
+	name = "Aquatic"
+	id = "aquatic"
+	default_color = "BCAC9B"
+	species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR,SPECIES_ORGANIC)
+	mutant_bodyparts = list("mam_tail", "mam_body_markings", "mam_ears", "taur")
+	default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF","mam_tail" = "shark", "mam_body_markings" = "None", "mam_ears" = "None")
+	attack_verb = "bite"
+	attack_sound = 'sound/weapons/bite.ogg'
+	miss_sound = 'sound/weapons/slashmiss.ogg'
+	liked_food = MEAT
+	disliked_food = TOXIC
+	meat = /obj/item/reagent_containers/food/snacks/carpmeat/aquatic
+
+/datum/species/aquatic/spec_death(gibbed, mob/living/carbon/human/H)
+	if(H)
+		H.endTailWag()
+
+/datum/species/aquatic/qualifies_for_rank(rank, list/features)
+	return TRUE
+
+/datum/species/aquatic/on_species_gain(mob/living/carbon/human/C)
+	C.draw_citadel_parts()
+	. = ..()
+
+/datum/species/aquatic/on_species_loss(mob/living/carbon/human/C)
+	C.draw_citadel_parts(TRUE)
+	. = ..()
+
+//INSECT//
+/datum/species/insect
+	name = "Insect"
+	id = "insect"
+	default_color = "BCAC9B"
+	species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR,SPECIES_ORGANIC)
+	mutant_bodyparts = list("mam_body_markings", "mam_ears", "mam_tail", "taur", "moth_wings")
+	default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "mam_body_markings" = "moth", "mam_tail" = "None", "mam_ears" = "None", "moth_wings" = "None")
+	attack_verb = "flutter" //wat?
+	attack_sound = 'sound/weapons/slash.ogg'
+	miss_sound = 'sound/weapons/slashmiss.ogg'
+	liked_food = MEAT | FRUIT
+	disliked_food = TOXIC
+
+/datum/species/insect/spec_death(gibbed, mob/living/carbon/human/H)
+	if(H)
+		H.endTailWag()
+
+/datum/species/insect/qualifies_for_rank(rank, list/features)
+	return TRUE
+
+/datum/species/insect/on_species_gain(mob/living/carbon/human/C)
+	C.draw_citadel_parts()
+	. = ..()
+
+/datum/species/insect/on_species_loss(mob/living/carbon/human/C)
+	C.draw_citadel_parts(TRUE)
+	. = ..()
+
+//Alien//
+/datum/species/xeno
+	// A cloning mistake, crossing human and xenomorph DNA
+	name = "xeno"
+	id = "xeno"
+	say_mod = "hisses"
+	default_color = "00FF00"
+	species_traits = list(MUTCOLORS,EYECOLOR,LIPS,SPECIES_ORGANIC)
+	mutant_bodyparts = list("xenotail", "xenohead", "xenodorsal", "legs", "taur","mam_body_markings")
+	default_features = list("xenotail"="xeno","xenohead"="standard","xenodorsal"="standard","mcolor" = "0F0","mcolor2" = "0F0","mcolor3" = "0F0","taur" = "None","mam_body_markings" = "xeno")
+	attack_verb = "slash"
+	attack_sound = 'sound/weapons/slash.ogg'
+	miss_sound = 'sound/weapons/slashmiss.ogg'
+	meat = /obj/item/reagent_containers/food/snacks/meat/slab/xeno
+	skinned_type = /obj/item/stack/sheet/animalhide/xeno
+	exotic_bloodtype = "L"
+	damage_overlay_type = "xeno"
+	liked_food = MEAT
+
+/datum/species/xeno/on_species_gain(mob/living/carbon/human/C)
+	C.draw_citadel_parts()
+	. = ..()
+
+/datum/species/xeno/on_species_loss(mob/living/carbon/human/C)
+	C.draw_citadel_parts(TRUE)
+	. = ..()
+
+//Praise the Omnissiah, A challange worthy of my skills - HS
+
+//EXOTIC//
+//These races will likely include lots of downsides and upsides. Keep them relatively balanced.//
+/*
+/datum/species/xeno
+	name = "Xenomorph"
+	id = "xeno"
+	say_mod = "hisses"
+	eyes = "none"
+	species_traits = list()
+	mutant_organs = list(/obj/item/organ/tongue/alien)
+	mutant_bodyparts = list("xenohead",
+							"xenodorsal",
+							"xenotail")
+	default_features = list("xenohead"="Hunter",
+							"xenodorsal"="Dorsal Tubes",
+							"xenotail"="Xenomorph Tail")
+	attack_verb = "slash"
+	attack_sound = 'sound/weapons/slash.ogg'
+	miss_sound = 'sound/weapons/slashmiss.ogg'
+	burnmod = 1.75
+	heatmod = 1.75
+	darksight = 4 //Just above slimes
+	exotic_blood = "xblood"
+	damage_overlay_type = "xeno"
+	no_equip = list(slot_glasses) //MY EYES, THEY'RE GONE
+	meat = /obj/item/reagent_containers/food/snacks/meat/slab/xeno
+	skinned_type = /obj/item/stack/sheet/animalhide/xeno
+//	safe_toxins_max = 32 //Too much of anything is bad.
+//	whitelisted = 1
+//	whitelist = list("talkingcactus") //testing whitelisting
+
+/datum/species/xeno/on_species_gain(mob/living/carbon/C, datum/species/old_species)
+	..()
+	var/obj/effect/decal/cleanable/xenoblood/xgibs/XG
+	if(istype(C.gib_type, XG))
+		return
+	else
+		C.gib_type = XG
+
+/datum/species/xeno/on_species_loss(mob/living/carbon/C)
+	..()
+	var/obj/effect/decal/cleanable/xenoblood/xgibs/XG
+	var/obj/effect/decal/cleanable/blood/gibs/HG
+	if(istype(C.gib_type, XG))
+		C.gib_type = HG
+	else
+		return
+
+/datum/reagent/toxin/acid/xenoblood
+	name = "acid blood"
+	id = "xblood"
+	description = "A highly corrosive substance, it is capable of burning through most natural or man-made materials in short order."
+	color = "#66CC00"
+	toxpwr = 0
+	acidpwr = 12 */
+
+
+//misc
+/mob/living/carbon/human/dummy
+	no_vore = TRUE
+
+/mob/living/carbon/human/vore
+	devourable = TRUE
@@ -0,0 +1,43 @@
+/datum/species/ipc
+	name = "IPC"
+	id = "ipc"
+	say_mod = "beeps"
+	default_color = "00FF00"
+	blacklisted = 0
+	sexes = 0
+	species_traits = list(MUTCOLORS,NOEYES)
+	mutant_bodyparts = list("ipc_screen")
+	default_features = list("ipc_screen" = "Blank")
+	meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/ipc
+
+	var/datum/action/innate/monitor_change/screen
+
+/datum/species/ipc/on_species_gain(mob/living/carbon/human/C)
+	C.draw_citadel_parts()
+	if(isipcperson(C) && !screen)
+		screen = new
+		screen.Grant(C)
+	..()
+
+/datum/species/ipc/on_species_loss(mob/living/carbon/human/C)
+	C.draw_citadel_parts(TRUE)
+	if(screen)
+		screen.Remove(C)
+	..()
+
+/datum/species/ipc/get_spans()
+	return SPAN_ROBOT
+
+/datum/action/innate/monitor_change
+	name = "Screen Change"
+	check_flags = AB_CHECK_CONSCIOUS
+	icon_icon = 'icons/mob/actions/actions_silicon.dmi'
+	button_icon_state = "drone_vision"
+
+/datum/action/innate/monitor_change/Activate()
+	var/mob/living/carbon/human/H = owner
+	var/new_ipc_screen = input(usr, "Choose your character's screen:", "Monitor Display") as null|anything in GLOB.ipc_screens_list
+	if(!new_ipc_screen)
+		return
+	H.dna.features["ipc_screen"] = new_ipc_screen
+	H.update_body()
@@ -1,2 +1,113 @@
 /datum/species/jelly/slime
 	name = "Xenobiological Slimeperson"
+
+//##########SLIMEPEOPLE##########
+
+/datum/species/jelly/roundstartslime
+	name = "Slimeperson"
+	id = "slimeperson"
+	default_color = "00FFFF"
+	species_traits = list(SPECIES_ORGANIC,MUTCOLORS,EYECOLOR,HAIR,FACEHAIR,NOBLOOD)
+	inherent_traits = list(TRAIT_TOXINLOVER)
+	mutant_bodyparts = list("mam_tail", "mam_ears", "taur")
+	default_features = list("mcolor" = "FFF", "mam_tail" = "None", "mam_ears" = "None")
+	say_mod = "says"
+	hair_color = "mutcolor"
+	hair_alpha = 180
+	liked_food = MEAT
+	coldmod = 3
+	heatmod = 1
+	burnmod = 1
+
+/datum/action/innate/slime_change
+	name = "Alter Form"
+	check_flags = AB_CHECK_CONSCIOUS
+	button_icon_state = "alter_form" //placeholder
+	icon_icon = 'icons/mob/actions/actions_slime.dmi'
+	background_icon_state = "bg_alien"
+
+/datum/action/innate/slime_change/Activate()
+	var/mob/living/carbon/human/H = owner
+	if(!isjellyperson(H))
+		return
+	else
+		H.visible_message("<span class='notice'>[owner] gains a look of \
+		concentration while standing perfectly still.\
+		 Their body seems to shift and starts getting more goo-like.</span>",
+		"<span class='notice'>You focus intently on altering your body while \
+		standing perfectly still...</span>")
+		change_form()
+
+/datum/action/innate/slime_change/proc/change_form()
+	var/mob/living/carbon/human/H = owner
+	var/select_alteration = input(owner, "Select what part of your form to alter", "Form Alteration", "cancel") in list("Hair Style", "Genitals", "Tail", "Ears", "Taur body", "Cancel")
+	if(select_alteration == "Hair Style")
+		if(H.gender == MALE)
+			var/new_style = input(owner, "Select a facial hair style", "Hair Alterations")  as null|anything in GLOB.facial_hair_styles_list
+			if(new_style)
+				H.facial_hair_style = new_style
+		else
+			H.facial_hair_style = "Shaved"
+		//handle normal hair
+		var/new_style = input(owner, "Select a hair style", "Hair Alterations")  as null|anything in GLOB.hair_styles_list
+		if(new_style)
+			H.hair_style = new_style
+			H.update_hair()
+	else if (select_alteration == "Genitals")
+		var/list/organs = list()
+		var/operation = input("Select organ operation.", "Organ Manipulation", "cancel") in list("add sexual organ", "remove sexual organ", "cancel")
+		switch(operation)
+			if("add sexual organ")
+				var/new_organ = input("Select sexual organ:", "Organ Manipulation") in list("Penis", "Testicles", "Breasts", "Vagina", "Womb", "Cancel")
+				if(new_organ == "Penis")
+					H.give_penis()
+				else if(new_organ == "Testicles")
+					H.give_balls()
+				else if(new_organ == "Breasts")
+					H.give_breasts()
+				else if(new_organ == "Vagina")
+					H.give_vagina()
+				else if(new_organ == "Womb")
+					H.give_womb()
+				else
+					return
+			if("remove sexual organ")
+				for(var/obj/item/organ/genital/X in H.internal_organs)
+					var/obj/item/organ/I = X
+					organs["[I.name] ([I.type])"] = I
+				var/obj/item/organ = input("Select sexual organ:", "Organ Manipulation", null) in organs
+				organ = organs[organ]
+				if(!organ)
+					return
+				var/obj/item/organ/genital/O
+				if(isorgan(organ))
+					O = organ
+					O.Remove(H)
+				organ.forceMove(get_turf(H))
+				qdel(organ)
+				H.update_body()
+	else if (select_alteration == "Ears")
+		var/new_ears
+		new_ears = input(owner, "Choose your character's ears:", "Ear Alteration") as null|anything in GLOB.mam_ears_list
+		if(new_ears)
+			H.dna.features["mam_ears"] = new_ears
+		H.update_body()
+	else if (select_alteration == "Tail")
+		var/new_tail
+		new_tail = input(owner, "Choose your character's tail:", "Tail Alteration") as null|anything in GLOB.mam_tails_list
+		if(new_tail)
+			H.dna.features["mam_tail"] = new_tail
+			if(new_tail != "None")
+				H.dna.features["taur"] = "None"
+		H.update_body()
+	else if (select_alteration == "Taur body")
+		var/new_taur
+		new_taur = input(owner, "Choose your character's tauric body:", "Taur Body Alteration") as null|anything in GLOB.taur_list
+		if(new_taur)
+			H.dna.features["taur"] = new_taur
+			if(new_taur != "None")
+				H.dna.features["mam_tail"] = "None"
+				H.dna.features["xenotail"] = "None"
+		H.update_body()
+	else
+		return
@@ -0,0 +1,45 @@
+/mob/living
+	var/list/alternate_screams
+
+/mob/living/carbon/proc/reindex_screams()
+	clear_screams()
+	if(head)
+		add_screams(head.alternate_screams)
+	if(wear_mask)
+		add_screams(wear_mask.alternate_screams)
+	if(back)
+		add_screams(back.alternate_screams)
+
+/mob/living/carbon/human/reindex_screams()
+	..()
+	//More slots in humans.
+	if(ears)
+		add_screams(ears.alternate_screams)
+	if(wear_suit)
+		add_screams(wear_suit.alternate_screams)
+	if(w_uniform)
+		add_screams(w_uniform.alternate_screams)
+	if(glasses)
+		add_screams(glasses.alternate_screams)
+	if(gloves)
+		add_screams(gloves.alternate_screams)
+	if(shoes)
+		add_screams(shoes.alternate_screams)
+	if(belt)
+		add_screams(belt.alternate_screams)
+	if(s_store)
+		add_screams(s_store.alternate_screams)
+	if(wear_id)
+		add_screams(wear_id.alternate_screams)
+
+//Note that the following two are for /mob/living, while the above two are for /carbon and /human
+/mob/living/proc/add_screams(var/list/screams)
+	LAZYINITLIST(alternate_screams)
+	if(!screams || screams.len == 0)
+		return
+	for(var/S in screams)
+		LAZYADD(alternate_screams, S)
+
+/mob/living/proc/clear_screams()
+	LAZYINITLIST(alternate_screams)
+	LAZYCLEARLIST(alternate_screams)
@@ -48,7 +48,7 @@
 	can_be_pushed = FALSE
 	hat_offset = INFINITY
 	sleeper_overlay = "ksleeper"
-	cyborg_icon_override = 'icons/mob/widerobot.dmi'
+	cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
 	has_snowflake_deadsprite = TRUE
 	dogborg = TRUE
 	cyborg_pixel_offset = -16
@@ -79,7 +79,7 @@
 	can_be_pushed = FALSE
 	hat_offset = INFINITY
 	sleeper_overlay = "msleeper"
-	cyborg_icon_override = 'icons/mob/widerobot.dmi'
+	cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
 	has_snowflake_deadsprite = TRUE
 	dogborg = TRUE
 	cyborg_pixel_offset = -16
@@ -101,7 +101,7 @@
 	hat_offset = INFINITY
 	clean_on_move = TRUE
 	sleeper_overlay = "jsleeper"
-	cyborg_icon_override = 'icons/mob/widerobot.dmi'
+	cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
 	has_snowflake_deadsprite = TRUE
 	cyborg_pixel_offset = -16
 	dogborg = TRUE
@@ -161,7 +161,7 @@
 	cyborg_base_icon = "orepup"
 	moduleselect_icon = "orepup"
 	sleeper_overlay = "osleeper"
-	cyborg_icon_override = 'icons/mob/widerobot.dmi'
+	cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
 	has_snowflake_deadsprite = TRUE
 	cyborg_pixel_offset = -16

@@ -42,7 +42,7 @@

 /obj/item/ammo_box/magazine/flechette
 	name = "flechette magazine (armor piercing)"
-	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "flechettemag"
 	ammo_type = /obj/item/ammo_casing/caseless/flechetteap
 	caliber = "flechette"
@@ -58,7 +58,7 @@
 /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 = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "flechettegun"
 	item_state = "gun"
 	w_class = WEIGHT_CLASS_NORMAL
@@ -3,7 +3,7 @@
 /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 = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "atp"
 	item_state = "pistol"
 	recoil = 4
@@ -36,7 +36,7 @@
 /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 = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "stealthpistol"
 	w_class = WEIGHT_CLASS_SMALL
 	mag_type = /obj/item/ammo_box/magazine/m10mm
@@ -61,7 +61,7 @@
 /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 = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "foamsp"
 	w_class = WEIGHT_CLASS_SMALL
 	mag_type = /obj/item/ammo_box/magazine/toy/pistol
@@ -108,7 +108,7 @@ 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 = 'modular_citadel/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
@@ -123,7 +123,7 @@ obj/item/projectile/bullet/c10mm/soporific
 /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 = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "cde"
 	can_unsuppress = TRUE
 	obj_flags = UNIQUE_RENAME
@@ -154,7 +154,7 @@ obj/item/projectile/bullet/c10mm/soporific
 /////////RAYGUN MEMES/////////

 /obj/item/projectile/beam/lasertag/ray		//the projectile, compatible with regular laser tag armor
-	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "ray"
 	name = "ray bolt"
 	eyeblur = 0
@@ -166,7 +166,7 @@ obj/item/projectile/bullet/c10mm/soporific

 /obj/item/gun/energy/laser/practice/raygun
 	name = "toy ray gun"
-	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon = 'modular_citadel/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)
@@ -182,7 +182,7 @@ obj/item/projectile/bullet/c10mm/soporific
 			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 = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "p37"
 	w_class = WEIGHT_CLASS_NORMAL
 	spawnwithmagazine = FALSE
@@ -203,15 +203,15 @@ obj/item/projectile/bullet/c10mm/soporific
 ///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")
+	var/mutable_appearance/frame_overlay = mutable_appearance('modular_citadel/icons/obj/guns/cit_guns.dmi', "p37_frame")
+	var/mutable_appearance/receiver_overlay = mutable_appearance('modular_citadel/icons/obj/guns/cit_guns.dmi', "p37_receiver")
+	var/mutable_appearance/body_overlay = mutable_appearance('modular_citadel/icons/obj/guns/cit_guns.dmi', "p37_body")
+	var/mutable_appearance/barrel_overlay = mutable_appearance('modular_citadel/icons/obj/guns/cit_guns.dmi', "p37_barrel")
+	var/mutable_appearance/tip_overlay = mutable_appearance('modular_citadel/icons/obj/guns/cit_guns.dmi', "p37_tip")
+	var/mutable_appearance/grip_overlay = mutable_appearance('modular_citadel/icons/obj/guns/cit_guns.dmi', "p37_grip")
+	var/mutable_appearance/energy_overlay = mutable_appearance('modular_citadel/icons/obj/guns/cit_guns.dmi', "p37_light")
+	var/mutable_appearance/arm_overlay = mutable_appearance('modular_citadel/icons/obj/guns/cit_guns.dmi', "p37_arm")
+	var/mutable_appearance/arm_overlay_e = mutable_appearance('modular_citadel/icons/obj/guns/cit_guns.dmi', "p37_arm-e")

 	if(frame_color)
 		frame_overlay.color = frame_color
@@ -346,7 +346,7 @@ obj/item/projectile/bullet/c10mm/soporific
 /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 = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "11mm"		//topkek
 	ammo_type = /obj/item/ammo_casing/c9mm/frangible
 	caliber = "9mm"
@@ -3,7 +3,7 @@
 /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 = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "x9"
 	item_state = "arg"
 	slot_flags = 0
@@ -19,7 +19,7 @@

 /obj/item/ammo_box/magazine/toy/x9
 	name = "foam force X9 magazine"
-	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "toy9magazine"
 	max_ammo = 30
 	multiple_sprites = 2
@@ -28,7 +28,7 @@
 /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 = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "toy9"
 	can_suppress = 0
 	obj_flags = 0
@@ -43,7 +43,7 @@
 //////projectiles//////

 /obj/item/projectile/bullet/mags
-	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "magjectile"
 	damage = 15
 	armour_penetration = 10
@@ -53,7 +53,7 @@
 	light_color = LIGHT_COLOR_RED

 /obj/item/projectile/bullet/nlmags //non-lethal boolets
-	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "magjectile-nl"
 	damage = 0
 	knockdown = 0
@@ -70,14 +70,14 @@
 /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 = 'modular_citadel/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 = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "mag-casing-live"
 	projectile_type = /obj/item/projectile/bullet/nlmags

@@ -85,7 +85,7 @@

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

 /obj/item/ammo_box/magazine/mmag/small/lethal
 	name = "magpistol magazine (lethal)"
-	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "smallmagmag"
 	ammo_type = /obj/item/ammo_casing/caseless/amags

@@ -103,7 +103,7 @@
 /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 = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "magpistol"
 	force = 10
 	fire_sound = 'sound/weapons/magpistol.ogg'
@@ -160,7 +160,7 @@

 /obj/item/projectile/bullet/reusable/foam_dart/mag
 	name = "magfoam dart"
-	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "magjectile-toy"
 	ammo_type = /obj/item/ammo_casing/caseless/foam_dart/mag
 	light_range = 2
@@ -178,7 +178,7 @@
 /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 = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "toymag"
 	item_state = "gun"
 	mag_type = /obj/item/ammo_box/magazine/internal/shot/toy/mag
@@ -198,7 +198,7 @@
 ///projectiles///

 /obj/item/projectile/bullet/magrifle
-	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "magjectile-large"
 	damage = 20
 	armour_penetration = 25
@@ -208,7 +208,7 @@
 	light_color = LIGHT_COLOR_RED

 /obj/item/projectile/bullet/nlmagrifle //non-lethal boolets
-	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "magjectile-large-nl"
 	damage = 0
 	knockdown = 0
@@ -224,14 +224,14 @@
 /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 = 'modular_citadel/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 = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "mag-casing-live"
 	projectile_type = /obj/item/projectile/bullet/nlmagrifle

@@ -239,7 +239,7 @@

 /obj/item/ammo_box/magazine/mmag/
 	name = "magrifle magazine (non-lethal disabler)"
-	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "mediummagmag"
 	ammo_type = /obj/item/ammo_casing/caseless/anlmagm
 	caliber = "magm"
@@ -248,7 +248,7 @@

 /obj/item/ammo_box/magazine/mmag/lethal
 	name = "magrifle magazine (lethal)"
-	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "mediummagmag"
 	ammo_type = /obj/item/ammo_casing/caseless/amagm
 	max_ammo = 24
@@ -258,7 +258,7 @@
 /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 = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "magrifle"
 	item_state = "arg"
 	slot_flags = 0
@@ -309,7 +309,7 @@

 /obj/item/ammo_box/magazine/toy/foamag
 	name = "foam force magrifle magazine"
-	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "foamagmag"
 	max_ammo = 24
 	multiple_sprites = 2
@@ -346,7 +346,7 @@
 ///projectiles///

 /obj/item/projectile/bullet/mags/hyper
-	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "magjectile"
 	damage = 10
 	armour_penetration = 10
@@ -373,7 +373,7 @@
 /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 = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "hyper-casing-live"
 	projectile_type = /obj/item/projectile/bullet/mags/hyper
 	pellets = 12
@@ -388,7 +388,7 @@

 /obj/item/ammo_box/magazine/mhyper
 	name = "hyper-burst rifle magazine"
-	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "hypermag-4"
 	ammo_type = /obj/item/ammo_casing/caseless/ahyper
 	caliber = "hypermag"
@@ -409,7 +409,7 @@
 /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 = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "hyperburst"
 	item_state = "arg"
 	slot_flags = 0
@@ -429,7 +429,7 @@
 ///toy memes///

 /obj/item/projectile/beam/lasertag/mag		//the projectile, compatible with regular laser tag armor
-	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "magjectile-toy"
 	name = "lasertag magbolt"
 	forcedodge = TRUE		//for penetration memes
@@ -450,7 +450,7 @@
 	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 = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "toyburst"
 	clumsy_check = FALSE
 	obj_flags = 0
@@ -4,7 +4,7 @@
 /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 = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "x9"
 	item_state = "arg"
 	slot_flags = 0
@@ -20,7 +20,7 @@

 /obj/item/ammo_box/magazine/toy/x9
 	name = "foam force X9 magazine"
-	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "toy9magazine"
 	max_ammo = 30
 	multiple_sprites = 2
@@ -29,7 +29,7 @@
 /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 = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "toy9"
 	can_suppress = 0
 	obj_flags = 0
@@ -84,7 +84,7 @@

 /obj/item/ammo_box/magazine/flechette
 	name = "flechette magazine (armor piercing)"
-	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "flechettemag"
 	ammo_type = /obj/item/ammo_casing/caseless/flechetteap
 	caliber = "flechette"
@@ -100,7 +100,7 @@
 /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 = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "flechettegun"
 	item_state = "gun"
 	w_class = WEIGHT_CLASS_NORMAL
@@ -163,7 +163,7 @@
 *//////////////////////////////////////////////////////////////
 /obj/item/ammo_box/magazine/toy/AM4B
 	name = "foam force AM4-B magazine"
-	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "AM4MAG-60"
 	max_ammo = 60
 	multiple_sprites = 0
@@ -172,7 +172,7 @@
 /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 = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "AM4"
 	item_state = "arg"
 	mag_type = /obj/item/ammo_box/magazine/toy/AM4B
@@ -187,7 +187,7 @@

 /obj/item/gun/ballistic/automatic/AM4B/update_icon()
 	..()
-	var/mutable_appearance/body_overlay = mutable_appearance('icons/obj/guns/cit_guns.dmi', "AM4-Body")
+	var/mutable_appearance/body_overlay = mutable_appearance('modular_citadel/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
@@ -212,7 +212,7 @@

 /obj/item/ammo_box/magazine/toy/AM4C
 	name = "foam force AM4-C magazine"
-	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "AM4MAG-32"
 	max_ammo = 32
 	multiple_sprites = 0
@@ -221,7 +221,7 @@
 /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 = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "AM4C"
 	item_state = "arg"
 	mag_type = /obj/item/ammo_box/magazine/toy/AM4C
@@ -2,7 +2,7 @@

 /obj/item/projectile/bullet/spinfusor
 	name ="spinfusor disk"
-	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state= "spinner"
 	damage = 30
 	dismemberment = 25
@@ -17,7 +17,7 @@
 	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 = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "disk"
 	throwforce = 15 //still deadly when thrown
 	throw_speed = 3
@@ -39,7 +39,7 @@
 /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 = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "spinfusor"
 	item_state = "spinfusor"
 	mag_type = /obj/item/ammo_box/magazine/internal/spinfusor
@@ -68,7 +68,7 @@

 /obj/item/ammo_box/aspinfusor
 	name = "ammo box (spinfusor disks)"
-	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "spinfusorbox"
 	ammo_type = /obj/item/ammo_casing/caseless/spinfusor
 	max_ammo = 8
@@ -16,10 +16,10 @@
 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 = 'modular_citadel/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'
+	lefthand_file = 'modular_citadel/icons/mob/citadel/guns_lefthand.dmi'
+	righthand_file = 'modular_citadel/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
@@ -27,7 +27,7 @@ obj/item/gun/energy/e_gun/cx

 obj/item/gun/energy/e_gun/cx/update_icon()
 	..()
-	var/mutable_appearance/body_overlay = mutable_appearance('icons/obj/guns/cit_guns.dmi', "cxegun_body")
+	var/mutable_appearance/body_overlay = mutable_appearance('modular_citadel/icons/obj/guns/cit_guns.dmi', "cxegun_body")
 	if(body_color)
 		body_overlay.color = body_color
 	add_overlay(body_overlay)
@@ -21,7 +21,7 @@
 /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 = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "lasernew"
 	item_state = "laser"
 	force = 10
@@ -163,7 +163,7 @@
 	//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)
+			if(M.client && M.client.prefs.cit_toggles & EATING_NOISES)
 				playsound(get_turf(owner),"[src.vore_sound]",50,0,-5,0,ignore_walls = FALSE,channel=CHANNEL_PRED)
 				recent_sound = TRUE

@@ -194,7 +194,7 @@
 		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)
+		if(M.client && M.client.prefs.cit_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>")
@@ -215,7 +215,7 @@
 		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)
+			if(H.client && H.client.prefs.cit_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))
@@ -507,7 +507,7 @@

 	if(!silent)
 		for(var/mob/M in get_hearers_in_view(5, get_turf(owner)))
-			if(M.client && M.client.prefs.toggles & EATING_NOISES)
+			if(M.client && M.client.prefs.cit_toggles & EATING_NOISES)
 				playsound(get_turf(owner),"struggle_sound",35,0,-5,1,ignore_walls = FALSE,channel=CHANNEL_PRED)
 		R.stop_sound_channel(CHANNEL_PRED)
 		var/sound/prey_struggle = sound(get_sfx("prey_struggle"))
@@ -584,7 +584,7 @@
 	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)
+			if(M.client && M.client.prefs.cit_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)
@@ -41,7 +41,7 @@
 			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)
+					if(H.client && H.client.prefs.cit_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)
@@ -72,7 +72,7 @@
 				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)
+					if(H.client && H.client.prefs.cit_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)
@@ -101,7 +101,7 @@
 			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)
+					if(H.client && H.client.prefs.cit_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)
@@ -120,7 +120,7 @@
 			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)
+					if(H.client && H.client.prefs.cit_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)
@@ -133,7 +133,7 @@
 			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)
+					if(H.client && H.client.prefs.cit_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)
@@ -161,7 +161,7 @@

 				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)
+					if(H.client && H.client.prefs.cit_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)
@@ -195,7 +195,7 @@
 	// 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)
+		if(M.client && M.client.prefs.cit_toggles & EATING_NOISES)
 			playsound(get_turf(user),"[belly.vore_sound]",50,0,-5,0,ignore_walls = FALSE,channel=CHANNEL_PRED)

 	// Actually shove prey into the belly.
@@ -355,7 +355,7 @@

 					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)
+						if(M.client && M.client.prefs.cit_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>")

@@ -371,7 +371,7 @@
 					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)
+							if(M.client && M.client.prefs.cit_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>")

@@ -391,7 +391,7 @@

 				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)
+					if(M.client && M.client.prefs.cit_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>"

@@ -407,7 +407,7 @@
 				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)
+					if(M.client && M.client.prefs.cit_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"])