diff --git a/aurorastation.dme b/aurorastation.dme
index e5d6fa4b88f..49e9b534dff 100644
--- a/aurorastation.dme
+++ b/aurorastation.dme
@@ -1785,6 +1785,7 @@
 #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\skrell.dm"
 #include "code\modules\organs\subtypes\standard.dm"
 #include "code\modules\organs\subtypes\unbreakable.dm"
 #include "code\modules\organs\subtypes\xenos.dm"
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 bff76d93d4e..f5eab61ceda 100644
--- a/code/modules/mob/living/carbon/human/species/station/station.dm
+++ b/code/modules/mob/living/carbon/human/species/station/station.dm
@@ -197,6 +197,16 @@
 	appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_SOCKS
 	flags = NO_SLIP
 
+	has_organ = list(
+		"heart" =    /obj/item/organ/heart/skrell,
+		"lungs" =    /obj/item/organ/lungs/skrell,
+		"liver" =    /obj/item/organ/liver/skrell,
+		"kidneys" =  /obj/item/organ/kidneys/skrell,
+		"brain" =    /obj/item/organ/brain/skrell,
+		"appendix" = /obj/item/organ/appendix,
+		"eyes" =     /obj/item/organ/eyes/skrell
+		)
+
 	flesh_color = "#8CD7A3"
 	blood_color = "#1D2CBF"
 	base_color = "#006666"
diff --git a/code/modules/organs/misc.dm b/code/modules/organs/misc.dm
index a330e307a38..d440495041b 100644
--- a/code/modules/organs/misc.dm
+++ b/code/modules/organs/misc.dm
@@ -45,6 +45,8 @@
 //VOX ORGANS.
 /obj/item/organ/stack
 	name = "cortical stack"
+	icon_state = "brain-prosthetic"
+	organ_tag = "stack"
 	parent_organ = "head"
 	robotic = 2
 	vital = 1
@@ -56,15 +58,5 @@
 		backup_time = world.time
 		if(owner.mind) backup = owner.mind
 
-/obj/item/organ/stack/vox
-
-/obj/item/organ/stack/vox/stack
-
-/obj/item/organ/stack
-	name = "cortical stack"
-	icon_state = "brain-prosthetic"
-	organ_tag = "stack"
-	robotic = 2
-
 /obj/item/organ/stack/vox
 	name = "vox cortical stack"
diff --git a/code/modules/organs/subtypes/skrell.dm b/code/modules/organs/subtypes/skrell.dm
new file mode 100644
index 00000000000..ef3dd8b9c81
--- /dev/null
+++ b/code/modules/organs/subtypes/skrell.dm
@@ -0,0 +1,18 @@
+/obj/item/organ/heart/skrell
+	icon_state = "skrell_heart-on"
+	dead_icon = "skrell_heart-off"
+
+/obj/item/organ/lungs/skrell
+	icon_state = "lungs_skrell"
+
+/obj/item/organ/kidneys/skrell
+	icon_state = "kidney_skrell"
+
+/obj/item/organ/eyes/skrell
+	icon_state = "eyes_skrell"
+
+/obj/item/organ/liver/skrell
+	icon_state = "liver_skrell"
+
+/obj/item/organ/brain/skrell
+	icon_state = "brain_skrell"
diff --git a/icons/obj/surgery.dmi b/icons/obj/surgery.dmi
index 202ec39bc8c..404480428b5 100644
Binary files a/icons/obj/surgery.dmi and b/icons/obj/surgery.dmi differ