From abbc32e0a1ab87f08aee34511b259e2bf980f46a Mon Sep 17 00:00:00 2001 From: Tad Hardesty Date: Wed, 13 Jun 2018 00:06:09 -0700 Subject: [PATCH 1/2] Fix being able to examine out-of-view turfs --- code/modules/mob/mob.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 1183b18d9c5..4894b3d2ddd 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -293,6 +293,10 @@ set name = "Examine" set category = "IC" + if(isturf(A) && !(sight & SEE_TURFS) && !(A in view(src))) + // shift-click catcher may issue examinate() calls for out-of-sight turfs + return + if(is_blind(src)) to_chat(src, "Something is there but you can't see it.") return From a211dce4126da6b122973a2a38f9d6b96845b88a Mon Sep 17 00:00:00 2001 From: Tad Hardesty Date: Wed, 13 Jun 2018 18:17:12 -0700 Subject: [PATCH 2/2] Fix widescreen turf examine --- code/modules/mob/mob.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 4894b3d2ddd..79cd653c914 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -293,7 +293,7 @@ set name = "Examine" set category = "IC" - if(isturf(A) && !(sight & SEE_TURFS) && !(A in view(src))) + if(isturf(A) && !(sight & SEE_TURFS) && !(A in view(client ? client.view : world.view, src))) // shift-click catcher may issue examinate() calls for out-of-sight turfs return