Merge remote-tracking branch 'upstream/master' into universal-damage

# Conflicts:
#	code/game/machinery/machinery.dm
#	code/game/objects/items.dm
#	code/game/objects/structures.dm
#	code/game/objects/structures/inflatable.dm
#	code/game/objects/structures/mirror.dm
#	code/modules/clothing/spacesuits/hardsuit.dm
#	code/modules/clothing/suits/wiz_robe.dm
#	code/modules/mob/living/carbon/alien/alien_defense.dm
#	code/modules/mob/living/carbon/slime/slime.dm
#	code/modules/mob/living/simple_animal/friendly/slime.dm

code/modules/surgery/organs/augments_arms.dm

@@ -30,8 +30,8 @@
 		transform = matrix(-1, 0, 0, 0, 1, 0)
 
 /obj/item/organ/internal/cyberimp/arm/examine(mob/user)
-	..()
-	to_chat(user, "<span class='info'>[src] is assembled in the [parent_organ == "r_arm" ? "right" : "left"] arm configuration. You can use a screwdriver to reassemble it.</span>")
+	. = ..()
+	. += "<span class='info'>[src] is assembled in the [parent_organ == "r_arm" ? "right" : "left"] arm configuration. You can use a screwdriver to reassemble it.</span>"
 
 /obj/item/organ/internal/cyberimp/arm/attackby(obj/item/I, mob/user, params)
 	if(isscrewdriver(I))
@@ -337,11 +337,11 @@
 			break
 		A.charging = 1
 		if(A.cell.charge >= 500)
-			H.nutrition += 50
+			H.adjust_nutrition(50)
 			A.cell.charge -= 500
 			to_chat(H, "<span class='notice'>You siphon off some of the stored charge for your own use.</span>")
 		else
-			H.nutrition += A.cell.charge/10
+			H.adjust_nutrition(A.cell.charge * 0.1)
 			A.cell.charge = 0
 			to_chat(H, "<span class='notice'>You siphon off the last of \the [A]'s charge.</span>")
 			break

code/modules/surgery/organs/augments_internal.dm

@@ -229,7 +229,7 @@
 	if(owner.nutrition <= hunger_threshold)
 		synthesizing = 1
 		to_chat(owner, "<span class='notice'>You feel less hungry...</span>")
-		owner.nutrition += 50
+		owner.adjust_nutrition(50)
 		spawn(50)
 			synthesizing = 0
 

code/modules/surgery/organs/organ.dm

@@ -145,12 +145,12 @@
 	return 0
 
 /obj/item/organ/examine(mob/user)
-	..(user)
+	. = ..()
 	if(status & ORGAN_DEAD)
 		if(!is_robotic())
-			to_chat(user, "<span class='notice'>The decay has set in.</span>")
+			. += "<span class='notice'>The decay has set in.</span>"
 		else
-			to_chat(user, "<span class='notice'>It looks in need of repairs.</span>")
+			. += "<span class='notice'>It looks in need of repairs.</span>"
 
 /obj/item/organ/proc/handle_germ_effects()
 	//** Handle the effects of infections

code/modules/surgery/organs/organ_internal.dm

@@ -285,7 +285,7 @@
 /obj/item/organ/internal/honktumor/cursed/on_life() //No matter what you do, no matter who you are, no matter where you go, you're always going to be a fat, stuttering dimwit.
 	..()
 	owner.setBrainLoss(80)
-	owner.nutrition = 9000
+	owner.set_nutrition(9000)
 	owner.overeatduration = 9000
 
 

code/modules/surgery/organs/subtypes/kidan.dm

@@ -41,7 +41,7 @@
 			owner.visible_message("<span class='notice'>[owner] fades to dark.</span>")
 			return
 
-		owner.nutrition = max(owner.nutrition - KIDAN_LANTERN_HUNGERCOST, KIDAN_LANTERN_HUNGERCOST)
+		owner.set_nutrition(max(owner.nutrition - KIDAN_LANTERN_HUNGERCOST, KIDAN_LANTERN_HUNGERCOST))
 
 		var/new_light = calculate_glow(KIDAN_LANTERN_LIGHT)
 

code/modules/surgery/organs/subtypes/slime.dm

@@ -0,0 +1,11 @@
+/obj/item/organ/internal/heart/slime
+	icon = 'icons/obj/species_organs/slime.dmi'
+	name = "osmotic pressure regulator"
+	icon_state = "heart"
+	desc = "It appears to be some kind of biological pump that uses osmotic pressure to regulate water flow. It seems to work similar to a heart."
+
+/obj/item/organ/internal/lungs/slime
+	icon = 'icons/obj/species_organs/slime.dmi'    
+	name = "gas exchange membrane"
+	icon_state = "lungs"
+	desc = "Membrane used for oxygen intake and gas exchange. These seem to work similar to lungs."