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