Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync

# Conflicts:
#	code/modules/integrated_electronics/subtypes/reagents.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/organs/organ_external.dm
#	code/modules/ventcrawl/ventcrawl.dm
#	html/changelogs/.all_changelog.yml

code/modules/organs/internal/brain.dm

@@ -35,7 +35,7 @@
 	if (. >= 2)
 		if(prob(1))
 			owner.custom_pain("Your feel very dizzy for a moment!",0)
-			owner.confused = max(owner.confused, 2)
+			owner.Confuse(2)
 
 /obj/item/organ/internal/brain/proc/replace_self_with(replace_path)
 	var/mob/living/carbon/human/tmp_owner = owner

code/modules/organs/internal/eyes.dm

@@ -72,7 +72,7 @@
 	if(is_bruised())
 		owner.eye_blurry = 20
 	if(is_broken())
-		owner.eye_blind = 20
+		owner.Blind(20)
 
 /obj/item/organ/internal/eyes/handle_germ_effects()
 	. = ..() //Up should return an infection level as an integer

code/modules/organs/internal/liver.dm

@@ -53,6 +53,6 @@
 		if(prob(1))
 			owner.custom_pain("There's a sharp pain in your upper-right abdomen!",1)
 	if (. >= 2)
-		if(prob(1) && owner.getToxLoss() < owner.maxHealth*0.3)
+		if(prob(1) && owner.getToxLoss() < owner.getMaxHealth()*0.3)
 			//owner << "" //Toxins provide their own messages for pain
 			owner.adjustToxLoss(5) //Not realistic to PA but there are basically no 'real' liver infections

code/modules/organs/organ_external.dm

@@ -492,7 +492,7 @@ This function completely restores a damaged organ to perfect condition.
 
 //Burn damage can cause fluid loss due to blistering and cook-off
 	if((damage > 5 || damage + burn_dam >= 15) && type == BURN && (robotic < ORGAN_ROBOT) && !istype(owner.loc,/mob/living) && !istype(owner.loc,/obj/item/device/dogborg/sleeper)) // VOREStation Edit
-		var/fluid_loss = 0.75 * (damage/(owner.maxHealth - config.health_threshold_dead)) * owner.species.blood_volume*(1 - BLOOD_VOLUME_SURVIVE/100)
+		var/fluid_loss = 0.75 * (damage/(owner.getMaxHealth() - config.health_threshold_dead)) * owner.species.blood_volume*(1 - BLOOD_VOLUME_SURVIVE/100)
 		owner.remove_blood(fluid_loss)
 
 	// first check whether we can widen an existing wound

code/modules/organs/organ_internal.dm

@@ -165,7 +165,7 @@
 	if(is_bruised())
 		owner.eye_blurry = 20
 	if(is_broken())
-		owner.eye_blind = 20
+		owner.Blind(20)
 
 /obj/item/organ/internal/liver
 	name = "liver"

code/modules/organs/subtypes/unathi.dm

@@ -0,0 +1,50 @@
+/obj/item/organ/external/chest/unathi
+	max_damage = 100
+	min_broken_damage = 40
+	encased = "upper ribplates"
+
+/obj/item/organ/external/groin/unathi
+	max_damage = 100
+	min_broken_damage = 40
+	encased = "lower ribplates"
+
+/obj/item/organ/external/head/unathi
+	max_damage = 75
+	min_broken_damage = 35
+	eye_icon = "eyes_s"
+	force = 5
+	throwforce = 10
+
+
+/obj/item/organ/internal/heart/unathi
+	icon_state = "unathi_heart-on"
+	dead_icon = "unath_heart-off"
+
+/obj/item/organ/internal/lungs/unathi
+	color = "#b3cbc3"
+
+/obj/item/organ/internal/liver/unathi
+	name = "filtration organ"
+	icon_state = "unathi_liver"
+
+//Unathi liver acts as kidneys, too.
+/obj/item/organ/internal/liver/unathi/process()
+	..()
+	if(!owner) return
+
+	var/datum/reagent/coffee = locate(/datum/reagent/drink/coffee) in owner.reagents.reagent_list
+	if(coffee)
+		if(is_bruised())
+			owner.adjustToxLoss(0.1 * PROCESS_ACCURACY)
+		else if(is_broken())
+			owner.adjustToxLoss(0.3 * PROCESS_ACCURACY)
+
+	var/datum/reagent/sugar = locate(/datum/reagent/sugar) in owner.reagents.reagent_list
+	if(sugar)
+		if(is_bruised())
+			owner.adjustToxLoss(0.1 * PROCESS_ACCURACY)
+		else if(is_broken())
+			owner.adjustToxLoss(0.3 * PROCESS_ACCURACY)
+
+/obj/item/organ/internal/brain/unathi
+	color = "#b3cbc3"