diff --git a/baystation12.dme b/baystation12.dme
index dc575ec001d..b4305e085b0 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -1034,6 +1034,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\customitems\item_spawning.dm"
 #include "code\modules\detectivework\evidence.dm"
 #include "code\modules\detectivework\footprints_and_rag.dm"
diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm
index 9165e36b73a..927694ce202 100644
--- a/code/modules/client/preferences_gear.dm
+++ b/code/modules/client/preferences_gear.dm
@@ -554,8 +554,45 @@ var/global/list/gear_datums = list()
 	slot = slot_w_uniform
 	allowed_roles = list("Security Officer","Head of Security","Warden")
 
-// Attachments
+/datum/gear/resomi_grey
+	display_name = "Resomi uniform, grey"
+	path = /obj/item/clothing/under/resomi
+	cost = 1
+	slot = slot_w_uniform
 
+/datum/gear/resomi_rainbow
+	display_name = "Resomi uniform, rainbow"
+	path = /obj/item/clothing/under/resomi/rainbow
+	cost = 1
+	slot = slot_w_uniform
+
+/datum/gear/resomi_white
+	display_name = "Resomi uniform, white"
+	path = /obj/item/clothing/under/resomi/white
+	cost = 1
+	slot = slot_w_uniform
+
+/datum/gear/resomi_eng
+	display_name = "Resomi uniform, Engineering"
+	path = /obj/item/clothing/under/resomi/yellow
+	cost = 1
+	slot = slot_w_uniform
+	allowed_roles = list("Chief Engineer","Station Engineer","Atmospherics Technician")
+
+/datum/gear/resomi_sec
+	display_name = "Resomi uniform, Security"
+	path = /obj/item/clothing/under/resomi/red
+	cost = 1
+	slot = slot_w_uniform
+	allowed_roles = list("Security Officer","Head of Security","Warden")
+
+/datum/gear/resomi_med
+	display_name = "Resomi uniform, Medical"
+	path = /obj/item/clothing/under/resomi/medical
+	cost = 1
+	slot = slot_w_uniform
+
+// Attachments
 /datum/gear/armband_cargo
 	display_name = "armband, cargo"
 	path = /obj/item/clothing/accessory/armband/cargo
diff --git a/code/modules/clothing/under/xenos/resomi.dm b/code/modules/clothing/under/xenos/resomi.dm
new file mode 100644
index 00000000000..21c89ae1290
--- /dev/null
+++ b/code/modules/clothing/under/xenos/resomi.dm
@@ -0,0 +1,32 @@
+/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/mob/language/station.dm b/code/modules/mob/language/station.dm
index cc477f0ee7d..5499283a2bc 100644
--- a/code/modules/mob/language/station.dm
+++ b/code/modules/mob/language/station.dm
@@ -114,6 +114,17 @@
 		new_name = pick(ai_names)
 	return new_name
 
+/datum/language/resomi
+	name = "Resomi"
+	desc = "A trilling language spoken by the diminutive Resomi."
+	speech_verb = "chirps"
+	ask_verb = "chirrups"
+	exclaim_verb = "trills"
+	colour = "alien"
+	key = "v"
+	flags = WHITELISTED
+	syllables = list("caw","caw","caw","caw","ka")
+
 //Syllable Lists
 /*
 	This list really long, mainly because I can't make up my mind about which mandarin syllables should be removed,
diff --git a/code/modules/mob/living/carbon/human/species/station/resomi.dm b/code/modules/mob/living/carbon/human/species/station/resomi.dm
index 133edb6b734..da7d4c78d15 100644
--- a/code/modules/mob/living/carbon/human/species/station/resomi.dm
+++ b/code/modules/mob/living/carbon/human/species/station/resomi.dm
@@ -7,7 +7,7 @@
 	advanced post-scarcity culture on good terms with Skrellian and Human interests."
 
 	num_alternate_languages = 2
-	secondary_langs = list("Sol Common")
+	secondary_langs = list("Resomi")
 
 	blood_color = "#D514F7"
 	flesh_color = "#5F7BB0"
@@ -22,7 +22,7 @@
 	blood_mask = 'icons/mob/human_races/masks/blood_resomi.dmi'
 
 	eyes = "eyes_resomi"
-	slowdown = -2
+	slowdown = -1
 	total_health = 50
 	brute_mod = 1.35
 	burn_mod =  1.35
diff --git a/icons/mob/species/resomi/uniform.dmi b/icons/mob/species/resomi/uniform.dmi
index f6b23337293..b60322d498f 100644
Binary files a/icons/mob/species/resomi/uniform.dmi and b/icons/mob/species/resomi/uniform.dmi differ
diff --git a/icons/obj/clothing/species/resomi/uniform.dmi b/icons/obj/clothing/species/resomi/uniform.dmi
new file mode 100644
index 00000000000..817b3863cf0
Binary files /dev/null and b/icons/obj/clothing/species/resomi/uniform.dmi differ