Revert "Merge branch 'master' into Yeehaw"

This reverts commit 972c03f79f, reversing
changes made to 8ebd698763.

code/modules/mob/living/carbon/alien/larva/larva.dm

@@ -14,9 +14,10 @@
 	var/max_grown = 100
 	var/time_of_birth
 
-	rotate_on_lying = FALSE
+	rotate_on_lying = 0
 	bodyparts = list(/obj/item/bodypart/chest/larva, /obj/item/bodypart/head/larva)
 
+
 //This is fine right now, if we're adding organ specific damage this needs to be updated
 /mob/living/carbon/alien/larva/Initialize()
 

code/modules/mob/living/carbon/carbon_defines.dm

@@ -40,7 +40,7 @@
 
 	var/gib_type = /obj/effect/decal/cleanable/blood/gibs
 
-	rotate_on_lying = TRUE
+	var/rotate_on_lying = 1
 
 	var/tinttotal = 0	// Total level of visualy impairing items
 

code/modules/mob/living/carbon/emote.dm

@@ -22,7 +22,6 @@
 	muzzle_ignore = TRUE
 	restraint_check = TRUE
 	emote_type = EMOTE_AUDIBLE
-	mob_type_allowed_typecache = list(/mob/living/carbon, /mob/living/silicon/pai)
 
 /datum/emote/living/carbon/clap/run_emote(mob/living/user, params)
 	. = ..()

code/modules/mob/living/carbon/human/human_defense.dm

@@ -333,7 +333,7 @@
 	switch (severity)
 		if (1)
 			if(bomb_armor)
-				b_loss = (350*bomb_armor)+150
+				b_loss = 500*bomb_armor
 				var/atom/throw_target = get_edge_target_turf(src, get_dir(src, get_step_away(src, src)))
 				throw_at(throw_target, 200, 4)
 				damage_clothes(400*bomb_armor, BRUTE, "bomb")

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

@@ -37,16 +37,11 @@
 			H.dna.features["caps"] = "Round"
 			handle_mutant_bodyparts(H)
 		H.faction |= "mushroom"
-		mush = new()
-		mush.teach(H, TRUE)
-	RegisterSignal(C, COMSIG_MOB_ON_NEW_MIND, .proc/on_new_mind)
-
-/datum/species/mush/proc/on_new_mind(mob/owner)
-	mush.teach(owner, TRUE) //make_temporary TRUE as it shouldn't carry over to other mobs on mind transfer_to.
+		mush = new(null)
+		mush.teach(H)
 
 /datum/species/mush/on_species_loss(mob/living/carbon/C)
 	. = ..()
-	UnregisterSignal(C, COMSIG_MOB_ON_NEW_MIND)
 	C.faction -= "mushroom"
 	mush.remove(C)
 	QDEL_NULL(mush)

code/modules/mob/living/carbon/update_icons.dm

@@ -1,3 +1,31 @@
+//IMPORTANT: Multiple animate() calls do not stack well, so try to do them all at once if you can.
+/mob/living/carbon/update_transform()
+	var/matrix/ntransform = matrix(transform) //aka transform.Copy()
+	var/final_pixel_y = pixel_y
+	var/final_dir = dir
+	var/changed = 0
+	if(lying != lying_prev && rotate_on_lying)
+		changed++
+		ntransform.TurnTo(lying_prev,lying)
+		if(lying == 0) //Lying to standing
+			final_pixel_y = get_standard_pixel_y_offset()
+		else //if(lying != 0)
+			if(lying_prev == 0) //Standing to lying
+				pixel_y = get_standard_pixel_y_offset()
+				final_pixel_y = get_standard_pixel_y_offset(lying)
+				if(dir & (EAST|WEST)) //Facing east or west
+					final_dir = pick(NORTH, SOUTH) //So you fall on your side rather than your face or ass
+
+	if(resize != RESIZE_DEFAULT_SIZE)
+		changed++
+		ntransform.Scale(resize)
+		resize = RESIZE_DEFAULT_SIZE
+
+	if(changed)
+		animate(src, transform = ntransform, time = 2, pixel_y = final_pixel_y, dir = final_dir, easing = EASE_IN|EASE_OUT)
+		setMovetype(movement_type & ~FLOATING)  // If we were without gravity, the bouncing animation got stopped, so we make sure we restart it in next life().
+
+
 /mob/living/carbon
 	var/list/overlays_standing[TOTAL_LAYERS]