Merge remote-tracking branch 'upstream/master' into TGUI-3.0

code/modules/mob/living/carbon/human/species_types/dwarves.dm

@@ -33,7 +33,7 @@ GLOBAL_LIST_INIT(dwarf_last, world.file2list("strings/names/dwarf_last.txt")) //
 	var/mob/living/carbon/human/H = C
 	H.facial_hair_style = dwarf_hair
 	H.update_hair()
-	AddElement(/datum/element/dwarfism, COMSIG_SPECIES_LOSS, src)
+	H.AddElement(/datum/element/dwarfism, COMSIG_SPECIES_LOSS, src)
 	RegisterSignal(C, COMSIG_MOB_SAY, .proc/handle_speech) //We register handle_speech is being used.
 
 /datum/species/dwarf/on_species_loss(mob/living/carbon/H, datum/species/new_species)

code/modules/mob/living/simple_animal/slime/life.dm

@@ -264,7 +264,7 @@
 	. = ..()
 	if(!slime_check)
 		return
-	if(nutrition == max)
+	if(nutrition >= get_grow_nutrition())
 		if(powerlevel<10)
 			if(prob(30-powerlevel*2))
 				powerlevel++