Skip to content

Commit 79eb113

Browse files
MarsM0ndMarsMond
andauthored
Don't disable chimera eyeglow if they use thermal sight (#7081)
Co-authored-by: MarsMond <no@email>
1 parent 71118f8 commit 79eb113

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

code/modules/species/station/xenochimera.dm

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -707,22 +707,25 @@
707707
if(!ishuman(owner))
708708
return
709709
var/mob/living/carbon/human/H = owner
710-
toggle_sight(owner)
711-
addtimer(CALLBACK(src, PROC_REF(toggle_sight),H), duration, TIMER_UNIQUE)
710+
var/toggle = !H.species.has_glowing_eyes //Only toggle the eye glow if we aren't already glowing with them
711+
toggle_sight(owner, toggle)
712+
addtimer(CALLBACK(src, PROC_REF(toggle_sight), H, toggle), duration, TIMER_UNIQUE)
712713

713-
/datum/ability/species/xenochimera/thermal_sight/proc/toggle_sight(mob/living/carbon/human/H)
714+
/datum/ability/species/xenochimera/thermal_sight/proc/toggle_sight(mob/living/carbon/human/H, toggle_eye_glow)
714715
if(!active)
715716
to_chat(H, "<span class='notice'>We focus outward, gaining a keen sense of all those around us.</span>")
716717
H.species.vision_flags |= SEE_MOBS
717718
H.species.vision_flags &= ~SEE_BLACKNESS
718-
H.species.has_glowing_eyes = TRUE
719+
if(toggle_eye_glow)
720+
H.species.has_glowing_eyes = TRUE
719721
H.add_vision_modifier(/datum/vision/augmenting/legacy_ghetto_nvgs)
720722
active = TRUE
721723
else
722724
to_chat(H, "<span class='notice'>Our senses dull.</span>")
723725
H.species.vision_flags &= ~SEE_MOBS
724726
H.species.vision_flags |= SEE_BLACKNESS
725-
H.species.has_glowing_eyes = FALSE
727+
if(toggle_eye_glow)
728+
H.species.has_glowing_eyes = FALSE
726729
H.remove_vision_modifier(/datum/vision/augmenting/legacy_ghetto_nvgs)
727730
active = FALSE
728731
H.update_eyes()

0 commit comments

Comments
 (0)