Amendments to previous commit.

code/modules/mob/death.dm

@@ -1,25 +1,23 @@
 //This is the proc for gibbing a mob. Cannot gib ghosts.
 //added different sort of gibs and animations. N
-/mob/proc/gib(var/anim,var/do_gibs)
+/mob/proc/gib(anim="gibbed-m",do_gibs)
 	death(1)
-	var/atom/movable/overlay/animation = null
 	monkeyizing = 1
 	canmove = 0
 	icon = null
 	invisibility = 101
+	update_canmove()
+	dead_mob_list -= src
 
+	var/atom/movable/overlay/animation = null
 	animation = new(loc)
 	animation.icon_state = "blank"
 	animation.icon = 'icons/mob/mob.dmi'
 	animation.master = src
 
-	update_canmove()
+	flick(anim, animation)
+	if(do_gibs) gibs(loc, viruses, dna)
 
-	flick((anim ? anim : "gibbed-m"), animation)
-	if(do_gibs)
-		gibs(loc, viruses, dna)
-
-	dead_mob_list -= src
 	spawn(15)
 		if(animation)	del(animation)
 		if(src)			del(src)
@@ -27,7 +25,7 @@
 //This is the proc for turning a mob into ash. Mostly a copy of gib code (above).
 //Originally created for wizard disintegrate. I've removed the virus code since it's irrelevant here.
 //Dusting robots does not eject the MMI, so it's a bit more powerful than gib() /N
-/mob/proc/dust(var/anim,var/remains)
+/mob/proc/dust(anim="dust-m",remains=/obj/effect/decal/cleanable/ash)
 	death(1)
 	var/atom/movable/overlay/animation = null
 	monkeyizing = 1
@@ -40,11 +38,8 @@
 	animation.icon = 'icons/mob/mob.dmi'
 	animation.master = src
 
-	flick(anim ? anim : "dust-m", animation)
-	if(remains)
-		new remains(loc)
-	else
-		new /obj/effect/decal/cleanable/ash(loc)
+	flick(anim, animation)
+	new remains(loc)
 
 	dead_mob_list -= src
 	spawn(15)
@@ -52,13 +47,13 @@
 		if(src)			del(src)
 
 
-/mob/proc/death(gibbed,deathmessage)
+/mob/proc/death(gibbed,deathmessage="seizes up and falls limp...")
 
 	if(stat == DEAD)
 		return 0
 
 	if(!gibbed)
-		src.visible_message("<b>\The [src.name]</b> [deathmessage ? deathmessage : "seizes up and falls limp..."]")
+		src.visible_message("<b>\The [src.name]</b> [deathmessage]")
 
 	stat = DEAD
 

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

@@ -37,7 +37,7 @@
 				message = "<B>[src]</B> burps."
 				m_type = 2
 		if("deathgasp")
-			message = "<B>The [src.name] lets out a waning guttural screech, green blood bubbling from its maw."
+			message = "<B>The [src.name]</B> lets out a waning guttural screech, green blood bubbling from its maw."
 			m_type = 2
 		if("scratch")
 			if (!src.restrained())

code/modules/mob/living/carbon/brain/death.dm

@@ -1,11 +1,10 @@
 /mob/living/carbon/brain/death(gibbed)
-	if(!gibbed && container && istype(container, /obj/item/device/mmi)) //If not gibbed but in a container.
+	if(!gibbed && istype(container, /obj/item/device/mmi)) //If not gibbed but in a container.
 		container.icon_state = "mmi_dead"
 	return ..(gibbed,"beeps shrilly as the MMI flatlines!")
 
 /mob/living/carbon/brain/gib()
-
-	if(container && istype(container, /obj/item/device/mmi))
+	if(istype(container, /obj/item/device/mmi))
 		del(container)//Gets rid of the MMI if there is one
 	if(loc)
 		if(istype(loc,/obj/item/organ/brain))