diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm
index 54ca78aa398..311376e1fd4 100644
--- a/code/defines/obj/weapon.dm
+++ b/code/defines/obj/weapon.dm
@@ -174,7 +174,7 @@
 	w_class = 3.0
 	origin_tech = list(TECH_MATERIAL = 1)
 	var/breakouttime = 300	//Deciseconds = 30s = 0.5 minute
-	sprite_sheets = list("Resomi" = 'icons/mob/species/resomi/handcuffs.dmi')
+	sprite_sheets = list("Seromi" = 'icons/mob/species/seromi/handcuffs.dmi')
 
 /obj/item/weapon/caution
 	desc = "Caution! Wet Floor!"
diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index f58b491a418..6b423f1309b 100644
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -11,7 +11,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	item_state = "electronic"
 	w_class = 2.0
 	slot_flags = SLOT_ID | SLOT_BELT
-	sprite_sheets = list("Resomi" = 'icons/mob/species/resomi/id.dmi')
+	sprite_sheets = list("Seromi" = 'icons/mob/species/seromi/id.dmi')
 
 	//Main variables
 	var/pdachoice = 1
@@ -323,10 +323,10 @@ var/global/list/obj/item/device/pda/PDAs = list()
 		if(1) icon = 'icons/obj/pda.dmi'
 		if(2) icon = 'icons/obj/pda_slim.dmi'
 		if(3) icon = 'icons/obj/pda_old.dmi'
-		else 
+		else
 			icon = 'icons/obj/pda_old.dmi'
 			log_debug("Invalid switch for PDA, defaulting to old PDA icons. [pdachoice] chosen.")
-		
+
 
 /obj/item/device/pda/proc/can_use()
 
diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm
index cc805cf95bd..c725bcbba4e 100644
--- a/code/game/objects/items/weapons/cards_ids.dm
+++ b/code/game/objects/items/weapons/cards_ids.dm
@@ -95,7 +95,7 @@
 	item_state = "card-id"
 
 	sprite_sheets = list(
-		"Resomi" = 'icons/mob/species/resomi/id.dmi'
+		"Seromi" = 'icons/mob/species/seromi/id.dmi'
 		)
 
 	var/access = list()
diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm
index 289737cbeae..4ac0c15527f 100644
--- a/code/game/objects/items/weapons/handcuffs.dm
+++ b/code/game/objects/items/weapons/handcuffs.dm
@@ -17,7 +17,7 @@
 	var/breakouttime = 1200 //Deciseconds = 120s = 2 minutes
 	var/cuff_sound = 'sound/weapons/handcuffs.ogg'
 	var/cuff_type = "handcuffs"
-	sprite_sheets = list("Resomi" = 'icons/mob/species/resomi/handcuffs.dmi')
+	sprite_sheets = list("Seromi" = 'icons/mob/species/seromi/handcuffs.dmi')
 
 /obj/item/weapon/handcuffs/attack(var/mob/living/carbon/C, var/mob/living/user)
 
diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm
index 38ffaf20f71..995b4491a90 100644
--- a/code/game/objects/items/weapons/storage/backpack.dm
+++ b/code/game/objects/items/weapons/storage/backpack.dm
@@ -18,7 +18,7 @@
 		slot_r_hand_str = "backpack",
 		)
 	sprite_sheets = list(
-		"Resomi" = 'icons/mob/species/resomi/back.dmi'
+		"Seromi" = 'icons/mob/species/seromi/back.dmi'
 		)
 	w_class = 4
 	slot_flags = SLOT_BACK
diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm
index 4d4c9cb1e57..58c85ab2112 100644
--- a/code/game/objects/items/weapons/storage/belt.dm
+++ b/code/game/objects/items/weapons/storage/belt.dm
@@ -6,7 +6,7 @@
 	item_state = "utility"
 	slot_flags = SLOT_BELT
 	attack_verb = list("whipped", "lashed", "disciplined")
-	sprite_sheets = list("Resomi" = 'icons/mob/species/resomi/belt.dmi')
+	sprite_sheets = list("Seromi" = 'icons/mob/species/seromi/belt.dmi')
 
 	var/show_above_suit = 0
 
diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm
index a00cb019d42..9c2cdbc293b 100644
--- a/code/game/objects/items/weapons/tanks/tanks.dm
+++ b/code/game/objects/items/weapons/tanks/tanks.dm
@@ -24,7 +24,7 @@ var/list/global/tank_gauge_cache = list()
 	throw_range = 4
 
 	sprite_sheets = list(
-		"Resomi" = 'icons/mob/species/resomi/back.dmi'
+		"Seromi" = 'icons/mob/species/seromi/back.dmi'
 		)
 
 	var/datum/gas_mixture/air_contents = null
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 835751bab22..d1878acfd9c 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -101,7 +101,7 @@
 	w_class = 1.0
 	throwforce = 2
 	slot_flags = SLOT_EARS
-	sprite_sheets = list("Resomi" = 'icons/mob/species/resomi/ears.dmi')
+	sprite_sheets = list("Seromi" = 'icons/mob/species/seromi/ears.dmi')
 
 /obj/item/clothing/ears/attack_hand(mob/user as mob)
 	if (!user) return
@@ -211,7 +211,7 @@ BLIND     // can't see anything
 	var/see_invisible = -1
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/eyes.dmi',
-		"Resomi" = 'icons/mob/species/resomi/eyes.dmi',
+		"Seromi" = 'icons/mob/species/seromi/eyes.dmi',
 		)
 
 /obj/item/clothing/glasses/update_clothing_icon()
@@ -236,7 +236,7 @@ BLIND     // can't see anything
 	species_restricted = list("exclude","Unathi","Tajara", "Vox")
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/gloves.dmi',
-		"Resomi" = 'icons/mob/species/resomi/gloves.dmi',
+		"Seromi" = 'icons/mob/species/seromi/gloves.dmi',
 		)
 
 /obj/item/clothing/gloves/update_clothing_icon()
@@ -294,7 +294,7 @@ BLIND     // can't see anything
 
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/head.dmi',
-		"Resomi" = 'icons/mob/species/resomi/head.dmi'
+		"Seromi" = 'icons/mob/species/seromi/head.dmi'
 		)
 
 /obj/item/clothing/head/attack_self(mob/user)
@@ -393,7 +393,7 @@ BLIND     // can't see anything
 	body_parts_covered = FACE|EYES
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/masks.dmi',
-		"Resomi" = 'icons/mob/species/resomi/masks.dmi',
+		"Seromi" = 'icons/mob/species/seromi/masks.dmi',
 		)
 
 	var/voicechange = 0
@@ -426,10 +426,10 @@ BLIND     // can't see anything
 	slowdown = SHOES_SLOWDOWN
 	force = 2
 	var/overshoes = 0
-	species_restricted = list("exclude","Unathi","Tajara","Vox")
+	species_restricted = list("exclude","Seromi", "Unathi","Tajara","Vox")
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/shoes.dmi',
-		"Resomi" = 'icons/mob/species/resomi/shoes.dmi',
+		"Seromi" = 'icons/mob/species/seromi/shoes.dmi',
 		)
 
 /obj/item/clothing/shoes/proc/draw_knife()
@@ -504,7 +504,7 @@ BLIND     // can't see anything
 
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/suit.dmi',
-		"Resomi" = 'icons/mob/species/resomi/suit.dmi'
+		"Seromi" = 'icons/mob/species/seromi/suit.dmi'
 		)
 
 /obj/item/clothing/suit/update_clothing_icon()
@@ -540,7 +540,7 @@ BLIND     // can't see anything
 	var/rolled_down = -1 //0 = unrolled, 1 = rolled, -1 = cannot be toggled
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/uniform.dmi',
-		"Resomi" = 'icons/mob/species/resomi/uniform.dmi'
+		"Seromi" = 'icons/mob/species/seromi/uniform.dmi'
 		)
 
 	//convenience var for defining the icon state for the overlay used when the clothing is worn.
diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm
index 35c48d58e73..5aa2d6d1fff 100644
--- a/code/modules/clothing/head/collectable.dm
+++ b/code/modules/clothing/head/collectable.dm
@@ -11,7 +11,7 @@
 	icon_state = "petehat"
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/head.dmi',
-		"Resomi" = 'icons/mob/species/resomi/head.dmi'
+		"Seromi" = 'icons/mob/species/seromi/head.dmi'
 		)
 
 /obj/item/clothing/head/collectable/slime
diff --git a/code/modules/clothing/under/xenos/resomi.dm b/code/modules/clothing/under/xenos/resomi.dm
deleted file mode 100644
index 21c89ae1290..00000000000
--- a/code/modules/clothing/under/xenos/resomi.dm
+++ /dev/null
@@ -1,32 +0,0 @@
-/obj/item/clothing/under/resomi
-	name = "small grey smock"
-	desc = "It looks fitted to nonhuman proportions."
-	icon = 'icons/obj/clothing/species/resomi/uniform.dmi'
-	icon_state = "resomi_grey"
-	worn_state = "resomi_grey"
-	species_restricted = list("Resomi")
-
-/obj/item/clothing/under/resomi/white
-	name = "small white smock"
-	icon_state = "resomi_white"
-	worn_state = "resomi_white"
-
-/obj/item/clothing/under/resomi/red
-	name = "small Security smock"
-	icon_state = "resomi_red"
-	worn_state = "resomi_red"
-
-/obj/item/clothing/under/resomi/yellow
-	name = "small Engineering smock"
-	icon_state = "resomi_yellow"
-	worn_state = "resomi_yellow"
-
-/obj/item/clothing/under/resomi/medical
-	name = "small Medical uniform"
-	icon_state = "resomi_medical"
-	worn_state = "resomi_medical"
-
-/obj/item/clothing/under/resomi/rainbow
-	name = "small rainbow smock"
-	icon_state = "resomi_rainbow"
-	worn_state = "resomi_rainbow"
\ No newline at end of file
diff --git a/code/modules/clothing/under/xenos/seromi.dm b/code/modules/clothing/under/xenos/seromi.dm
new file mode 100644
index 00000000000..537534af6b9
--- /dev/null
+++ b/code/modules/clothing/under/xenos/seromi.dm
@@ -0,0 +1,32 @@
+/obj/item/clothing/under/seromi
+	name = "small grey smock"
+	desc = "It looks fitted to nonhuman proportions."
+	icon = 'icons/obj/clothing/species/seromi/uniform.dmi'
+	icon_state = "seromi_grey"
+	worn_state = "seromi_grey"
+	species_restricted = list("Seromi")
+
+/obj/item/clothing/under/seromi/white
+	name = "small white smock"
+	icon_state = "seromi_white"
+	worn_state = "seromi_white"
+
+/obj/item/clothing/under/seromi/red
+	name = "small Security smock"
+	icon_state = "seromi_red"
+	worn_state = "seromi_red"
+
+/obj/item/clothing/under/seromi/yellow
+	name = "small Engineering smock"
+	icon_state = "seromi_yellow"
+	worn_state = "seromi_yellow"
+
+/obj/item/clothing/under/seromi/medical
+	name = "small Medical uniform"
+	icon_state = "seromi_medical"
+	worn_state = "Seromi_medical"
+
+/obj/item/clothing/under/seromi/rainbow
+	name = "small rainbow smock"
+	icon_state = "seromi_rainbow"
+	worn_state = "seromi_rainbow"
\ No newline at end of file
diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm
index 5fe460795dd..9ee2f838790 100644
--- a/code/modules/mob/holder.dm
+++ b/code/modules/mob/holder.dm
@@ -10,7 +10,7 @@ var/list/holder_mob_icon_cache = list()
 
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/head.dmi',
-		"Resomi" = 'icons/mob/species/resomi/head.dmi'
+		"Seromi" = 'icons/mob/species/seromi/head.dmi'
 		)
 
 	origin_tech = null
diff --git a/code/modules/mob/language/station.dm b/code/modules/mob/language/station.dm
index 5a5377ae6a1..d28cd987c05 100644
--- a/code/modules/mob/language/station.dm
+++ b/code/modules/mob/language/station.dm
@@ -115,9 +115,9 @@
 	else
 		return pick(ai_names)
 
-/datum/language/resomi
-	name = "Resomi"
-	desc = "A trilling language spoken by the diminutive Resomi."
+/datum/language/seromi
+	name = "Schechi"
+	desc = "A trilling language spoken by the diminutive Seromi."
 	speech_verb = "chirps"
 	ask_verb = "chirrups"
 	exclaim_verb = "trills"
@@ -131,7 +131,7 @@
 			"ci", "ri", "mi", "si", "ni", "ti", "li", "shi", "schi", "i", "i"
 		)
 
-/datum/language/resomi/get_random_name(gender)
+/datum/language/seromi/get_random_name(gender)
 	return ..(gender, 1, 4, 1.5)
 
 //Syllable Lists
diff --git a/code/modules/mob/living/carbon/human/species/station/resomi.dm b/code/modules/mob/living/carbon/human/species/station/seromi.dm
similarity index 69%
rename from code/modules/mob/living/carbon/human/species/station/resomi.dm
rename to code/modules/mob/living/carbon/human/species/station/seromi.dm
index be671365d4c..92743d2ae59 100644
--- a/code/modules/mob/living/carbon/human/species/station/resomi.dm
+++ b/code/modules/mob/living/carbon/human/species/station/seromi.dm
@@ -1,26 +1,26 @@
-/datum/species/resomi
-	name = "Resomi"
-	name_plural = "Resomii"
-	blurb = "A race of feathered raptors who developed on a cold world, almost \
-	outside of the Goldilocks zone. Extremely fragile, they developed hunting skills \
-	that emphasized taking out their prey without themselves getting hit. They are an \
-	advanced post-scarcity culture on good terms with Skrellian and Human interests."
+/datum/species/seromi
+	name = "Seromi"
+	name_plural = "Seromii"
+	blurb = "A race of feathered raptors who developed alongside the Skrell, inhabiting \
+	the polar tundral regions outside of Skrell territory. Extremely fragile, they developed \
+	hunting skills that emphasized taking out their prey without themselves getting hit. They \
+	are only recently becoming known in human space after reaching space with Skrell assistance."
 
 	num_alternate_languages = 2
-	secondary_langs = list("Resomi")
-	name_language = "Resomi"
+	secondary_langs = list("Schechi")
+	name_language = "Schechi"
 
 	blood_color = "#D514F7"
 	flesh_color = "#5F7BB0"
 	base_color = "#001144"
-	tail = "resomitail"
+	tail = "seromitail"
 	tail_hair = "feathers"
 
-	icobase = 'icons/mob/human_races/r_resomi.dmi'
-	deform = 'icons/mob/human_races/r_resomi.dmi'
-	damage_overlays = 'icons/mob/human_races/masks/dam_resomi.dmi'
-	damage_mask = 'icons/mob/human_races/masks/dam_mask_resomi.dmi'
-	blood_mask = 'icons/mob/human_races/masks/blood_resomi.dmi'
+	icobase = 'icons/mob/human_races/r_seromi.dmi'
+	deform = 'icons/mob/human_races/r_seromi.dmi'
+	damage_overlays = 'icons/mob/human_races/masks/dam_seromi.dmi'
+	damage_mask = 'icons/mob/human_races/masks/dam_mask_seromi.dmi'
+	blood_mask = 'icons/mob/human_races/masks/blood_seromi.dmi'
 
 	slowdown = -1
 	total_health = 50
@@ -53,15 +53,15 @@
 	has_limbs = list(
 		BP_CHEST =  list("path" = /obj/item/organ/external/chest),
 		BP_GROIN =  list("path" = /obj/item/organ/external/groin),
-		BP_HEAD =   list("path" = /obj/item/organ/external/head/resomi),
+		BP_HEAD =   list("path" = /obj/item/organ/external/head/seromi),
 		BP_L_ARM =  list("path" = /obj/item/organ/external/arm),
 		BP_R_ARM =  list("path" = /obj/item/organ/external/arm/right),
 		BP_L_LEG =  list("path" = /obj/item/organ/external/leg),
 		BP_R_LEG =  list("path" = /obj/item/organ/external/leg/right),
-		BP_L_HAND = list("path" = /obj/item/organ/external/hand/resomi),
-		BP_R_HAND = list("path" = /obj/item/organ/external/hand/right/resomi),
-		BP_L_FOOT = list("path" = /obj/item/organ/external/foot/resomi),
-		BP_R_FOOT = list("path" = /obj/item/organ/external/foot/right/resomi)
+		BP_L_HAND = list("path" = /obj/item/organ/external/hand/seromi),
+		BP_R_HAND = list("path" = /obj/item/organ/external/hand/right/seromi),
+		BP_L_FOOT = list("path" = /obj/item/organ/external/foot/seromi),
+		BP_R_FOOT = list("path" = /obj/item/organ/external/foot/right/seromi)
 		)
 
 	has_organ = list(
@@ -83,7 +83,7 @@
 	var/hallucination_cap = 25
 
 // I'm... so... ronrery, so ronery...
-/datum/species/resomi/handle_environment_special(var/mob/living/carbon/human/H)
+/datum/species/seromi/handle_environment_special(var/mob/living/carbon/human/H)
 
 	// If they're dead or unconcious they're a bit beyond this kind of thing.
 	if(H.stat)
@@ -106,7 +106,7 @@
 	if(H.shock_stage >= shock_cap && H.hallucination < hallucination_cap)
 		H.hallucination += 2.5
 
-/datum/species/resomi/get_vision_flags(var/mob/living/carbon/human/H)
+/datum/species/seromi/get_vision_flags(var/mob/living/carbon/human/H)
 	if(!(H.sdisabilities & DEAF) && !H.ear_deaf)
 		return SEE_SELF|SEE_MOBS
 	else
diff --git a/code/modules/mob/living/simple_animal/friendly/mushroom.dm b/code/modules/mob/living/simple_animal/friendly/mushroom.dm
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm
index 02c467e92e1..bcc0edbac45 100644
--- a/code/modules/mob/new_player/sprite_accessories.dm
+++ b/code/modules/mob/new_player/sprite_accessories.dm
@@ -61,20 +61,20 @@
 		name = "Short Hair 2"
 		icon_state = "hair_shorthair3"
 
-	resomi
-		name = "Resomi Plumage"
-		icon_state = "resomi_default"
-		species_allowed = list("Resomi")
+	Seromi
+		name = "Seromi Plumage"
+		icon_state = "seromi_default"
+		species_allowed = list("Seromi")
 
-	resomi_ears
-		name = "Resomi Ears"
-		icon_state = "resomi_ears"
-		species_allowed = list("Resomi")
+	Seromi_ears
+		name = "Seromi Ears"
+		icon_state = "seromi_ears"
+		species_allowed = list("Seromi")
 
-	resomi_excited
-		name = "Resomi Spiky"
-		icon_state = "resomi_spiky"
-		species_allowed = list("Resomi")
+	Seromi_excited
+		name = "Seromi Spiky"
+		icon_state = "seromi_spiky"
+		species_allowed = list("Seromi")
 
 	cut
 		name = "Cut Hair"
diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm
index a8d61416300..4467ae3d843 100644
--- a/code/modules/organs/organ_external.dm
+++ b/code/modules/organs/organ_external.dm
@@ -1333,8 +1333,8 @@ Note that amputating the affected organ does in fact remove the infection from t
 /obj/item/organ/external/head/skrell
 	eye_icon = "skrell_eyes_s"
 
-/obj/item/organ/external/head/resomi
-	eye_icon = "eyes_resomi"
+/obj/item/organ/external/head/seromi
+	eye_icon = "eyes_seromi"
 
 /obj/item/organ/external/head/vox
 	eye_icon = "vox_eyes_s"
diff --git a/code/modules/organs/robolimbs.dm b/code/modules/organs/robolimbs.dm
index 8ebe9e4227a..a919192d3e0 100644
--- a/code/modules/organs/robolimbs.dm
+++ b/code/modules/organs/robolimbs.dm
@@ -15,7 +15,7 @@ var/datum/robolimb/basic_robolimb
 	var/desc = "A generic unbranded robotic prosthesis." // Seen when examining a limb.
 	var/icon = 'icons/mob/human_races/robotic.dmi'       // Icon base to draw from.
 	var/unavailable_at_chargen                           // If set, not available at chargen.
-	var/list/species_cannot_use = list("Resomi")
+	var/list/species_cannot_use = list("Seromi")
 
 /datum/robolimb/bishop
 	company = "Bishop"
diff --git a/code/modules/organs/subtypes/resomi.dm b/code/modules/organs/subtypes/resomi.dm
deleted file mode 100644
index f96cf75f03e..00000000000
--- a/code/modules/organs/subtypes/resomi.dm
+++ /dev/null
@@ -1,8 +0,0 @@
-/obj/item/organ/external/foot/resomi
-	body_hair = "feathers"
-/obj/item/organ/external/foot/right/resomi
-	body_hair = "feathers"
-/obj/item/organ/external/hand/resomi
-	body_hair = "feathers"
-/obj/item/organ/external/hand/right/resomi
-	body_hair = "feathers"
diff --git a/code/modules/organs/subtypes/seromi.dm b/code/modules/organs/subtypes/seromi.dm
new file mode 100644
index 00000000000..0b11c2a4ba1
--- /dev/null
+++ b/code/modules/organs/subtypes/seromi.dm
@@ -0,0 +1,8 @@
+/obj/item/organ/external/foot/seromi
+	body_hair = "feathers"
+/obj/item/organ/external/foot/right/seromi
+	body_hair = "feathers"
+/obj/item/organ/external/hand/seromi
+	body_hair = "feathers"
+/obj/item/organ/external/hand/right/seromi
+	body_hair = "feathers"
diff --git a/icons/effects/species.dmi b/icons/effects/species.dmi
index 8c231b9b68a..9063000442c 100644
Binary files a/icons/effects/species.dmi and b/icons/effects/species.dmi differ
diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi
index ac9c437e9ca..67cb238905c 100644
Binary files a/icons/mob/human_face.dmi and b/icons/mob/human_face.dmi differ
diff --git a/icons/mob/human_races/masks/blood_resomi.dmi b/icons/mob/human_races/masks/blood_seromi.dmi
similarity index 100%
rename from icons/mob/human_races/masks/blood_resomi.dmi
rename to icons/mob/human_races/masks/blood_seromi.dmi
diff --git a/icons/mob/human_races/masks/dam_mask_resomi.dmi b/icons/mob/human_races/masks/dam_mask_seromi.dmi
similarity index 100%
rename from icons/mob/human_races/masks/dam_mask_resomi.dmi
rename to icons/mob/human_races/masks/dam_mask_seromi.dmi
diff --git a/icons/mob/human_races/masks/dam_resomi.dmi b/icons/mob/human_races/masks/dam_seromi.dmi
similarity index 100%
rename from icons/mob/human_races/masks/dam_resomi.dmi
rename to icons/mob/human_races/masks/dam_seromi.dmi
diff --git a/icons/mob/human_races/r_resomi.dmi b/icons/mob/human_races/r_seromi.dmi
similarity index 100%
rename from icons/mob/human_races/r_resomi.dmi
rename to icons/mob/human_races/r_seromi.dmi
diff --git a/icons/mob/species/resomi/head.dmi b/icons/mob/species/resomi/head.dmi
deleted file mode 100644
index 54ebad32d40..00000000000
Binary files a/icons/mob/species/resomi/head.dmi and /dev/null differ
diff --git a/icons/mob/species/resomi/suit.dmi b/icons/mob/species/resomi/suit.dmi
deleted file mode 100644
index 2f1ff6cb718..00000000000
Binary files a/icons/mob/species/resomi/suit.dmi and /dev/null differ
diff --git a/icons/mob/species/resomi/back.dmi b/icons/mob/species/seromi/back.dmi
similarity index 100%
rename from icons/mob/species/resomi/back.dmi
rename to icons/mob/species/seromi/back.dmi
diff --git a/icons/mob/species/resomi/belt.dmi b/icons/mob/species/seromi/belt.dmi
similarity index 100%
rename from icons/mob/species/resomi/belt.dmi
rename to icons/mob/species/seromi/belt.dmi
diff --git a/icons/mob/species/resomi/ears.dmi b/icons/mob/species/seromi/ears.dmi
similarity index 100%
rename from icons/mob/species/resomi/ears.dmi
rename to icons/mob/species/seromi/ears.dmi
diff --git a/icons/mob/species/resomi/eyes.dmi b/icons/mob/species/seromi/eyes.dmi
similarity index 100%
rename from icons/mob/species/resomi/eyes.dmi
rename to icons/mob/species/seromi/eyes.dmi
diff --git a/icons/mob/species/resomi/gloves.dmi b/icons/mob/species/seromi/gloves.dmi
similarity index 100%
rename from icons/mob/species/resomi/gloves.dmi
rename to icons/mob/species/seromi/gloves.dmi
diff --git a/icons/mob/species/resomi/handcuffs.dmi b/icons/mob/species/seromi/handcuffs.dmi
similarity index 100%
rename from icons/mob/species/resomi/handcuffs.dmi
rename to icons/mob/species/seromi/handcuffs.dmi
diff --git a/icons/mob/species/seromi/head.dmi b/icons/mob/species/seromi/head.dmi
new file mode 100644
index 00000000000..d12b0df3963
Binary files /dev/null and b/icons/mob/species/seromi/head.dmi differ
diff --git a/icons/mob/species/resomi/id.dmi b/icons/mob/species/seromi/id.dmi
similarity index 100%
rename from icons/mob/species/resomi/id.dmi
rename to icons/mob/species/seromi/id.dmi
diff --git a/icons/mob/species/resomi/masks.dmi b/icons/mob/species/seromi/masks.dmi
similarity index 100%
rename from icons/mob/species/resomi/masks.dmi
rename to icons/mob/species/seromi/masks.dmi
diff --git a/icons/mob/species/resomi/shoes.dmi b/icons/mob/species/seromi/shoes.dmi
similarity index 100%
rename from icons/mob/species/resomi/shoes.dmi
rename to icons/mob/species/seromi/shoes.dmi
diff --git a/icons/mob/species/seromi/suit.dmi b/icons/mob/species/seromi/suit.dmi
new file mode 100644
index 00000000000..84d18ade1af
Binary files /dev/null and b/icons/mob/species/seromi/suit.dmi differ
diff --git a/icons/mob/species/resomi/uniform.dmi b/icons/mob/species/seromi/uniform.dmi
similarity index 96%
rename from icons/mob/species/resomi/uniform.dmi
rename to icons/mob/species/seromi/uniform.dmi
index b60322d498f..86cea78d38a 100644
Binary files a/icons/mob/species/resomi/uniform.dmi and b/icons/mob/species/seromi/uniform.dmi differ
diff --git a/icons/obj/clothing/species/resomi/uniform.dmi b/icons/obj/clothing/species/seromi/uniform.dmi
similarity index 86%
rename from icons/obj/clothing/species/resomi/uniform.dmi
rename to icons/obj/clothing/species/seromi/uniform.dmi
index 817b3863cf0..dbb76626e0d 100644
Binary files a/icons/obj/clothing/species/resomi/uniform.dmi and b/icons/obj/clothing/species/seromi/uniform.dmi differ
diff --git a/polaris.dme b/polaris.dme
index fc21c5ea996..378700623c9 100644
--- a/polaris.dme
+++ b/polaris.dme
@@ -1107,7 +1107,7 @@
 #include "code\modules\clothing\under\jobs\engineering.dm"
 #include "code\modules\clothing\under\jobs\medsci.dm"
 #include "code\modules\clothing\under\jobs\security.dm"
-#include "code\modules\clothing\under\xenos\resomi.dm"
+#include "code\modules\clothing\under\xenos\seromi.dm"
 #include "code\modules\customitems\item_spawning.dm"
 #include "code\modules\detectivework\footprints.dm"
 #include "code\modules\detectivework\forensics.dm"
@@ -1379,7 +1379,7 @@
 #include "code\modules\mob\living\carbon\human\species\outsider\vox.dm"
 #include "code\modules\mob\living\carbon\human\species\station\golem.dm"
 #include "code\modules\mob\living\carbon\human\species\station\monkey.dm"
-#include "code\modules\mob\living\carbon\human\species\station\resomi.dm"
+#include "code\modules\mob\living\carbon\human\species\station\seromi.dm"
 #include "code\modules\mob\living\carbon\human\species\station\slime.dm"
 #include "code\modules\mob\living\carbon\human\species\station\station.dm"
 #include "code\modules\mob\living\carbon\human\species\xenomorphs\alien_embryo.dm"
@@ -1470,6 +1470,7 @@
 #include "code\modules\mob\living\simple_animal\friendly\farm_animals.dm"
 #include "code\modules\mob\living\simple_animal\friendly\lizard.dm"
 #include "code\modules\mob\living\simple_animal\friendly\mouse.dm"
+#include "code\modules\mob\living\simple_animal\friendly\mushroom.dm"
 #include "code\modules\mob\living\simple_animal\friendly\slime.dm"
 #include "code\modules\mob\living\simple_animal\friendly\spiderbot.dm"
 #include "code\modules\mob\living\simple_animal\friendly\tomato.dm"
@@ -1544,7 +1545,7 @@
 #include "code\modules\organs\wound.dm"
 #include "code\modules\organs\subtypes\diona.dm"
 #include "code\modules\organs\subtypes\machine.dm"
-#include "code\modules\organs\subtypes\resomi.dm"
+#include "code\modules\organs\subtypes\seromi.dm"
 #include "code\modules\organs\subtypes\standard.dm"
 #include "code\modules\organs\subtypes\unbreakable.dm"
 #include "code\modules\organs\subtypes\xenos.dm"