From aa8099f941040498496d2f41bab9fe1bb4c6ff4c Mon Sep 17 00:00:00 2001 From: afterthought2 <36152617+afterthought2@users.noreply.github.com> Date: Thu, 17 Dec 2020 09:01:23 -0500 Subject: [PATCH 1/2] Merge pull request #1028 from SierraKomodo/door-idscan-tweaks Cut IDScan wires bypass access flags --- code/game/machinery/doors/airlock.dm | 7 +++- .../sierrakomodo-door-idscan-tweaks.yml | 37 +++++++++++++++++++ 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/sierrakomodo-door-idscan-tweaks.yml diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index f55382805d1..9541d168fc6 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -167,6 +167,11 @@ About the new airlock wires panel: /obj/machinery/door/airlock/requiresID() return !(src.isWireCut(AIRLOCK_WIRE_IDSCAN) || aiDisabledIdScanner) +/obj/machinery/door/airlock/check_access(atom/movable/A) + if (isWireCut(AIRLOCK_WIRE_IDSCAN) || aiDisabledIdScanner) + return !secured_wires + return ..() + /obj/machinery/door/airlock/proc/isAllPowerLoss() if(stat & (NOPOWER|BROKEN)) return 1 @@ -1087,4 +1092,4 @@ About the new airlock wires panel: /obj/machinery/door/airlock/proc/stripe_airlock(var/paint_color) stripe_color = paint_color - update_icon() \ No newline at end of file + update_icon() diff --git a/html/changelogs/sierrakomodo-door-idscan-tweaks.yml b/html/changelogs/sierrakomodo-door-idscan-tweaks.yml new file mode 100644 index 00000000000..a906ce33cfa --- /dev/null +++ b/html/changelogs/sierrakomodo-door-idscan-tweaks.yml @@ -0,0 +1,37 @@ +################################ +# 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 +# admin +################################# + +# Your name. +author: SierraKomodo + +# 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: + - tweak: "Cutting the ID Scan wire on doors will now disable ID scanning. If the door is 'secure', this blocks access entirely. For all other doors, this fully bypasses access requirements." From 0846d5b3522df288ab2d8151aa459a5128e826c6 Mon Sep 17 00:00:00 2001 From: SkyratBot Date: Thu, 17 Dec 2020 09:02:12 -0500 Subject: [PATCH 2/2] Cut IDScan wires bypass access flags