diff --git a/code/modules/mob/living/carbon/human/species/station/station.dm b/code/modules/mob/living/carbon/human/species/station/station.dm
index 7ac069fec7e..b32d59e05a0 100644
--- a/code/modules/mob/living/carbon/human/species/station/station.dm
+++ b/code/modules/mob/living/carbon/human/species/station/station.dm
@@ -135,7 +135,7 @@
 		O_LUNGS =    /obj/item/organ/internal/lungs/unathi,
 		O_LIVER =    /obj/item/organ/internal/liver/unathi,
 		O_BRAIN =    /obj/item/organ/internal/brain/unathi,
-		O_EYES =     /obj/item/organ/internal/eyes,
+		O_EYES =     /obj/item/organ/internal/eyes/unathi,
 		O_STOMACH =		/obj/item/organ/internal/stomach/unathi,
 		O_INTESTINE =	/obj/item/organ/internal/intestine/unathi
 		)
@@ -250,13 +250,13 @@
 
 	has_organ = list(    //No appendix.
 		O_HEART =    /obj/item/organ/internal/heart/tajaran,
-		O_LUNGS =    /obj/item/organ/internal/lungs,
+		O_LUNGS =    /obj/item/organ/internal/lungs/tajaran,
 		O_VOICE = 		/obj/item/organ/internal/voicebox,
-		O_LIVER =    /obj/item/organ/internal/liver,
+		O_LIVER =    /obj/item/organ/internal/liver/tajaran,
 		O_KIDNEYS =  /obj/item/organ/internal/kidneys,
 		O_BRAIN =    /obj/item/organ/internal/brain,
 		O_EYES =     /obj/item/organ/internal/eyes/tajaran,
-		O_STOMACH =		/obj/item/organ/internal/stomach,
+		O_STOMACH =		/obj/item/organ/internal/stomach/tajaran,
 		O_INTESTINE =	/obj/item/organ/internal/intestine
 		)
 
@@ -356,6 +356,23 @@
 		BP_R_FOOT = list("path" = /obj/item/organ/external/foot/right)
 		)
 
+	has_organ = list(
+		O_HEART =		/obj/item/organ/internal/heart/skrell,
+		O_LUNGS =		/obj/item/organ/internal/lungs/skrell,
+		O_VOICE = 		/obj/item/organ/internal/voicebox/skrell,
+		O_LIVER =		/obj/item/organ/internal/liver/skrell,
+		O_KIDNEYS =		/obj/item/organ/internal/kidneys/skrell,
+		O_BRAIN =		/obj/item/organ/internal/brain/skrell,
+		O_APPENDIX = 	/obj/item/organ/internal/appendix/skrell,
+		O_SPLEEN = 		/obj/item/organ/internal/spleen/skrell,
+		O_EYES =		/obj/item/organ/internal/eyes/skrell,
+		O_STOMACH =		/obj/item/organ/internal/stomach/skrell,
+		O_INTESTINE =	/obj/item/organ/internal/intestine/skrell
+		)
+
+/datum/species/skrell/can_breathe_water()
+	return TRUE
+
 /datum/species/zaddat
 	name = SPECIES_ZADDAT
 	name_plural = "Zaddat"
diff --git a/code/modules/organs/internal/appendix.dm b/code/modules/organs/internal/appendix.dm
index 1166e3d6895..e0e4e22a726 100644
--- a/code/modules/organs/internal/appendix.dm
+++ b/code/modules/organs/internal/appendix.dm
@@ -50,6 +50,6 @@
 
 /obj/item/organ/internal/appendix/removed()
 	if(inflamed)
-		icon_state = "appendixinflamed"
+		icon_state = "[initial(icon_state)]inflamed"
 		name = "inflamed appendix"
 	..()
\ No newline at end of file
diff --git a/code/modules/organs/internal/spleen.dm b/code/modules/organs/internal/spleen.dm
index 88d42bb8bbe..db2942926b4 100644
--- a/code/modules/organs/internal/spleen.dm
+++ b/code/modules/organs/internal/spleen.dm
@@ -66,16 +66,6 @@
 		owner.adjustToxLoss(15 * spleen_efficiency)
 		Target.wounds += W
 
-/obj/item/organ/internal/spleen/skrell
-	name = "lymphatic hub"
-	icon_state = "spleen"
-	parent_organ = BP_HEAD
-	spleen_efficiency = 0.5
-
-/obj/item/organ/internal/spleen/skrell/Initialize()
-	. = ..()
-	adjust_scale(0.8,0.7)
-
 /obj/item/organ/internal/spleen/minor
 	name = "vestigial spleen"
 	parent_organ = BP_GROIN
diff --git a/code/modules/organs/subtypes/skrell.dm b/code/modules/organs/subtypes/skrell.dm
new file mode 100644
index 00000000000..3ac237c2b50
--- /dev/null
+++ b/code/modules/organs/subtypes/skrell.dm
@@ -0,0 +1,41 @@
+/obj/item/organ/internal/eyes/skrell
+	icon_state = "skrell_eyes"
+
+/obj/item/organ/internal/heart/skrell
+	icon_state = "skrell_heart-on"
+	dead_icon = "skrell_heart-off"
+
+/obj/item/organ/internal/lungs/skrell
+	icon_state = "skrell_lungs"
+
+/obj/item/organ/internal/liver/skrell
+	icon_state = "skrell_liver"
+
+/obj/item/organ/internal/brain/skrell
+	icon_state = "brain_skrell"
+
+/obj/item/organ/internal/stomach/skrell
+	icon_state = "skrell_stomach"
+
+/obj/item/organ/internal/kidneys/skrell
+	icon_state = "skrell_kidney"
+
+/obj/item/organ/internal/intestine/skrell
+	icon_state = "skrell_intestine"
+
+/obj/item/organ/internal/voicebox/skrell
+	icon_state = "skrell_larynx"
+	will_assist_languages = list(LANGUAGE_SKRELLIAN, LANGUAGE_SKRELLIANFAR)
+
+/obj/item/organ/internal/appendix/skrell
+	icon_state = "skrell_appendix"
+
+/obj/item/organ/internal/spleen/skrell
+	name = "lymphatic hub"
+	icon_state = "skrell_spleen"
+	parent_organ = BP_HEAD
+	spleen_efficiency = 0.5
+
+/obj/item/organ/internal/spleen/skrell/Initialize()
+	. = ..()
+	adjust_scale(0.8,0.7)
\ No newline at end of file
diff --git a/code/modules/organs/subtypes/tajaran.dm b/code/modules/organs/subtypes/tajaran.dm
index c46dde783b4..11447bebd29 100644
--- a/code/modules/organs/subtypes/tajaran.dm
+++ b/code/modules/organs/subtypes/tajaran.dm
@@ -5,3 +5,11 @@
 	icon_state = "tajaran_heart-on"
 	dead_icon = "tajaran_heart-off"
 
+/obj/item/organ/internal/lungs/tajaran
+	icon_state = "tajaran_lungs"
+
+/obj/item/organ/internal/liver/tajaran
+	icon_state = "tajaran_liver"
+
+/obj/item/organ/internal/stomach/tajaran
+	icon_state = "tajaran_stomach"
\ No newline at end of file
diff --git a/code/modules/organs/subtypes/unathi.dm b/code/modules/organs/subtypes/unathi.dm
index 03ff671b638..759395dc373 100644
--- a/code/modules/organs/subtypes/unathi.dm
+++ b/code/modules/organs/subtypes/unathi.dm
@@ -15,10 +15,12 @@
 	force = 5
 	throwforce = 10
 
+/obj/item/organ/internal/eyes/unathi
+	icon_state = "unathi_eyes"
 
 /obj/item/organ/internal/heart/unathi
 	icon_state = "unathi_heart-on"
-	dead_icon = "unath_heart-off"
+	dead_icon = "unathi_heart-off"
 
 /obj/item/organ/internal/lungs/unathi
 	color = "#b3cbc3"
diff --git a/icons/obj/surgery.dmi b/icons/obj/surgery.dmi
index cee44a90709..aed970c79e7 100644
Binary files a/icons/obj/surgery.dmi and b/icons/obj/surgery.dmi differ
diff --git a/vorestation.dme b/vorestation.dme
index b7edf147fdc..139bdffb9c9 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -3315,6 +3315,7 @@
 #include "code\modules\organs\subtypes\replicant.dm"
 #include "code\modules\organs\subtypes\shadekin.dm"
 #include "code\modules\organs\subtypes\shadekin_vr.dm"
+#include "code\modules\organs\subtypes\skrell.dm"
 #include "code\modules\organs\subtypes\slime.dm"
 #include "code\modules\organs\subtypes\slime_vr.dm"
 #include "code\modules\organs\subtypes\standard.dm"