Merge branch 'master' into upstream-merge-8298

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"
 	..()

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

code/modules/organs/internal/stomach.dm

@@ -65,10 +65,11 @@
 	if(owner && owner.stat != DEAD)
 		owner.bodytemperature += round(owner.robobody_count * 0.25, 0.1)
 
+/*			//VOREStation Removal - normal chem processing
 		if(ishuman(owner))
 			var/mob/living/carbon/human/H = owner
 
 			if(H.ingested?.total_volume && H.bloodstr)
 				H.ingested.trans_to_holder(H.bloodstr, rand(2,5))
-
+*/
 	return

code/modules/organs/subtypes/nano.dm

@@ -90,8 +90,7 @@
 	parent_organ = BP_TORSO
 	vital = TRUE
 	organ_verbs = list(
-		/mob/living/carbon/human/proc/self_diagnostics,
-		/mob/living/carbon/human/proc/reagent_purge
+		/mob/living/carbon/human/proc/self_diagnostics
 	)
 
 /obj/item/organ/internal/nano/refactory
@@ -104,6 +103,9 @@
 
 	var/list/materials = list(MAT_STEEL = 0)
 	var/max_storage = 10000
+	organ_verbs = list(
+		/mob/living/carbon/human/proc/reagent_purge
+	)
 
 /obj/item/organ/internal/nano/refactory/proc/get_stored_material(var/material)
 	if(status & ORGAN_DEAD)

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)

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"

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"