- Fixes #2669

- Re-orders code in simple_animal/vox.dm death() to be the same as it was previously, so that the Vox Armalis actually display a visible_message on death.

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/modules/mob/living/simple_animal/vox.dm

@@ -25,9 +25,9 @@
 /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()
-		visible_message("<span class='danger'>[src] shudders violently and explodes!</B>","\red <B>You feel your body rupture!</span>")
 		return
 	return ..()