Adding lost pulls #590 #528 #574 #563 #529

code/modules/assembly/mousetrap.dm

@@ -60,7 +60,7 @@
 			var/mob/living/simple_animal/mouse/M = target
 			visible_message("\red <b>SPLAT!</b>")
 			M.splat()
-		playsound(target.loc, 'sound/effects/snap.ogg', 50, 1)
+		playsound(src.loc, 'sound/effects/snap.ogg', 50, 1)
 		armed = 0
 		update_icon()
 		pulse(0)

code/modules/hydroponics/grown.dm

@@ -883,7 +883,8 @@
 	icon_state = "spawner"
 	potency = 10
 	New()
-		switch(rand(1,100))//(potency) //It wants to use the default potency instead of the new, so it was always 10. Will try to come back to this later - Cheridan
+		..()
+		switch(potency)
 			if(0 to 10)
 				new/obj/item/weapon/spacecash/(src.loc)
 			if(11 to 20)

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

@@ -199,7 +199,9 @@
 		else
 			msg += "[t_He] has a strange masculine quality to [t_him].\n"
 
+	var/appears_dead = 0
 	if(stat == DEAD || (status_flags & FAKEDEATH))
+		appears_dead = 1
 		if(getbrain(src))//Only perform these checks if there is no brain
 			msg += "<span class='deadsay'>[t_He] [t_is] limp and unresponsive; there are no signs of life"
 
@@ -252,18 +254,19 @@
 
 	msg += "</span>"
 
-	if(stat == UNCONSCIOUS)
-		msg += "[t_He] [t_is]n't responding to anything around [t_him] and seems to be asleep.\n"
-	else if(getBrainLoss() >= 60)
-		msg += "[t_He] [t_has] a stupid expression on [t_his] face.\n"
+	if(!appears_dead)
+		if(stat == UNCONSCIOUS)
+			msg += "[t_He] [t_is]n't responding to anything around [t_him] and seems to be asleep.\n"
+		else if(getBrainLoss() >= 60)
+			msg += "[t_He] [t_has] a stupid expression on [t_his] face.\n"
 
-	if(!key && getbrain(src) && stat != DEAD)
-		msg += "<span class='deadsay'>[t_He] [t_is] totally catatonic. The stresses of life in deep-space must have been too much for [t_him]. Any recovery is unlikely</span>\n"
-	else if(!client && getbrain(src) && stat != DEAD)
-		msg += "[t_He] [t_has] a vacant, braindead stare...\n"
+		if(!key && getbrain(src))
+			msg += "<span class='deadsay'>[t_He] [t_is] totally catatonic. The stresses of life in deep-space must have been too much for [t_him]. Any recovery is unlikely</span>\n"
+		else if(!client && getbrain(src))
+			msg += "[t_He] [t_has] a vacant, braindead stare...\n"
 
-	if(digitalcamo)
-		msg += "[t_He] [t_is] repulsively uncanny!\n"
+		if(digitalcamo)
+			msg += "[t_He] [t_is] repulsively uncanny!\n"
 
 
 	if(istype(usr, /mob/living/carbon/human))

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

@@ -31,10 +31,14 @@
 
 /mob/living/simple_animal/mouse/proc/splat()
 	src.health = 0
-	src.stat = DEAD
 	src.icon_dead = "mouse_[color]_splat"
-	src.icon_state = "mouse_[color]_splat"
+	Die()
 
+/mob/living/simple_animal/mouse/Die()
+	..()
+	var/obj/item/trash/deadmouse/M = new(src.loc)
+	M.icon_state = src.icon_dead
+	del (src)
 
 /mob/living/simple_animal/mouse/HasEntered(AM as mob|obj)
 	if( ishuman(AM) )
@@ -66,4 +70,10 @@
 	desc = "Jerry the cat is not amused."
 	response_help  = "pets"
 	response_disarm = "gently pushes aside"
-	response_harm   = "splats"
+	response_harm   = "splats"
+
+/obj/item/trash/deadmouse
+	name = "dead mouse"
+	desc = "It looks like somebody dropped the bass on it."
+	icon = 'icons/mob/animal.dmi'
+	icon_state = "mouse_gray_dead"

code/modules/mob/new_player/sprite_accessories.dm

@@ -353,6 +353,10 @@
 		name = "Five o Clock Shadow"
 		icon_state = "facial_fiveoclock"
 
+	fu
+		name = "Fu Manchu"
+		icon_state = "facial_fumanchu"
+
 ///////////////////////////
 // Underwear Definitions //
 ///////////////////////////