Merge pull request #2673 from TheDZD/fixes

Assorted Fixes

code/game/gamemodes/shadowling/shadowling_abilities.dm

@@ -99,6 +99,14 @@
 			if(F.on)
 				G.toggle_gunlight()
 				G.visible_message("<span class='danger'>[G]'s light fades and turns off.</span>")
+	else if(istype(I, /obj/item/clothing/head/hardhat)) //There really needs to be a better way to handle this.
+		var/obj/item/clothing/head/hardhat/hhat = I
+		if(hhat.on)
+			hhat.on = 0
+			hhat.set_light(0)
+			hhat.icon_state = "hardhat0_[hhat.item_color]"
+			hhat.item_state = "hardhat0_[hhat.item_color]"
+			hhat.visible_message("<span class='danger'>[hhat]'s light fades and turns off.</span>")
 	return I.light_range
 
 /obj/effect/proc_holder/spell/aoe_turf/veil/proc/extinguishMob(var/mob/living/H)

code/game/objects/items/weapons/dna_injector.dm

@@ -94,6 +94,9 @@
 	return uses
 
 /obj/item/weapon/dnainjector/attack(mob/M as mob, mob/user as mob)
+	if(!M.dna) //You know what would be nice? If the mob you're injecting has DNA, and so doesn't cause runtimes.
+		return 0
+
 	if(ishuman(M)) // Would've done this via species instead of type, but the basic mob doesn't have a species, go figure.
 		var/mob/living/carbon/human/H = M
 		if(H.species.flags & NO_DNA_RAD)

code/modules/mob/living/simple_animal/hostile/statue.dm

@@ -174,16 +174,11 @@
 /mob/living/simple_animal/hostile/statue/say()
 	return 0
 
-//Turn to dust when gibbed
-/mob/living/simple_animal/hostile/statue/gib(var/animation = 0)
-	dust(animation)
-
-/mob/living/simple_animal/hostile/statue/death()
-	living_mob_list -= src
-	dead_mob_list += src
-	if(key)
-		respawnable_list += src
-	gib()
+/mob/living/simple_animal/hostile/statue/death(gibbed)
+	if(!gibbed) //The looping ends here.
+		dust()
+		return
+	return ..()
 
 //Stop attacking clientless mobs
 

code/modules/mob/living/simple_animal/vox.dm

@@ -22,15 +22,14 @@
 	var/amp = null
 	var/quills = 3
 
-/mob/living/simple_animal/vox/armalis/death()
-
-	living_mob_list -= src
-	dead_mob_list += src
-	stat = DEAD
-	visible_message("\red <B>[src] shudders violently and explodes!</B>","\red <B>You feel your body rupture!</B>")
-	explosion(get_turf(loc), -1, -1, 3, 5)
-	src.gib()
-	return
+/mob/living/simple_animal/vox/armalis/death(gibbed)
+	if(!gibbed)
+		stat = DEAD
+		visible_message("<span class='danger'>[src] shudders violently and explodes!</B>","\red <B>You feel your body rupture!</span>")
+		explosion(get_turf(loc), -1, -1, 3, 5)
+		gib()
+		return
+	return ..()
 
 /mob/living/simple_animal/vox/armalis/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
 	if(O.force)