Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

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

@@ -209,7 +209,7 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
 					continue
 				for(var/datum/wound/W in temp.wounds) if(W.bleeding())
 					blood_max += W.damage / 4
-				if(temp.status & ORGAN_DESTROYED && !(temp.status & ORGAN_GAUZED))
+				if(temp.status & ORGAN_DESTROYED && !(temp.status & ORGAN_GAUZED) && !temp.amputated)
 					blood_max += 20 //Yer missing a fucking limb.
 			drip(blood_max)
 

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

@@ -9,6 +9,7 @@
 	speak_emote = list("squeeks","squeeks","squiks")
 	emote_hear = list("squeeks","squeaks","squiks")
 	emote_see = list("runs in a circle", "shakes", "scritches at something")
+	pass_flags = PASSTABLE
 	speak_chance = 1
 	turns_per_move = 5
 	see_in_dark = 6