[NO GBP] Minor nm oversight (#94417)

## About The Pull Request

https://github.com/tgstation/tgstation/pull/94395

## Why It's Good For The Game

Fix dragged light not getting snuffed out, if the user has another
equipped light turned on (light eater works simultaneously, not per hit)

## Changelog

🆑 ArchBTW
fix: Fix nightmare not properly snuffing dragged lights if other lights
were turned on simultaneously
/🆑

---------

Co-authored-by: glue0000 <230859540+glue0000@users.noreply.github.com>
This commit is contained in:
archbtw
2025-12-13 01:44:46 +00:00
committed by GitHub
parent ffec786117
commit a0cd0dcc85
+6 -6
View File
@@ -128,6 +128,12 @@
/datum/element/light_eater/proc/on_interacting_with(obj/item/source, mob/living/user, atom/target)
SIGNAL_HANDLER
if(eat_lights(target, source))
if (ismob(target))
var/mob/hit_user = target
if (hit_user.pulling)
var/atom/pulled_thing = hit_user.pulling // potentially dragging a light
if (!isliving(pulled_thing)) // we don't want conga lines to be affected
eat_lights(pulled_thing, source)
// do a "pretend" attack if we're hitting something that can't normally be
if(isobj(target))
var/obj/smacking = target
@@ -138,12 +144,6 @@
user.do_attack_animation(target)
user.changeNext_move(CLICK_CD_RAPID)
target.play_attack_sound()
if (ismob(target))
var/mob/hit_user = target
if (hit_user.pulling)
var/atom/pulled_thing = hit_user.pulling // dragging a light
if (!isliving(pulled_thing)) // we don't want conga lines to be affected
eat_lights(pulled_thing, source)
// not particularly picky about what happens afterwards in the attack chain
return NONE