diff --git a/baystation12.dme b/baystation12.dme
index 43610980ad7..e1657ada890 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -755,6 +755,7 @@
 #include "code\modules\clothing\spacesuits\rig.dm"
 #include "code\modules\clothing\spacesuits\syndi.dm"
 #include "code\modules\clothing\spacesuits\void.dm"
+#include "code\modules\clothing\suits\alien.dm"
 #include "code\modules\clothing\suits\armor.dm"
 #include "code\modules\clothing\suits\bio.dm"
 #include "code\modules\clothing\suits\jobs.dm"
diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm
index e07e6687ac5..4c71c36f26e 100644
--- a/code/datums/datacore.dm
+++ b/code/datums/datacore.dm
@@ -118,7 +118,7 @@ proc/get_id_photo(var/mob/living/carbon/human/H)
 	switch(H.get_species())
 		if("Tajaran")
 			icobase = 'icons/mob/human_races/r_tajaran.dmi'
-		if( "Soghun")
+		if("Unathi")
 			icobase = 'icons/mob/human_races/r_lizard.dmi'
 		if("Skrell")
 			icobase = 'icons/mob/human_races/r_skrell.dmi'
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 67f32a7188c..ca49eea8ae6 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -641,7 +641,7 @@ var/list/admin_verbs_mod = list(
 	if(!istype(M, /mob/living/carbon/human))
 		usr << "\red You can only do this to humans!"
 		return
-	switch(alert("Are you sure you wish to edit this mob's appearance? Skrell, Soghun and Tajaran can result in unintended consequences.",,"Yes","No"))
+	switch(alert("Are you sure you wish to edit this mob's appearance? Skrell, Unathi and Tajaran can result in unintended consequences.",,"Yes","No"))
 		if("No")
 			return
 	var/new_facial = input("Please select facial hair color.", "Character Generation") as color
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 9955cee8092..8a21fc6b6ce 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -768,8 +768,8 @@ datum/preferences
 						var/prev_species = species
 						var/whitelisted = 0
 						if(config.usealienwhitelist) //If we're using the whitelist, make sure to check it!
-							if(is_alien_whitelisted(user, "Soghun")) //Check for Soghun and admins
-								new_species += "Soghun"
+							if(is_alien_whitelisted(user, "Soghun")) //Check for Unathi and admins
+								new_species += "Unathi"
 								whitelisted = 1
 							if(is_alien_whitelisted(user, "Tajaran")) //Check for Tajaran and admins
 								new_species += "Tajaran"
@@ -782,7 +782,7 @@ datum/preferences
 								alert(user, "You cannot change your species as you need to be whitelisted. If you wish to be whitelisted contact an admin in-game, on the forums, or on IRC.")
 						else //Not using the whitelist? Aliens for everyone!
 							new_species += "Tajaran"
-							new_species += "Soghun"
+							new_species += "Unathi"
 							new_species += "Skrell"
 						species = input("Please select a species", "Character Generation", null) in new_species
 
@@ -843,7 +843,7 @@ datum/preferences
 							b_type = new_b_type
 
 					if("hair")
-						if(species == "Human" || species == "Soghun")
+						if(species == "Human" || species == "Unathi")
 							var/new_hair = input(user, "Choose your character's hair colour:", "Character Preference") as color|null
 							if(new_hair)
 								r_hair = hex2num(copytext(new_hair, 2, 4))
diff --git a/code/modules/clothing/spacesuits/alien.dm b/code/modules/clothing/spacesuits/alien.dm
index efecebf2c6c..b9ab877f59f 100644
--- a/code/modules/clothing/spacesuits/alien.dm
+++ b/code/modules/clothing/spacesuits/alien.dm
@@ -1,19 +1,23 @@
-/obj/item/clothing/head/helmet/space/helmet_soghun_cheap
+/obj/item/clothing/head/helmet/space/unathi
+
+	var/up = 0 //So Unathi helmets play nicely with the weldervision check.
+
+/obj/item/clothing/head/helmet/space/unathi/helmet_cheap
 	name = "NT breacher helmet"
-	desc = "Hey! Watch it with that thing! It's a knock-off of a soghun battle-helm, and that spike could put someone's eye out."
-	icon_state = "sog_helm_cheap"
-	item_state = "sog_helm_cheap"
-	color = "sog_helm_cheap"
+	desc = "Hey! Watch it with that thing! It's a knock-off of a Unathi battle-helm, and that spike could put someone's eye out."
+	icon_state = "unathi_helm_cheap"
+	item_state = "unathi_helm_cheap"
+	color = "unathi_helm_cheap"
 	armor = list(melee = 40, bullet = 30, laser = 30,energy = 15, bomb = 35, bio = 100, rad = 50)
 	heat_protection = HEAD
 	max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECITON_TEMPERATURE
 
-/obj/item/clothing/suit/space/rig_soghun_cheap
+/obj/item/clothing/suit/space/unathi/rig_cheap
 	name = "NT breacher chassis"
-	desc = "A cheap NT knock-off of a soghun battle-rig. Looks like a fish, moves like a fish, steers like a cow."
-	icon_state = "rig-soghun-cheap"
-	item_state = "rig-soghun-cheap"
-	slowdown = 2
+	desc = "A cheap NT knock-off of a Unathi battle-rig. Looks like a fish, moves like a fish, steers like a cow."
+	icon_state = "rig-unathi-cheap"
+	item_state = "rig-unathi-cheap"
+	slowdown = 3
 	armor = list(melee = 40, bullet = 30, laser = 30,energy = 15, bomb = 35, bio = 100, rad = 50)
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/storage/bag/ore,/obj/item/device/t_scanner,/obj/item/weapon/pickaxe, /obj/item/weapon/rcd)
 	heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
diff --git a/code/modules/clothing/suits/alien.dm b/code/modules/clothing/suits/alien.dm
new file mode 100644
index 00000000000..5b664f21b35
--- /dev/null
+++ b/code/modules/clothing/suits/alien.dm
@@ -0,0 +1,15 @@
+//Unathi clothing.
+
+/obj/item/clothing/suit/unathi/robe
+	name = "roughspun robes"
+	desc = "A traditional Unathi garment."
+	icon_state = "robe-unathi"
+	item_state = "robe-unathi"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
+
+/obj/item/clothing/suit/unathi/mantle
+	name = "hide mantle"
+	desc = "A rather grisly selection of cured hides and skin, sewn together to form a ragged mantle."
+	icon_state = "mantle-unathi"
+	item_state = "mantle-unathi"
+	body_parts_covered = UPPER_TORSO
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 8b238f6ee91..d24f835153f 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -1402,7 +1402,7 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
 
 			var/masked = 0
 
-			if( istype(head, /obj/item/clothing/head/welding) )
+			if( istype(head, /obj/item/clothing/head/welding) || istype(head, /obj/item/clothing/head/helmet/space/unathi))
 				var/obj/item/clothing/head/welding/O = head
 				if(!O.up && tinted_weldhelh)
 					client.screen += global_hud.darkMask
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index 9cf18615f98..478416aae1c 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -789,7 +789,7 @@ proc/get_damage_icon_part(damage_state, body_part)
 		if(!wear_suit || !(wear_suit.flags_inv & HIDEJUMPSUIT) && !istype(wear_suit, /obj/item/clothing/suit/space))
 			overlays_lying[TAIL_LAYER] = image("icon" = 'icons/effects/species.dmi', "icon_state" = "tajtail_l")
 			overlays_standing[TAIL_LAYER] = image("icon" = 'icons/effects/species.dmi', "icon_state" = "tajtail_s")
-	else if( cur_species == "Soghun")
+	else if( cur_species == "Unathi")
 		if(!wear_suit || !(wear_suit.flags_inv & HIDEJUMPSUIT) && !istype(wear_suit, /obj/item/clothing/suit/space))
 			overlays_lying[TAIL_LAYER] = image("icon" = 'icons/effects/species.dmi', "icon_state" = "sogtail_l")
 			overlays_standing[TAIL_LAYER] = image("icon" = 'icons/effects/species.dmi', "icon_state" = "sogtail_s")
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index a967ed8b59a..4597b038e82 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -338,7 +338,7 @@
 			if(is_alien_whitelisted(src, "Tajaran") || !config.usealienwhitelist)
 				new_character.dna.mutantrace = "tajaran"
 				new_character.tajaran_talk_understand = 1
-		if(client.prefs.species == "Soghun")
+		if(client.prefs.species == "Unathi")
 			if(is_alien_whitelisted(src, "Soghun") || !config.usealienwhitelist)
 				new_character.dna.mutantrace = "lizard"
 				new_character.soghun_talk_understand = 1
diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm
index 2523e10ceec..b7b8c32393e 100644
--- a/code/modules/mob/new_player/preferences_setup.dm
+++ b/code/modules/mob/new_player/preferences_setup.dm
@@ -138,7 +138,7 @@ datum/preferences
 		if(species == "Tajaran")
 			preview_icon = new /icon('icons/effects/species.dmi', "tajaran_[g]_s")
 			preview_icon.Blend(new /icon('icons/effects/species.dmi', "tajtail_s"), ICON_OVERLAY)
-		else if(species == "Soghun")
+		else if(species == "Unathi")
 			preview_icon = new /icon('icons/effects/species.dmi', "lizard_[g]_s")
 			preview_icon.Blend(new /icon('icons/effects/species.dmi', "sogtail_s"), ICON_OVERLAY)
 		else if(species == "Skrell")
diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm
index 2be45074837..38d1d9cdf90 100644
--- a/code/modules/mob/new_player/sprite_accessories.dm
+++ b/code/modules/mob/new_player/sprite_accessories.dm
@@ -48,7 +48,7 @@
 		name = "Bald"
 		icon_state = "bald"
 		gender = MALE
-		species_allowed = list("Human","Soghun")
+		species_allowed = list("Human","Unathi")
 
 	short
 		name = "Short Hair"	  // try to capatilize the names please~
@@ -119,7 +119,7 @@
 		name = "Pompadour"
 		icon_state = "hair_pompadour"
 		gender = MALE
-		species_allowed = list("Human","Soghun")
+		species_allowed = list("Human","Unathi")
 
 	quiff
 		name = "Quiff"
@@ -142,19 +142,19 @@
 		name = "Beehive"
 		icon_state = "hair_beehive"
 		gender = FEMALE
-		species_allowed = list("Human","Soghun")
+		species_allowed = list("Human","Unathi")
 
 	bobcurl
 		name = "Bobcurl"
 		icon_state = "hair_bobcurl"
 		gender = FEMALE
-		species_allowed = list("Human","Soghun")
+		species_allowed = list("Human","Unathi")
 
 	bob
 		name = "Bob"
 		icon_state = "hair_bobcut"
 		gender = FEMALE
-		species_allowed = list("Human","Soghun")
+		species_allowed = list("Human","Unathi")
 
 	bowl
 		name = "Bowl"
@@ -165,7 +165,7 @@
 		name = "Buzzcut"
 		icon_state = "hair_buzzcut"
 		gender = MALE
-		species_allowed = list("Human","Soghun")
+		species_allowed = list("Human","Unathi")
 
 	crew
 		name = "Crewcut"
@@ -227,7 +227,7 @@
 	mohawk
 		name = "Mohawk"
 		icon_state = "hair_d"
-		species_allowed = list("Human","Soghun")
+		species_allowed = list("Human","Unathi")
 	jensen
 		name = "Adam Jensen Hair"
 		icon_state = "hair_jensen"
@@ -241,7 +241,7 @@
 	spiky
 		name = "Spiky"
 		icon_state = "hair_spikey"
-		species_allowed = list("Human","Soghun")
+		species_allowed = list("Human","Unathi")
 	kusangi
 		name = "Kusanagi Hair"
 		icon_state = "hair_kusanagi"
@@ -306,7 +306,7 @@
 		name = "Shaved"
 		icon_state = "bald"
 		gender = NEUTER
-		species_allowed = list("Human","Soghun","Tajaran","Skrell")
+		species_allowed = list("Human","Unathi","Tajaran","Skrell")
 
 	watson
 		name = "Watson Mustache"
@@ -347,7 +347,7 @@
 	elvis
 		name = "Elvis Sideburns"
 		icon_state = "facial_elvis"
-		species_allowed = list("Human","Soghun")
+		species_allowed = list("Human","Unathi")
 
 	abe
 		name = "Abraham Lincoln Beard"
@@ -521,11 +521,11 @@
 		icon = 'icons/mob/human_races/r_tajaran.dmi'
 		species_allowed = list("Tajaran")
 
-	soghun
-		name = "Default soghun skin"
+	unathi
+		name = "Default Unathi skin"
 		icon_state = "default"
 		icon = 'icons/mob/human_races/r_lizard.dmi'
-		species_allowed = list("Soghun")
+		species_allowed = list("Unathi")
 
 	skrell
 		name = "Default skrell skin"
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index 1f8d62db91f..4baca71637e 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index 1756e105148..e90e3b62de0 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index 6b96c548c47..0d9d08d7b00 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index b234e55c492..467c3441c63 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ