From d48906e1318a03b9d16be8784161a1ab30c9f06c Mon Sep 17 00:00:00 2001 From: S34N <12197162+S34NW@users.noreply.github.com> Date: Wed, 28 Jul 2021 17:21:48 +0100 Subject: [PATCH] Apply suggestions from code review Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com> --- code/__HELPERS/traits.dm | 4 ++-- code/game/gamemodes/setupgame.dm | 6 +++--- code/modules/mob/living/carbon/carbon.dm | 3 +-- code/modules/mob/living/carbon/human/species/_species.dm | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/code/__HELPERS/traits.dm b/code/__HELPERS/traits.dm index 9c4911fd8a0..9625c48e7b0 100644 --- a/code/__HELPERS/traits.dm +++ b/code/__HELPERS/traits.dm @@ -140,8 +140,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define TRAIT_DWARF "dwarf" #define TRAIT_SILENT_FOOTSTEPS "silent_footsteps" //makes your footsteps completely silent #define TRAIT_MESON_VISION "meson_vision" -#define TRAIT_FLASH_PROTECTION "flash_protection" -#define TRAIT_NIGHT_VISION "night_vision" +#define TRAIT_FLASH_PROTECTION "flash_protection" +#define TRAIT_NIGHT_VISION "night_vision" #define TRAIT_COMIC_SANS "comic_sans" #define TRAIT_NOFINGERPRINTS "no_fingerprints" diff --git a/code/game/gamemodes/setupgame.dm b/code/game/gamemodes/setupgame.dm index 0ed8526387d..7315b52b062 100644 --- a/code/game/gamemodes/setupgame.dm +++ b/code/game/gamemodes/setupgame.dm @@ -48,9 +48,9 @@ GLOB.twitchblock = getAssignedBlock("TWITCH", numsToAssign) GLOB.nervousblock = getAssignedBlock("NERVOUS", numsToAssign) GLOB.wingdingsblock = getAssignedBlock("WINGDINGS", numsToAssign) - GLOB.mesonblock = getAssignedBlock("MESONS", numsToAssign, good=1) - GLOB.noflashblock = getAssignedBlock("NOFLASH", numsToAssign, DNA_HARDER_BOUNDS, good=1) - GLOB.nightvisionblock = getAssignedBlock("NIGHTVISION", numsToAssign, DNA_HARDER_BOUNDS, good=1) + GLOB.mesonblock = getAssignedBlock("MESONS", numsToAssign, good=1) + GLOB.noflashblock = getAssignedBlock("NOFLASH", numsToAssign, DNA_HARDER_BOUNDS, good=1) + GLOB.nightvisionblock = getAssignedBlock("NIGHTVISION", numsToAssign, DNA_HARDER_BOUNDS, good=1) // Bay muts diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index dafe0fcbc6c..a425e35f9ab 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -1188,7 +1188,6 @@ so that different stomachs can handle things in different ways VB*/ sight = initial(sight) lighting_alpha = initial(lighting_alpha) - if(client.eye != src) var/atom/A = client.eye if(A.update_remote_sight(src)) //returns 1 if we override all other sight updates. @@ -1203,7 +1202,7 @@ so that different stomachs can handle things in different ways VB*/ see_in_dark = max(see_in_dark, 8) if(HAS_TRAIT(src, TRAIT_MESON_VISION)) - sight |= (SEE_TURFS) + sight |= SEE_TURFS lighting_alpha = min(lighting_alpha, LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE) if(HAS_TRAIT(src, TRAIT_NIGHT_VISION)) diff --git a/code/modules/mob/living/carbon/human/species/_species.dm b/code/modules/mob/living/carbon/human/species/_species.dm index 3021262b292..f7cc37fbd8b 100644 --- a/code/modules/mob/living/carbon/human/species/_species.dm +++ b/code/modules/mob/living/carbon/human/species/_species.dm @@ -895,7 +895,7 @@ It'll return null if the organ doesn't correspond, so include null checks when u H.lighting_alpha = min(H.vision_type.lighting_alpha, H.lighting_alpha) if(HAS_TRAIT(H, TRAIT_MESON_VISION)) - H.sight |= (SEE_TURFS) + H.sight |= SEE_TURFS H.lighting_alpha = min(H.lighting_alpha, LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE) if(HAS_TRAIT(H, TRAIT_THERMAL_VISION))