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

code/game/supplyshuttle.dm

@@ -56,7 +56,7 @@ var/list/mechtoys = list(
 
 	else if(istype(A, /mob/living)) // You Shall Not Pass!
 		var/mob/living/M = A
-		if(!M.lying && !istype(M, /mob/living/carbon/monkey) && !istype(M, /mob/living/carbon/slime))	//If your not laying down, or a small creature, no pass.
+		if(!M.lying && !istype(M, /mob/living/carbon/monkey) && !istype(M, /mob/living/carbon/slime) && !istype(M, /mob/living/simple_animal/mouse))  //If your not laying down, or a small creature, no pass.
 			return 0
 	return ..()
 

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

@@ -265,13 +265,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 
 	//find a viable mouse candidate
 	var/mob/living/simple_animal/mouse/host
-	var/list/mouse_candidates = list()
-	for(var/mob/living/simple_animal/mouse/M in world)
-		if(!M.ckey && !M.stat)
-			mouse_candidates.Add(M)
-	if(mouse_candidates.len)
-		host = pick(mouse_candidates)
-	else
 	var/obj/machinery/atmospherics/unary/vent_pump/vent_found
 	var/list/found_vents = list()
 	for(var/obj/machinery/atmospherics/unary/vent_pump/v in world)
@@ -281,7 +274,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 		vent_found = pick(found_vents)
 		host = new /mob/living/simple_animal/mouse(vent_found.loc)
 	else
-			src << "<span class='warning'>Unable to find any live mice, or unwelded vents to spawn one at.</span>"
+		src << "<span class='warning'>Unable to find any unwelded vents to spawn mice at.</span>"
 
 	if(host)
 		host.ckey = src.ckey

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

@@ -18,10 +18,10 @@
 	meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
 	response_help  = "pets the"
 	response_disarm = "gently pushes aside the"
-	response_harm   = "splats the"
+	response_harm   = "stamps on the"
 	density = 0
 	var/color //brown, gray and white, leave blank for random
-	layer = 2.5		//so they can hide under objects
+	layer = MOB_LAYER
 	min_oxy = 16 //Require atleast 16kPA oxygen
 	minbodytemp = 223		//Below -50 Degrees Celcius
 	maxbodytemp = 323	//Above 50 Degrees Celcius
@@ -137,8 +137,12 @@
 			open += O
 			*/
 
-mob/living/simple_animal/mouse/restrained() //Hotfix to stop mice from doing things with MouseDrop
+///mob/living/simple_animal/mouse/restrained() //Hotfix to stop mice from doing things with MouseDrop
-	return 1
+//	return 1
+
+/mob/living/simple_animal/mouse/start_pulling(var/atom/movable/AM)//Prevents mouse from pulling things
+	src << "<span class='warning'>You are too small to pull anything.</span>"
+	return
 
 /mob/living/simple_animal/mouse/HasEntered(AM as mob|obj)
 	if( ishuman(AM) )

code/modules/reagents/reagent_containers/food/snacks.dm

@@ -196,6 +196,10 @@
 				if(sattisfaction_text)
 					M.emote("[sattisfaction_text]")
 				del(src)
+		if(ismouse(M))
+			var/mob/living/simple_animal/mouse/N = M
+			N.emote("nibbles away at the [src]")
+			N.health = min(N.health + 1, N.maxHealth)
 
 
 ////////////////////////////////////////////////////////////////////////////////