From a5a0e46f42915a8b27b50ae55cbd1ba12c3fc23d Mon Sep 17 00:00:00 2001 From: NovaBot <154629622+NovaBot13@users.noreply.github.com> Date: Tue, 21 May 2024 14:19:11 -0400 Subject: [PATCH] [MIRROR] Removes night vision quirk (#2599) * Removes night vision quirk * Modulariuzes Nightvision * CI is going to complain that TG removed this --------- Co-authored-by: Nick Co-authored-by: SomeRandomOwl <2568378+SomeRandomOwl@users.noreply.github.com> --- .../modules/night_vision}/night_vision.dm | 2 +- tgstation.dme | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename {code/datums/quirks/positive_quirks => modular_nova/modules/night_vision}/night_vision.dm (93%) diff --git a/code/datums/quirks/positive_quirks/night_vision.dm b/modular_nova/modules/night_vision/night_vision.dm similarity index 93% rename from code/datums/quirks/positive_quirks/night_vision.dm rename to modular_nova/modules/night_vision/night_vision.dm index db94ab57555..942d52fa645 100644 --- a/code/datums/quirks/positive_quirks/night_vision.dm +++ b/modular_nova/modules/night_vision/night_vision.dm @@ -22,7 +22,7 @@ /datum/quirk/night_vision/proc/refresh_quirk_holder_eyes() var/mob/living/carbon/human/human_quirk_holder = quirk_holder var/obj/item/organ/internal/eyes/eyes = human_quirk_holder.get_organ_by_type(/obj/item/organ/internal/eyes) - if(!eyes) // NOVA EDIT CHANGE - ORIGINAL: if(!eyes || eyes.lighting_cutoff) + if(!eyes) return // We've either added or removed TRAIT_NIGHT_VISION before calling this proc. Just refresh the eyes. eyes.refresh() diff --git a/tgstation.dme b/tgstation.dme index 35378ba8b64..47109745e85 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -1840,7 +1840,6 @@ #include "code\datums\quirks\positive_quirks\light_step.dm" #include "code\datums\quirks\positive_quirks\mime_fan.dm" #include "code\datums\quirks\positive_quirks\musician.dm" -#include "code\datums\quirks\positive_quirks\night_vision.dm" #include "code\datums\quirks\positive_quirks\poster_boy.dm" #include "code\datums\quirks\positive_quirks\self_aware.dm" #include "code\datums\quirks\positive_quirks\settler.dm" @@ -8004,6 +8003,7 @@ #include "modular_nova\modules\nanotrasen_rep\code\clothing.dm" #include "modular_nova\modules\nanotrasen_rep\code\nanotrasen_consultant.dm" #include "modular_nova\modules\new_cells\code\power_cell.dm" +#include "modular_nova\modules\night_vision\night_vision.dm" #include "modular_nova\modules\novaya_ert\code\advanced_choice_beacon.dm" #include "modular_nova\modules\novaya_ert\code\back.dm" #include "modular_nova\modules\novaya_ert\code\belt.dm"