From ef18bc7ff186b3b8b93e14a77162a7b6b6e2efc3 Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Thu, 22 Feb 2018 23:01:16 -0500 Subject: [PATCH] POLARIS: Allow alteration of mob default see_invisible --- code/modules/mob/living/carbon/human/life.dm | 10 +++++----- code/modules/mob/living/living_defines.dm | 2 ++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index a3117ee415..e150aa0b5a 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -1163,7 +1163,7 @@ else sight &= ~(SEE_TURFS|SEE_MOBS|SEE_OBJS) - see_invisible = see_in_dark>2 ? SEE_INVISIBLE_LEVEL_ONE : SEE_INVISIBLE_LIVING + see_invisible = see_in_dark>2 ? SEE_INVISIBLE_LEVEL_ONE : see_invisible_default if(XRAY in mutations) sight |= SEE_TURFS|SEE_MOBS|SEE_OBJS @@ -1175,7 +1175,7 @@ if(R && R.word1 == cultwords["see"] && R.word2 == cultwords["hell"] && R.word3 == cultwords["join"]) see_invisible = SEE_INVISIBLE_CULT else - see_invisible = SEE_INVISIBLE_LIVING + see_invisible = see_invisible_default seer = 0 if(!seedarkness) @@ -1186,7 +1186,7 @@ else sight = species.get_vision_flags(src) see_in_dark = species.darksight - see_invisible = see_in_dark>2 ? SEE_INVISIBLE_LEVEL_ONE : SEE_INVISIBLE_LIVING + see_invisible = see_in_dark>2 ? SEE_INVISIBLE_LEVEL_ONE : see_invisible_default var/tmp/glasses_processed = 0 var/obj/item/weapon/rig/rig = back @@ -1207,7 +1207,7 @@ if(!glasses_processed && (species.get_vision_flags(src) > 0)) sight |= species.get_vision_flags(src) if(!seer && !glasses_processed && seedarkness) - see_invisible = SEE_INVISIBLE_LIVING + see_invisible = see_invisible_default if(healths) if (chem_effects[CE_PAINKILLER] > 100) @@ -1389,7 +1389,7 @@ if(G.see_invisible >= 0) see_invisible = G.see_invisible else if(!druggy && !seer) - see_invisible = SEE_INVISIBLE_LIVING + see_invisible = see_invisible_default /mob/living/carbon/human/handle_random_events() if(inStasisNow()) diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm index b36cd29d21..f57957dd7d 100644 --- a/code/modules/mob/living/living_defines.dm +++ b/code/modules/mob/living/living_defines.dm @@ -54,3 +54,5 @@ var/glow_range = 2 var/glow_intensity = null var/glow_color = "#FFFFFF" // The color they're glowing! + + var/see_invisible_default = SEE_INVISIBLE_LIVING