Merge branch 'master' into dynamicport

code/modules/mob/dead/observer/login.dm

@@ -16,5 +16,5 @@
 	if (isturf(T))
 		update_z(T.z)
 
-	update_icon(preferred_form)
+	update_icon(null, preferred_form)
 	updateghostimages()

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

@@ -1999,7 +1999,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 		if(CHECK_MOBILITY(target, MOBILITY_STAND))
 			target.adjustStaminaLoss(5)
 		else
-			target.adjustStaminaLoss(target.getStaminaLoss() > 75? 5 : 75)
+			target.adjustStaminaLoss(IS_STAMCRIT(target)? 2 : 10)
 
 		if(target.is_shove_knockdown_blocked())
 			return

code/modules/mob/living/living_defense.dm

@@ -118,7 +118,7 @@
 		throwpower = I.throwforce
 	var/impacting_zone = ran_zone(BODY_ZONE_CHEST, 65)//Hits a random part of the body, geared towards the chest
 	var/list/block_return = list()
-	var/total_damage = I.throwforce
+	var/total_damage = AM.throwforce
 	if(mob_run_block(AM, throwpower, "\the [AM.name]", ATTACK_TYPE_THROWN, 0, throwingdatum?.thrower, impacting_zone, block_return) & BLOCK_SUCCESS)
 		hitpush = FALSE
 		skipcatch = TRUE

code/modules/mob/living/simple_animal/friendly/mouse.dm

@@ -134,11 +134,15 @@
 	qdel(src)
 
 /mob/living/simple_animal/mouse/proc/evolve_plague()
+	return
+
+/*
 	var/mob/living/simple_animal/hostile/plaguerat = new /mob/living/simple_animal/hostile/plaguerat(loc)
 	visible_message("<span class='warning'>[src] devours the food! He rots into something worse!</span>")
 	if(mind)
 		mind.transfer_to(plaguerat)
 	qdel(src)
+*/
 
 /*
  * Mouse types