diff --git a/code/game/gamemodes/shadowling/shadowling_abilities.dm b/code/game/gamemodes/shadowling/shadowling_abilities.dm index c2c10c80758..d6f5f2e47fc 100644 --- a/code/game/gamemodes/shadowling/shadowling_abilities.dm +++ b/code/game/gamemodes/shadowling/shadowling_abilities.dm @@ -99,6 +99,14 @@ if(F.on) G.toggle_gunlight() G.visible_message("[G]'s light fades and turns off.") + 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("[hhat]'s light fades and turns off.") return I.light_range /obj/effect/proc_holder/spell/aoe_turf/veil/proc/extinguishMob(var/mob/living/H) diff --git a/code/modules/mob/living/simple_animal/vox.dm b/code/modules/mob/living/simple_animal/vox.dm index b77e3e00125..e48c7f81d3d 100644 --- a/code/modules/mob/living/simple_animal/vox.dm +++ b/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("[src] shudders violently and explodes!","\red You feel your body rupture!") explosion(get_turf(loc), -1, -1, 3, 5) gib() - visible_message("[src] shudders violently and explodes!","\red You feel your body rupture!") return return ..()