From 1c5d49388261ab42ac3b2a46d7817fdb3d68c66a Mon Sep 17 00:00:00 2001 From: "Wowzewow (Wezzy)" <42310821+alsoandanswer@users.noreply.github.com> Date: Wed, 22 Jul 2020 00:04:53 +0800 Subject: [PATCH] Fixes PDA medical scan functionality. (#9420) --- code/game/objects/items/devices/PDA/PDA.dm | 3 +- html/changelogs/wezzy_pdamedscanfix.yml | 41 ++++++++++++++++++++++ 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/wezzy_pdamedscanfix.yml diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index a9c38233296..fc696f73e3c 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -1399,7 +1399,8 @@ var/global/list/obj/item/device/pda/PDAs = list() try_sort_pda_list() /obj/item/device/pda/attack(mob/living/C, mob/living/user) - health_scan_mob(C, user, TRUE) + if(scanmode == 1) + health_scan_mob(C, user, TRUE) /obj/item/device/pda/afterattack(atom/A as mob|obj|turf|area, mob/user as mob, proximity) if(!proximity) return diff --git a/html/changelogs/wezzy_pdamedscanfix.yml b/html/changelogs/wezzy_pdamedscanfix.yml new file mode 100644 index 00000000000..3d38c1fe7cc --- /dev/null +++ b/html/changelogs/wezzy_pdamedscanfix.yml @@ -0,0 +1,41 @@ +################################ +# 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: Wowzewow (Wezzy) + +# 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 PDAs being able to do medical scans without the proper prerequisites."