diff --git a/code/__defines/talksounds.dm b/code/__defines/talksounds.dm
new file mode 100644
index 00000000000..14027740307
--- /dev/null
+++ b/code/__defines/talksounds.dm
@@ -0,0 +1,63 @@
+
+
+var/list/talk_sound_map = rlist(
+								list(
+									"beep-boop",
+									"goon speak 1",
+									"goon speak 2",
+									"goon speak 3",
+									"goon speak 4",
+									"goon speak blub",
+									"goon speak bottalk",
+									"goon speak buwoo",
+									"goon speak cow",
+									"goon speak lizard",
+									"goon speak pug",
+									"goon speak pugg",
+									"goon speak roach",
+									"goon speak skelly",
+									// "xeno speak" // Does not exist on virgo
+								),
+								list(
+									talk_sound,
+									goon_speak_one_sound,
+									goon_speak_two_sound,
+									goon_speak_three_sound,
+									goon_speak_four_sound,
+									goon_speak_blub_sound,
+									goon_speak_bottalk_sound,
+									goon_speak_buwoo_sound,
+									goon_speak_cow_sound,
+									goon_speak_lizard_sound,
+									goon_speak_pug_sound,
+									goon_speak_pugg_sound,
+									goon_speak_roach_sound,
+									goon_speak_skelly_sound,
+									// xeno_speak_sound // Does not exist on virgo
+									)
+								)
+
+/proc/get_talk_sound(var/voice_sound)
+	if(!voice_sound)
+		return talk_sound_map[1]
+	return talk_sound_map[2][voice_sound]
+
+proc/rlist(var/list/keys,var/list/values) //short for reversible list generator
+	var/list/rlist = list(list(),list(),FALSE,0)
+	var/i = 0
+	for(i = 1, i <= LAZYLEN(keys), i++)
+		to_chat(world,keys[i])
+		rlist[1] += keys[i]
+		rlist[2][keys[i]] = values[i]
+	rlist += TRUE
+	rlist += i
+	return rlist
+
+/proc/arlist(var/list/altlist)
+	var/list/rlist = list(list(),list(),FALSE,0)
+	var/i = 0
+	for(i = 1, i <= LAZYLEN(altlist), i++)
+		rlist[(i % 2) +1] += altlist[i]
+	rlist += TRUE
+	rlist += i/2
+	return rlist
diff --git a/code/global.dm b/code/global.dm
index 8eaebe3cc33..3626077f064 100644
--- a/code/global.dm
+++ b/code/global.dm
@@ -186,45 +186,3 @@ var/static/icon/buildmode_hud = icon('icons/misc/buildmode.dmi')
 //Keyed list for caching icons so you don't need to make them for records, IDs, etc all separately.
 //Could be useful for AI impersonation or something at some point?
 var/static/list/cached_character_icons = list()
-
-var/list/talk_sound_map = rlist(
-								list(
-									"beep-boop",
-									"goon speak 1",
-									"goon speak 2",
-									"goon speak 3",
-									"goon speak 4",
-									"goon speak blub",
-									"goon speak bottalk",
-									"goon speak buwoo",
-									"goon speak cow",
-									"goon speak lizard",
-									"goon speak pug",
-									"goon speak pugg",
-									"goon speak roach",
-									"goon speak skelly",
-									// "xeno speak" // Does not exist on virgo
-								),
-								list(
-									talk_sound,
-									goon_speak_one_sound,
-									goon_speak_two_sound,
-									goon_speak_three_sound,
-									goon_speak_four_sound,
-									goon_speak_blub_sound,
-									goon_speak_bottalk_sound,
-									goon_speak_buwoo_sound,
-									goon_speak_cow_sound,
-									goon_speak_lizard_sound,
-									goon_speak_pug_sound,
-									goon_speak_pugg_sound,
-									goon_speak_roach_sound,
-									goon_speak_skelly_sound,
-									// xeno_speak_sound // Does not exist on virgo
-									)
-								)
-
-/proc/get_talk_sound(var/voice_sound)
-	if(!voice_sound)
-		return talk_sound_map[1]
-	return talk_sound_map[2][voice_sound]
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 7c6e715975d..e8e846571f4 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -613,7 +613,7 @@ var/list/preferences_datums = list()
 	character.g_ears3 =    g_ears3
 
 	character.ear_secondary_style = ear_styles[ear_secondary_style]
-	character.ear_secondary_colors = SANITIZE_LIST(ear_secondary_colors).Copy()
+	character.ear_secondary_colors = SANITIZE_LIST(ear_secondary_colors)
 
 	var/list/tail_styles = get_available_styles(global.tail_styles_list)
 	character.tail_style = tail_styles[tail_style]
diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm
index 109ccff494e..84b14551ba0 100644
--- a/code/modules/mob/holder.dm
+++ b/code/modules/mob/holder.dm
@@ -389,10 +389,10 @@ var/list/holder_mob_icon_cache = list()
 	w_class = ITEMSIZE_TINY
 	allowed = list(/obj/item/gun,/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/melee/baton)
 	item_icons = list(
-		slot_l_hand_str = 'modular_chomp/icons/mob/lefthand_holder.dmi',
-		slot_r_hand_str = 'modular_chomp/icons/mob/righthand_holder.dmi',
-		slot_head_str = 'modular_chomp/icons/mob/head_ch.dmi',
-		slot_w_uniform_str = 'modular_chomp/icons/mob/uniform_ch.dmi',
-		slot_wear_suit_str = 'modular_chomp/icons/mob/suit_ch.dmi',
-		slot_r_ear_str = 'modular_chomp/icons/mob/ears.dmi',
-		slot_l_ear_str = 'modular_chomp/icons/mob/ears.dmi')
+		slot_l_hand_str = 'icons/mob/lefthand_holder.dmi',
+		slot_r_hand_str = 'icons/mob/righthand_holder.dmi',
+		slot_head_str = 'icons/mob/head.dmi',
+		slot_w_uniform_str = 'icons/mob/uniform.dmi',
+		slot_wear_suit_str = 'icons/mob/suit.dmi',
+		slot_r_ear_str = 'icons/mob/ears.dmi',
+		slot_l_ear_str = 'icons/mob/ears.dmi')
diff --git a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm
index 74f035acf9c..a9cc5f16385 100644
--- a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm
+++ b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm
@@ -3,7 +3,7 @@
 	name = "protean blob"
 	desc = "Some sort of big viscous pool of jelly."
 	tt_desc = "Animated nanogoop"
-	icon = 'modular_chomp/icons/mob/species/protean/protean.dmi'
+	icon = 'icons/mob/species/protean/protean.dmi'
 	icon_state = "to_puddle"
 	icon_living = "puddle0-eyes"	//Null icon, since we're made of overlays now.
 	icon_rest = "puddle0-eyes"
@@ -344,14 +344,14 @@
 
 	if(!hiding)
 		cut_overlays()
-		icon = 'modular_chomp/icons/mob/species/protean/protean.dmi'
+		icon = 'icons/mob/species/protean/protean.dmi'
 		icon_state = "hide"
 		sleep(7)
 		mouse_opacity = 0
 		plane = ABOVE_OBJ_PLANE
 		hiding = 1
 	else
-		icon = 'modular_chomp/icons/mob/species/protean/protean.dmi'
+		icon = 'icons/mob/species/protean/protean.dmi'
 		mouse_opacity = 1
 		icon_state = "wake"
 		plane = initial(plane)
@@ -662,7 +662,7 @@
 		"robodrgn"
 		)
 		var/datum/species/protean/S = humanform.species
-		icon = 'modular_chomp/icons/mob/species/protean/protean.dmi'
+		icon = 'icons/mob/species/protean/protean.dmi'
 		default_pixel_x = 0
 		pixel_x = 0
 		vore_capacity = 1
@@ -720,16 +720,16 @@
 
 		//You know technically I could just put all the icons into the 128x64.dmi file and off-set them to fit..
 		if(S.blob_appearance in wide_icons)
-			icon = 'modular_chomp/icons/mob/species/protean/protean64x32.dmi'
+			icon = 'icons/mob/species/protean/protean64x32.dmi'
 			default_pixel_x = -16
 			pixel_x = -16
 		if(S.blob_appearance in tall_icons)
-			icon = 'modular_chomp/icons/mob/species/protean/protean64x64.dmi'
+			icon = 'icons/mob/species/protean/protean64x64.dmi'
 			default_pixel_x = -16
 			pixel_x = -16
 			vis_height = 64
 		if(S.blob_appearance in big_icons)
-			icon = 'modular_chomp/icons/mob/species/protean/protean128x64.dmi'
+			icon = 'icons/mob/species/protean/protean128x64.dmi'
 			default_pixel_x = -48
 			pixel_x = -48
 			vis_height = 64
diff --git a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm
index 237e2040a77..204c8b6d5dd 100644
--- a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm
+++ b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm
@@ -381,25 +381,25 @@
 	if(temporary_form)
 		caller = temporary_form
 	var/list/icon_choices = list(
-			"Primary" = image(icon = 'modular_chomp/icons/mob/species/protean/protean.dmi', icon_state = "primary"),
-			"Highlight" = image(icon = 'modular_chomp/icons/mob/species/protean/protean.dmi', icon_state = "highlight"),
-			"puddle1" = image(icon = 'modular_chomp/icons/mob/species/protean/protean_powers.dmi', icon_state = "blob"),
-			"puddle0" = image(icon = 'modular_chomp/icons/mob/species/protean/protean.dmi', icon_state = "puddle"),
-			"catslug" = image(icon = 'modular_chomp/icons/mob/species/protean/protean.dmi', icon_state = "catslug"),
-			"cat" = image(icon = 'modular_chomp/icons/mob/species/protean/protean.dmi', icon_state = "cat"),
-			"mouse" = image(icon = 'modular_chomp/icons/mob/species/protean/protean.dmi', icon_state = "mouse"),
-			"rabbit" = image(icon = 'modular_chomp/icons/mob/species/protean/protean.dmi', icon_state = "rabbit"),
-			"bear" = image(icon = 'modular_chomp/icons/mob/species/protean/protean.dmi', icon_state = "bear"),
-			"fen" = image(icon = 'modular_chomp/icons/mob/species/protean/protean.dmi', icon_state = "fen"),
-			"fox" = image(icon = 'modular_chomp/icons/mob/species/protean/protean.dmi', icon_state = "fox"),
-			"raptor" = image(icon = 'modular_chomp/icons/mob/species/protean/protean.dmi', icon_state = "raptor"),
-			"rat" = image(icon = 'modular_chomp/icons/mob/species/protean/protean64x32.dmi', icon_state = "rat", pixel_x = -16),
-			"lizard" = image(icon = 'modular_chomp/icons/mob/species/protean/protean64x32.dmi', icon_state = "lizard", pixel_x = -16),
-			"wolf" = image(icon = 'modular_chomp/icons/mob/species/protean/protean64x32.dmi', icon_state = "wolf", pixel_x = -16),
+			"Primary" = image(icon = 'icons/mob/species/protean/protean.dmi', icon_state = "primary"),
+			"Highlight" = image(icon = 'icons/mob/species/protean/protean.dmi', icon_state = "highlight"),
+			"puddle1" = image(icon = 'icons/mob/species/protean/protean_powers.dmi', icon_state = "blob"),
+			"puddle0" = image(icon = 'icons/mob/species/protean/protean.dmi', icon_state = "puddle"),
+			"catslug" = image(icon = 'icons/mob/species/protean/protean.dmi', icon_state = "catslug"),
+			"cat" = image(icon = 'icons/mob/species/protean/protean.dmi', icon_state = "cat"),
+			"mouse" = image(icon = 'icons/mob/species/protean/protean.dmi', icon_state = "mouse"),
+			"rabbit" = image(icon = 'icons/mob/species/protean/protean.dmi', icon_state = "rabbit"),
+			"bear" = image(icon = 'icons/mob/species/protean/protean.dmi', icon_state = "bear"),
+			"fen" = image(icon = 'icons/mob/species/protean/protean.dmi', icon_state = "fen"),
+			"fox" = image(icon = 'icons/mob/species/protean/protean.dmi', icon_state = "fox"),
+			"raptor" = image(icon = 'icons/mob/species/protean/protean.dmi', icon_state = "raptor"),
+			"rat" = image(icon = 'icons/mob/species/protean/protean64x32.dmi', icon_state = "rat", pixel_x = -16),
+			"lizard" = image(icon = 'icons/mob/species/protean/protean64x32.dmi', icon_state = "lizard", pixel_x = -16),
+			"wolf" = image(icon = 'icons/mob/species/protean/protean64x32.dmi', icon_state = "wolf", pixel_x = -16),
 			//"drake" = image(icon = 'modular_chomp/icons/mob/species/protean/protean64x64.dmi', icon_state = "drake", pixel_x = -16),
-			"teppi" = image(icon = 'modular_chomp/icons/mob/species/protean/protean64x64.dmi', icon_state = "teppi", pixel_x = -16),
-			"panther" = image(icon = 'modular_chomp/icons/mob/species/protean/protean64x64.dmi', icon_state = "panther", pixel_x = -16),
-			"robodrgn" = image(icon = 'modular_chomp/icons/mob/species/protean/protean128x64.dmi', icon_state = "robodrgn", pixel_x = -48),
+			"teppi" = image(icon = 'icons/mob/species/protean/protean64x64.dmi', icon_state = "teppi", pixel_x = -16),
+			"panther" = image(icon = 'icons/mob/species/protean/protean64x64.dmi', icon_state = "panther", pixel_x = -16),
+			"robodrgn" = image(icon = 'icons/mob/species/protean/protean128x64.dmi', icon_state = "robodrgn", pixel_x = -48),
 			"Dragon" = image(icon = 'icons/mob/bigdragon_small.dmi', icon_state = "dragon_small")
 			)
 	var/blobstyle = show_radial_menu(caller, caller, icon_choices, require_near = TRUE, tooltips = FALSE)
@@ -622,7 +622,7 @@
 /obj/effect/protean_ability
 	name = "Activate"
 	desc = ""
-	icon = 'modular_chomp/icons/mob/species/protean/protean_powers.dmi'
+	icon = 'icons/mob/species/protean/protean_powers.dmi'
 	var/ability_name
 	var/to_call
 
@@ -723,7 +723,7 @@
 /obj/effect/protean_ability/chest_transparency
 	ability_name = "body transparency toggle (All but head)"
 	desc = "Makes everything but your head transparent!"
-	icon = 'modular_chomp/icons/obj/slimeborg/slimecore.dmi'
+	icon = 'icons/obj/slimeborg/slimecore.dmi'
 	icon_state = "core"
 	to_call = /mob/living/carbon/human/proc/chest_transparency_toggle
 
@@ -743,6 +743,6 @@
 /obj/effect/protean_ability/transparency_for_entire_body
 	ability_name = "Toggle Transparency"
 	desc = "transparency toggle for your entire body"
-	icon = 'modular_chomp/icons/obj/slimeborg/slimecore.dmi'
+	icon = 'icons/obj/slimeborg/slimecore.dmi'
 	icon_state = "core"
 	to_call = /mob/living/carbon/human/proc/transparency_toggle
diff --git a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_rig.dm b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_rig.dm
index 5e781db2f2e..a74ba294696 100644
--- a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_rig.dm
+++ b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_rig.dm
@@ -4,7 +4,7 @@
 /obj/item/rig/protean
 	name = "nanosuit control cluster"
 	suit_type = "nanomachine"
-	icon = 'icons/obj/rig_modules_ch.dmi'
+	icon = 'icons/obj/rig_modules_vr.dmi'
 	default_mob_icon = null	//Actually having a forced sprite for Proteans is ugly af. I'm not gonna make this a toggle
 	icon_state = "nanomachine_rig"
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 100)
@@ -110,46 +110,46 @@
 	light_overlay = "should not use a light overlay"
 	species_restricted = list(SPECIES_PROTEAN, SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJ, SPECIES_UNATHI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_PROMETHEAN, SPECIES_XENOHYBRID, SPECIES_VOX, SPECIES_TESHARI, SPECIES_VASILISSAN, SPECIES_XENOMORPH_HYBRID)
 	sprite_sheets = list(
-		SPECIES_PROTEAN			 = 'modular_chomp/icons/mob/head_ch.dmi',
-		SPECIES_HUMAN			 = 'modular_chomp/icons/mob/head_ch.dmi',
-		SPECIES_TAJ 			 = 'modular_chomp/icons/mob/species/tajaran/helmet_ch.dmi',
-		SPECIES_SKRELL 			 = 'modular_chomp/icons/mob/species/skrell/helmet_ch.dmi',
-		SPECIES_UNATHI 			 = 'modular_chomp/icons/mob/species/unathi/helmet_ch.dmi',
-		SPECIES_XENOHYBRID		 = 'modular_chomp/icons/mob/species/unathi/helmet_ch.dmi',
-		SPECIES_AKULA 			 = 'modular_chomp/icons/mob/species/akula/helmet_ch.dmi',
-		SPECIES_SERGAL			 = 'modular_chomp/icons/mob/species/sergal/helmet_ch.dmi',
-		SPECIES_NEVREAN			 = 'modular_chomp/icons/mob/species/sergal/helmet_ch.dmi',
-		SPECIES_VULPKANIN 		 = 'modular_chomp/icons/mob/species/vulpkanin/helmet_ch.dmi',
-		SPECIES_ZORREN_HIGH 	 = 'modular_chomp/icons/mob/species/fox/helmet_ch.dmi',
-		SPECIES_FENNEC 			 = 'modular_chomp/icons/mob/species/vulpkanin/helmet_ch.dmi',
-		SPECIES_PROMETHEAN		 = 'modular_chomp/icons/mob/species/skrell/helmet_ch.dmi',
-		SPECIES_TESHARI 		 = 'modular_chomp/icons/mob/species/teshari/helmet_ch.dmi',
-		SPECIES_VASILISSAN		 = 'modular_chomp/icons/mob/species/skrell/helmet_ch.dmi',
-		SPECIES_VOX				 = 'modular_chomp/icons/mob/species/vox/head_ch.dmi',
-		SPECIES_XENOMORPH_HYBRID = 'modular_chomp/icons/mob/species/xenomorph_hybrid/helmet_ch.dmi'
+		SPECIES_PROTEAN			 = 'icons/mob/head.dmi',
+		SPECIES_HUMAN			 = 'icons/mob/head.dmi',
+		SPECIES_TAJ 			 = 'icons/mob/species/tajaran/helmet.dmi',
+		SPECIES_SKRELL 			 = 'icons/mob/species/skrell/helmet.dmi',
+		SPECIES_UNATHI 			 = 'icons/mob/species/unathi/helmet.dmi',
+		SPECIES_XENOHYBRID		 = 'icons/mob/species/unathi/helmet.dmi',
+		SPECIES_AKULA 			 = 'icons/mob/species/akula/helmet.dmi',
+		SPECIES_SERGAL			 = 'icons/mob/species/sergal/helmet.dmi',
+		SPECIES_NEVREAN			 = 'icons/mob/species/sergal/helmet.dmi',
+		SPECIES_VULPKANIN 		 = 'icons/mob/species/vulpkanin/helmet.dmi',
+		SPECIES_ZORREN_HIGH 	 = 'icons/mob/species/fox/helmet.dmi',
+		SPECIES_FENNEC 			 = 'icons/mob/species/vulpkanin/helmet.dmi',
+		SPECIES_PROMETHEAN		 = 'icons/mob/species/skrell/helmet.dmi',
+		SPECIES_TESHARI 		 = 'icons/mob/species/teshari/helmet.dmi',
+		SPECIES_VASILISSAN		 = 'icons/mob/species/skrell/helmet.dmi',
+		SPECIES_VOX				 = 'icons/mob/species/vox/head.dmi',
+		SPECIES_XENOMORPH_HYBRID = 'icons/mob/species/xenomorph_hybrid/helmet.dmi'
 		)
 
 	sprite_sheets_obj = list(
-		SPECIES_PROTEAN			 = 'modular_chomp/icons/mob/head_ch.dmi',
-		SPECIES_HUMAN			 = 'modular_chomp/icons/mob/head_ch.dmi',
-		SPECIES_TAJ 			 = 'modular_chomp/icons/mob/head_ch.dmi',
-		SPECIES_SKRELL 			 = 'modular_chomp/icons/mob/head_ch.dmi',
-		SPECIES_UNATHI 			 = 'modular_chomp/icons/mob/head_ch.dmi',
-		SPECIES_XENOHYBRID		 = 'modular_chomp/icons/mob/head_ch.dmi',
-		SPECIES_AKULA 			 = 'modular_chomp/icons/mob/head_ch.dmi',
-		SPECIES_SERGAL			 = 'modular_chomp/icons/mob/head_ch.dmi',
-		SPECIES_NEVREAN			 = 'modular_chomp/icons/mob/head_ch.dmi',
-		SPECIES_VULPKANIN 		 = 'modular_chomp/icons/mob/head_ch.dmi',
-		SPECIES_ZORREN_HIGH 	 = 'modular_chomp/icons/mob/head_ch.dmi',
-		SPECIES_FENNEC 			 = 'modular_chomp/icons/mob/head_ch.dmi',
-		SPECIES_PROMETHEAN		 = 'modular_chomp/icons/mob/head_ch.dmi',
-		SPECIES_TESHARI 		 = 'modular_chomp/icons/mob/head_ch.dmi',
-		SPECIES_VASILISSAN		 = 'modular_chomp/icons/mob/head_ch.dmi',
-		SPECIES_VOX				 = 'modular_chomp/icons/mob/head_ch.dmi',
-		SPECIES_XENOMORPH_HYBRID = 'modular_chomp/icons/mob/head_ch.dmi'
+		SPECIES_PROTEAN			 = 'icons/mob/head.dmi',
+		SPECIES_HUMAN			 = 'icons/mob/head.dmi',
+		SPECIES_TAJ 			 = 'icons/mob/head.dmi',
+		SPECIES_SKRELL 			 = 'icons/mob/head.dmi',
+		SPECIES_UNATHI 			 = 'icons/mob/head.dmi',
+		SPECIES_XENOHYBRID		 = 'icons/mob/head.dmi',
+		SPECIES_AKULA 			 = 'icons/mob/head.dmi',
+		SPECIES_SERGAL			 = 'icons/mob/head.dmi',
+		SPECIES_NEVREAN			 = 'icons/mob/head.dmi',
+		SPECIES_VULPKANIN 		 = 'icons/mob/head.dmi',
+		SPECIES_ZORREN_HIGH 	 = 'icons/mob/head.dmi',
+		SPECIES_FENNEC 			 = 'icons/mob/head.dmi',
+		SPECIES_PROMETHEAN		 = 'icons/mob/head.dmi',
+		SPECIES_TESHARI 		 = 'icons/mob/head.dmi',
+		SPECIES_VASILISSAN		 = 'icons/mob/head.dmi',
+		SPECIES_VOX				 = 'icons/mob/head.dmi',
+		SPECIES_XENOMORPH_HYBRID = 'icons/mob/head.dmi'
 		)
-	icon = 'modular_chomp/icons/mob/head_ch.dmi'
-	default_worn_icon = 'modular_chomp/icons/mob/head_ch.dmi'
+	icon = 'icons/mob/head.dmi'
+	default_worn_icon = 'icons/mob/head.dmi'
 
 /obj/item/clothing/gloves/gauntlets/rig/protean
 	name = "mass"
@@ -157,58 +157,58 @@
 	siemens_coefficient= 0
 	species_restricted = list(SPECIES_PROTEAN, SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJ, SPECIES_UNATHI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_PROMETHEAN, SPECIES_XENOHYBRID, SPECIES_VOX, SPECIES_TESHARI, SPECIES_VASILISSAN, SPECIES_XENOMORPH_HYBRID)
 	sprite_sheets = list(
-		SPECIES_PROTEAN			 = 'modular_chomp/icons/mob/hands_ch.dmi',
-		SPECIES_HUMAN			 = 'modular_chomp/icons/mob/hands_ch.dmi',
-		SPECIES_TAJ 			 = 'modular_chomp/icons/mob/hands_ch.dmi',
-		SPECIES_SKRELL 			 = 'modular_chomp/icons/mob/hands_ch.dmi',
-		SPECIES_UNATHI 			 = 'modular_chomp/icons/mob/hands_ch.dmi',
-		SPECIES_XENOHYBRID		 = 'modular_chomp/icons/mob/hands_ch.dmi',
-		SPECIES_AKULA 			 = 'modular_chomp/icons/mob/hands_ch.dmi',
-		SPECIES_SERGAL			 = 'modular_chomp/icons/mob/hands_ch.dmi',
-		SPECIES_NEVREAN			 = 'modular_chomp/icons/mob/hands_ch.dmi',
-		SPECIES_VULPKANIN		 = 'modular_chomp/icons/mob/hands_ch.dmi',
-		SPECIES_ZORREN_HIGH 	 = 'modular_chomp/icons/mob/hands_ch.dmi',
-		SPECIES_FENNEC			 = 'modular_chomp/icons/mob/hands_ch.dmi',
-		SPECIES_PROMETHEAN		 = 'modular_chomp/icons/mob/hands_ch.dmi',
-		SPECIES_TESHARI 		 = 'modular_chomp/icons/mob/species/teshari/hands_ch.dmi',
-		SPECIES_VASILISSAN		 = 'modular_chomp/icons/mob/hands_ch.dmi',
-		SPECIES_VOX				 = 'modular_chomp/icons/mob/species/vox/gloves_ch.dmi',
-		SPECIES_XENOMORPH_HYBRID = 'modular_chomp/icons/mob/species/xenomorph_hybrid/gloves_ch.dmi'
+		SPECIES_PROTEAN			 = 'icons/mob/hands.dmi',
+		SPECIES_HUMAN			 = 'icons/mob/hands.dmi',
+		SPECIES_TAJ 			 = 'icons/mob/hands.dmi',
+		SPECIES_SKRELL 			 = 'icons/mob/hands.dmi',
+		SPECIES_UNATHI 			 = 'icons/mob/hands.dmi',
+		SPECIES_XENOHYBRID		 = 'icons/mob/hands.dmi',
+		SPECIES_AKULA 			 = 'icons/mob/hands.dmi',
+		SPECIES_SERGAL			 = 'icons/mob/hands.dmi',
+		SPECIES_NEVREAN			 = 'icons/mob/hands.dmi',
+		SPECIES_VULPKANIN		 = 'icons/mob/hands.dmi',
+		SPECIES_ZORREN_HIGH 	 = 'icons/mob/hands.dmi',
+		SPECIES_FENNEC			 = 'icons/mob/hands.dmi',
+		SPECIES_PROMETHEAN		 = 'icons/mob/hands.dmi',
+		SPECIES_TESHARI 		 = 'icons/mob/species/teshari/hands.dmi',
+		SPECIES_VASILISSAN		 = 'icons/mob/hands.dmi',
+		SPECIES_VOX				 = 'icons/mob/species/vox/gloves.dmi',
+		SPECIES_XENOMORPH_HYBRID = 'icons/mob/species/xenomorph_hybrid/gloves.dmi'
 		)
 
 	sprite_sheets_obj = list(
-		SPECIES_HUMAN			 = 'modular_chomp/icons/mob/hands_ch.dmi',
-		SPECIES_TAJ 			 = 'modular_chomp/icons/mob/hands_ch.dmi',
-		SPECIES_SKRELL 			 = 'modular_chomp/icons/mob/hands_ch.dmi',
-		SPECIES_UNATHI 			 = 'modular_chomp/icons/mob/hands_ch.dmi',
-		SPECIES_XENOHYBRID		 = 'modular_chomp/icons/mob/hands_ch.dmi',
-		SPECIES_AKULA 			 = 'modular_chomp/icons/mob/hands_ch.dmi',
-		SPECIES_SERGAL			 = 'modular_chomp/icons/mob/hands_ch.dmi',
-		SPECIES_NEVREAN			 = 'modular_chomp/icons/mob/hands_ch.dmi',
-		SPECIES_VULPKANIN 		 = 'modular_chomp/icons/mob/hands_ch.dmi',
-		SPECIES_ZORREN_HIGH 	 = 'modular_chomp/icons/mob/hands_ch.dmi',
-		SPECIES_FENNEC 			 = 'modular_chomp/icons/mob/hands_ch.dmi',
-		SPECIES_PROMETHEAN		 = 'modular_chomp/icons/mob/hands_ch.dmi',
-		SPECIES_TESHARI 		 = 'modular_chomp/icons/mob/hands_ch.dmi',
-		SPECIES_VASILISSAN		 = 'modular_chomp/icons/mob/hands_ch.dmi',
-		SPECIES_VOX				 = 'modular_chomp/icons/mob/hands_ch.dmi',
-		SPECIES_XENOMORPH_HYBRID = 'modular_chomp/icons/mob/hands_ch.dmi'
+		SPECIES_HUMAN			 = 'icons/mob/hands.dmi',
+		SPECIES_TAJ 			 = 'icons/mob/hands.dmi',
+		SPECIES_SKRELL 			 = 'icons/mob/hands.dmi',
+		SPECIES_UNATHI 			 = 'icons/mob/hands.dmi',
+		SPECIES_XENOHYBRID		 = 'icons/mob/hands.dmi',
+		SPECIES_AKULA 			 = 'icons/mob/hands.dmi',
+		SPECIES_SERGAL			 = 'icons/mob/hands.dmi',
+		SPECIES_NEVREAN			 = 'icons/mob/hands.dmi',
+		SPECIES_VULPKANIN 		 = 'icons/mob/hands.dmi',
+		SPECIES_ZORREN_HIGH 	 = 'icons/mob/hands.dmi',
+		SPECIES_FENNEC 			 = 'icons/mob/hands.dmi',
+		SPECIES_PROMETHEAN		 = 'icons/mob/hands.dmi',
+		SPECIES_TESHARI 		 = 'icons/mob/hands.dmi',
+		SPECIES_VASILISSAN		 = 'icons/mob/hands.dmi',
+		SPECIES_VOX				 = 'icons/mob/hands.dmi',
+		SPECIES_XENOMORPH_HYBRID = 'icons/mob/hands.dmi'
 		)
-	icon = 'modular_chomp/icons/mob/hands_ch.dmi'
-	default_worn_icon = 'modular_chomp/icons/mob/hands_ch.dmi'
+	icon = 'icons/mob/hands.dmi'
+	default_worn_icon = 'icons/mob/hands.dmi'
 
 /obj/item/clothing/shoes/magboots/rig/protean
 	name = "mass"
 	desc = "Boot-shaped clusters of nanomachines."
 	species_restricted = list(SPECIES_PROTEAN, SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJ, SPECIES_UNATHI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_PROMETHEAN, SPECIES_XENOHYBRID, SPECIES_VOX, SPECIES_TESHARI, SPECIES_VASILISSAN, SPECIES_XENOMORPH_HYBRID)
 	sprite_sheets = list(
-		SPECIES_TESHARI 		 = 'modular_chomp/icons/mob/species/teshari/feet_ch.dmi',
-		SPECIES_VOX				 = 'modular_chomp/icons/mob/species/vox/shoes_ch.dmi',
-		SPECIES_XENOMORPH_HYBRID = 'modular_chomp/icons/mob/species/xenomorph_hybrid/shoes_ch.dmi'
+		SPECIES_TESHARI 		 = 'icons/mob/species/teshari/feet.dmi',
+		SPECIES_VOX				 = 'icons/mob/species/vox/shoes.dmi',
+		SPECIES_XENOMORPH_HYBRID = 'icons/mob/species/xenomorph_hybrid/shoes.dmi'
 		)
 	sprite_sheets_obj = list()
-	icon = 'modular_chomp/icons/mob/feet_ch.dmi'
-	default_worn_icon = 'modular_chomp/icons/mob/feet_ch.dmi'
+	icon = 'icons/mob/feet.dmi'
+	default_worn_icon = 'icons/mob/feet.dmi'
 
 /obj/item/clothing/suit/space/rig/protean
 	name = "mass"
@@ -224,14 +224,14 @@
 		/obj/item/storage/backpack,
 		)
 	sprite_sheets = list(
-		SPECIES_TESHARI 		 = 'modular_chomp/icons/mob/species/teshari/suit_ch.dmi',
-		SPECIES_VOX				 = 'modular_chomp/icons/mob/species/vox/suit_ch.dmi',
-		SPECIES_XENOMORPH_HYBRID = 'modular_chomp/icons/mob/species/xenomorph_hybrid/suit_ch.dmi'
+		SPECIES_TESHARI 		 = 'icons/mob/species/teshari/suit.dmi',
+		SPECIES_VOX				 = 'icons/mob/species/vox/suit.dmi',
+		SPECIES_XENOMORPH_HYBRID = 'icons/mob/species/xenomorph_hybrid/suit.dmi'
 		)
 
 	sprite_sheets_obj = list()
-	icon = 'modular_chomp/icons/mob/spacesuit_ch.dmi'
-	default_worn_icon = 'modular_chomp/icons/mob/spacesuit_ch.dmi'
+	icon = 'icons/mob/spacesuit.dmi'
+	default_worn_icon = 'icons/mob/spacesuit.dmi'
 
 //Copy pasted most of this proc from base because I don't feel like rewriting the base proc with a shit load of exceptions
 /obj/item/rig/protean/attackby(obj/item/W as obj, mob/living/user as mob)
diff --git a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm
index 55db53fec13..588c57fbd69 100755
--- a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm
+++ b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm
@@ -246,7 +246,7 @@
 	var/mob/temp = H
 	if(H.temporary_form)
 		temp = H.temporary_form
-	playsound(temp, 'modular_chomp/sound/voice/borg_deathsound.ogg', 50, 1)
+	playsound(temp, 'sound/voice/borg_deathsound.ogg', 50, 1)
 	temp.visible_message(span_bold("[temp.name]") + " shudders and retreats inwards, coalescing into a single core componant!")
 	to_chat(temp, span_warning("You've died as a Protean! While dead, you will be locked to your core RIG control module until you can be repaired. Instructions to your revival can be found in the Examine tab when examining your module."))
 	if(H.temporary_form)
@@ -421,7 +421,7 @@
 /obj/item/clothing/accessory/permit/nanotech
 	name = "\improper P.A.N. card"
 	desc = "This is a 'Permit for Advanced Nanotechnology' card. It allows the owner to possess and operate advanced nanotechnology on NanoTrasen property. It must be renewed on a monthly basis."
-	icon = 'modular_chomp/icons/mob/species/protean/protean.dmi'
+	icon = 'icons/mob/species/protean/protean.dmi'
 	icon_state = "permit_pan"
 
 	var/validstring = "VALID THROUGH END OF: "
diff --git a/code/modules/organs/subtypes/nano.dm b/code/modules/organs/subtypes/nano.dm
index 74081abd120..023ccc8005a 100644
--- a/code/modules/organs/subtypes/nano.dm
+++ b/code/modules/organs/subtypes/nano.dm
@@ -87,7 +87,7 @@
 /obj/item/organ/internal/nano/orchestrator
 	name = "orchestrator module"
 	desc = "A small computer, designed for highly parallel workloads."
-	icon = 'modular_chomp/icons/mob/species/protean/protean.dmi'
+	icon = 'icons/mob/species/protean/protean.dmi'
 	icon_state = "orchestrator"
 	organ_tag = O_ORCH
 	parent_organ = BP_TORSO
@@ -107,7 +107,7 @@
 /obj/item/organ/internal/nano/refactory
 	name = "refactory module"
 	desc = "A miniature metal processing unit and nanite factory."
-	icon = 'modular_chomp/icons/mob/species/protean/protean.dmi'
+	icon = 'icons/mob/species/protean/protean.dmi'
 	icon_state = "refactory"
 	organ_tag = O_FACT
 	parent_organ = BP_TORSO
@@ -163,7 +163,7 @@
 /obj/item/organ/internal/mmi_holder/posibrain/nano
 	name = "protean posibrain"
 	desc = "A more advanced version of the standard posibrain, typically found in protean bodies."
-	icon = 'modular_chomp/icons/mob/species/protean/protean.dmi'
+	icon = 'icons/mob/species/protean/protean.dmi'
 	icon_state = "posi"
 	parent_organ = BP_TORSO
 
@@ -192,7 +192,7 @@
 /obj/item/mmi/digital/posibrain/nano
 	name = "protean posibrain"
 	desc = "A more advanced version of the standard posibrain, typically found in protean bodies."
-	icon = 'modular_chomp/icons/mob/species/protean/protean.dmi'
+	icon = 'icons/mob/species/protean/protean.dmi'
 	icon_state = "posi"
 
 /obj/item/mmi/digital/posibrain/nano/Initialize()
@@ -228,5 +228,5 @@
 /obj/item/protean_reboot
 	name = "Protean Reboot Programmer"
 	desc = "A small, highly specialized programmer used to form the basis of a Protean swarm. A necessary component in reconstituting a Protean who has lost total body cohesion."
-	icon = 'modular_chomp/icons/mob/species/protean/protean.dmi'
+	icon = 'icons/mob/species/protean/protean.dmi'
 	icon_state = "reboot"
diff --git a/icons/mob/ears.dmi b/icons/mob/ears.dmi
new file mode 100644
index 00000000000..3cbae70a3d8
Binary files /dev/null and b/icons/mob/ears.dmi differ
diff --git a/icons/mob/feet.dmi b/icons/mob/feet.dmi
new file mode 100644
index 00000000000..ccc2345e87b
Binary files /dev/null and b/icons/mob/feet.dmi differ
diff --git a/icons/mob/hands.dmi b/icons/mob/hands.dmi
new file mode 100644
index 00000000000..c5434d96948
Binary files /dev/null and b/icons/mob/hands.dmi differ
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index 3e8d60a5798..983a4f95b25 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/lefthand_holder.dmi b/icons/mob/lefthand_holder.dmi
new file mode 100644
index 00000000000..e5cded14f13
Binary files /dev/null and b/icons/mob/lefthand_holder.dmi differ
diff --git a/icons/mob/righthand_holder.dmi b/icons/mob/righthand_holder.dmi
new file mode 100644
index 00000000000..edc2e8d4d32
Binary files /dev/null and b/icons/mob/righthand_holder.dmi differ
diff --git a/icons/mob/spacesuit.dmi b/icons/mob/spacesuit.dmi
new file mode 100644
index 00000000000..7fb16ee9cc2
Binary files /dev/null and b/icons/mob/spacesuit.dmi differ
diff --git a/icons/mob/species/akula/helmet.dmi b/icons/mob/species/akula/helmet.dmi
new file mode 100644
index 00000000000..816728e67f1
Binary files /dev/null and b/icons/mob/species/akula/helmet.dmi differ
diff --git a/icons/mob/species/akula/suit.dmi b/icons/mob/species/akula/suit.dmi
new file mode 100644
index 00000000000..6bb1a3c22f0
Binary files /dev/null and b/icons/mob/species/akula/suit.dmi differ
diff --git a/icons/mob/species/fox/helmet.dmi b/icons/mob/species/fox/helmet.dmi
new file mode 100644
index 00000000000..662cf2b5389
Binary files /dev/null and b/icons/mob/species/fox/helmet.dmi differ
diff --git a/icons/mob/species/fox/suit.dmi b/icons/mob/species/fox/suit.dmi
new file mode 100644
index 00000000000..6aaae8e1533
Binary files /dev/null and b/icons/mob/species/fox/suit.dmi differ
diff --git a/icons/mob/species/protean/protean.dmi b/icons/mob/species/protean/protean.dmi
index f644aa051a8..21308a20582 100644
Binary files a/icons/mob/species/protean/protean.dmi and b/icons/mob/species/protean/protean.dmi differ
diff --git a/icons/mob/species/protean/protean128x64.dmi b/icons/mob/species/protean/protean128x64.dmi
new file mode 100644
index 00000000000..3a40f0c2092
Binary files /dev/null and b/icons/mob/species/protean/protean128x64.dmi differ
diff --git a/icons/mob/species/protean/protean64x32.dmi b/icons/mob/species/protean/protean64x32.dmi
new file mode 100644
index 00000000000..e5244c77bf5
Binary files /dev/null and b/icons/mob/species/protean/protean64x32.dmi differ
diff --git a/icons/mob/species/protean/protean64x64.dmi b/icons/mob/species/protean/protean64x64.dmi
new file mode 100644
index 00000000000..1a6fe757e81
Binary files /dev/null and b/icons/mob/species/protean/protean64x64.dmi differ
diff --git a/icons/mob/species/protean/protean_powers.dmi b/icons/mob/species/protean/protean_powers.dmi
index febd3522a03..efcd821a813 100644
Binary files a/icons/mob/species/protean/protean_powers.dmi and b/icons/mob/species/protean/protean_powers.dmi differ
diff --git a/icons/mob/species/sergal/helmet.dmi b/icons/mob/species/sergal/helmet.dmi
new file mode 100644
index 00000000000..3db73dd843c
Binary files /dev/null and b/icons/mob/species/sergal/helmet.dmi differ
diff --git a/icons/mob/species/sergal/suit.dmi b/icons/mob/species/sergal/suit.dmi
new file mode 100644
index 00000000000..cb43d464232
Binary files /dev/null and b/icons/mob/species/sergal/suit.dmi differ
diff --git a/icons/mob/species/skrell/helmet.dmi b/icons/mob/species/skrell/helmet.dmi
new file mode 100644
index 00000000000..0d78858afd9
Binary files /dev/null and b/icons/mob/species/skrell/helmet.dmi differ
diff --git a/icons/mob/species/skrell/suit.dmi b/icons/mob/species/skrell/suit.dmi
new file mode 100644
index 00000000000..74d3cb4f021
Binary files /dev/null and b/icons/mob/species/skrell/suit.dmi differ
diff --git a/icons/mob/species/tajaran/helmet.dmi b/icons/mob/species/tajaran/helmet.dmi
new file mode 100644
index 00000000000..4ea01ddf643
Binary files /dev/null and b/icons/mob/species/tajaran/helmet.dmi differ
diff --git a/icons/mob/species/tajaran/suit.dmi b/icons/mob/species/tajaran/suit.dmi
new file mode 100644
index 00000000000..fc9e06c4cab
Binary files /dev/null and b/icons/mob/species/tajaran/suit.dmi differ
diff --git a/icons/mob/species/teshari/feet.dmi b/icons/mob/species/teshari/feet.dmi
new file mode 100644
index 00000000000..3eeebe76dfd
Binary files /dev/null and b/icons/mob/species/teshari/feet.dmi differ
diff --git a/icons/mob/species/teshari/hands.dmi b/icons/mob/species/teshari/hands.dmi
new file mode 100644
index 00000000000..cf74d73796c
Binary files /dev/null and b/icons/mob/species/teshari/hands.dmi differ
diff --git a/icons/mob/species/teshari/helmet.dmi b/icons/mob/species/teshari/helmet.dmi
new file mode 100644
index 00000000000..124701a5266
Binary files /dev/null and b/icons/mob/species/teshari/helmet.dmi differ
diff --git a/icons/mob/species/teshari/suit.dmi b/icons/mob/species/teshari/suit.dmi
index 09d72fa4612..55b76f109c0 100644
Binary files a/icons/mob/species/teshari/suit.dmi and b/icons/mob/species/teshari/suit.dmi differ
diff --git a/icons/mob/species/unathi/helmet.dmi b/icons/mob/species/unathi/helmet.dmi
new file mode 100644
index 00000000000..10980c26b88
Binary files /dev/null and b/icons/mob/species/unathi/helmet.dmi differ
diff --git a/icons/mob/species/unathi/suit.dmi b/icons/mob/species/unathi/suit.dmi
new file mode 100644
index 00000000000..7bd66e6277a
Binary files /dev/null and b/icons/mob/species/unathi/suit.dmi differ
diff --git a/icons/mob/species/vox/gloves.dmi b/icons/mob/species/vox/gloves.dmi
new file mode 100644
index 00000000000..043d409ab4f
Binary files /dev/null and b/icons/mob/species/vox/gloves.dmi differ
diff --git a/icons/mob/species/vox/head.dmi b/icons/mob/species/vox/head.dmi
new file mode 100644
index 00000000000..5bfd81ffea7
Binary files /dev/null and b/icons/mob/species/vox/head.dmi differ
diff --git a/icons/mob/species/vox/shoes.dmi b/icons/mob/species/vox/shoes.dmi
new file mode 100644
index 00000000000..14a1c8ff2e2
Binary files /dev/null and b/icons/mob/species/vox/shoes.dmi differ
diff --git a/icons/mob/species/vox/suit.dmi b/icons/mob/species/vox/suit.dmi
new file mode 100644
index 00000000000..58ecc85ca4a
Binary files /dev/null and b/icons/mob/species/vox/suit.dmi differ
diff --git a/icons/mob/species/vulpkanin/helmet.dmi b/icons/mob/species/vulpkanin/helmet.dmi
new file mode 100644
index 00000000000..39cf0a26a5c
Binary files /dev/null and b/icons/mob/species/vulpkanin/helmet.dmi differ
diff --git a/icons/mob/species/vulpkanin/suit.dmi b/icons/mob/species/vulpkanin/suit.dmi
new file mode 100644
index 00000000000..1242aaf5b07
Binary files /dev/null and b/icons/mob/species/vulpkanin/suit.dmi differ
diff --git a/icons/mob/species/xenomorph_hybrid/gloves.dmi b/icons/mob/species/xenomorph_hybrid/gloves.dmi
new file mode 100644
index 00000000000..d723ac8a71d
Binary files /dev/null and b/icons/mob/species/xenomorph_hybrid/gloves.dmi differ
diff --git a/icons/mob/species/xenomorph_hybrid/helmet.dmi b/icons/mob/species/xenomorph_hybrid/helmet.dmi
new file mode 100644
index 00000000000..9d1d68c6a7d
Binary files /dev/null and b/icons/mob/species/xenomorph_hybrid/helmet.dmi differ
diff --git a/icons/mob/species/xenomorph_hybrid/shoes.dmi b/icons/mob/species/xenomorph_hybrid/shoes.dmi
new file mode 100644
index 00000000000..f52f13a184b
Binary files /dev/null and b/icons/mob/species/xenomorph_hybrid/shoes.dmi differ
diff --git a/icons/mob/species/xenomorph_hybrid/suit.dmi b/icons/mob/species/xenomorph_hybrid/suit.dmi
new file mode 100644
index 00000000000..adf54281828
Binary files /dev/null and b/icons/mob/species/xenomorph_hybrid/suit.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
new file mode 100644
index 00000000000..35400348492
Binary files /dev/null and b/icons/mob/suit.dmi differ
diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi
index 9c210eb641c..0b5fd53fb22 100644
Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ
diff --git a/icons/obj/rig_modules_vr.dmi b/icons/obj/rig_modules_vr.dmi
index 334a8e881ff..b09eb0d54c7 100644
Binary files a/icons/obj/rig_modules_vr.dmi and b/icons/obj/rig_modules_vr.dmi differ
diff --git a/icons/obj/slimeborg/slimecore.dmi b/icons/obj/slimeborg/slimecore.dmi
new file mode 100644
index 00000000000..761a44804cb
Binary files /dev/null and b/icons/obj/slimeborg/slimecore.dmi differ
diff --git a/sound/voice/borg_deathsound.ogg b/sound/voice/borg_deathsound.ogg
new file mode 100644
index 00000000000..bb11022abec
Binary files /dev/null and b/sound/voice/borg_deathsound.ogg differ
diff --git a/vorestation.dme b/vorestation.dme
index 27c10947dc8..5f25d5a0189 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -137,6 +137,7 @@
 #include "code\__defines\statpanel.dm"
 #include "code\__defines\subsystems.dm"
 #include "code\__defines\supply.dm"
+#include "code\__defines\talksounds.dm"
 #include "code\__defines\targeting.dm"
 #include "code\__defines\text.dm"
 #include "code\__defines\tgs.config.dm"
@@ -3094,8 +3095,8 @@
 #include "code\modules\mob\living\carbon\human\species\station\xenochimera_trait_vr.dm"
 #include "code\modules\mob\living\carbon\human\species\station\protean_vr\_protean_defines.dm"
 #include "code\modules\mob\living\carbon\human\species\station\protean_vr\protean_blob.dm"
-#include "code\modules\mob\living\carbon\human\species\station\protean_vr\protean_rig.dm"
 #include "code\modules\mob\living\carbon\human\species\station\protean_vr\protean_powers.dm"
+#include "code\modules\mob\living\carbon\human\species\station\protean_vr\protean_rig.dm"
 #include "code\modules\mob\living\carbon\human\species\station\protean_vr\protean_rig_tgui.dm"
 #include "code\modules\mob\living\carbon\human\species\station\protean_vr\protean_species.dm"
 #include "code\modules\mob\living\carbon\human\species\station\traits_vr\_traits.dm"