From 9344ebd3227f22953699aa7c4bf90d03782885f4 Mon Sep 17 00:00:00 2001 From: Matt Atlas Date: Sun, 7 Jan 2024 13:31:13 +0100 Subject: [PATCH] Fixes blind or unconscious mobs being able to examine. (#18164) Co-authored-by: Matt Atlas --- code/modules/mob/examinations.dm | 3 +- html/changelogs/mattatlas-examinefix.yml | 42 ++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/mattatlas-examinefix.yml diff --git a/code/modules/mob/examinations.dm b/code/modules/mob/examinations.dm index 0663b6ddc17..d33b7318168 100644 --- a/code/modules/mob/examinations.dm +++ b/code/modules/mob/examinations.dm @@ -1,6 +1,7 @@ /proc/examinate(mob/user, atom/target, show_extended = FALSE) - if(user.is_blind() || user.stat) + if(user.is_blind() || (user.stat && !isobserver(user))) to_chat(user, SPAN_NOTICE("Something is there, but you cannot see it.")) + return user.face_atom(target) diff --git a/html/changelogs/mattatlas-examinefix.yml b/html/changelogs/mattatlas-examinefix.yml new file mode 100644 index 00000000000..b729d732d85 --- /dev/null +++ b/html/changelogs/mattatlas-examinefix.yml @@ -0,0 +1,42 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: MattAtlas + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Fixes blind or unconscious mobs being able to examine." + - bugfix: "Fixes observers getting the blind error message when examining things."