From 59994a565694b44ea14d99bd166502bc988fc25a Mon Sep 17 00:00:00 2001 From: Yoshax Date: Mon, 21 Nov 2016 01:27:15 +0000 Subject: [PATCH 1/2] Can open doors without access requirement when handcuffed --- code/game/machinery/doors/door.dm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 2fea971119f..185de7f06db 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -95,14 +95,18 @@ return 1 /obj/machinery/door/Bumped(atom/AM) - if(p_open || operating) return + if(p_open || operating) + return if(ismob(AM)) var/mob/M = AM - if(world.time - M.last_bumped <= 10) return //Can bump-open one airlock per second. This is to prevent shock spam. + if(world.time - M.last_bumped <= 10) + return //Can bump-open one airlock per second. This is to prevent shock spam. M.last_bumped = world.time - if(!M.restrained()) + if(M.restrained() && !check_access(null)) + return + else bumpopen(M) - return + if(istype(AM, /mob/living/bot)) var/mob/living/bot/bot = AM From a4e967fbae1849a9c7c944c6b574998869cfe542 Mon Sep 17 00:00:00 2001 From: Yoshax Date: Mon, 21 Nov 2016 01:46:40 +0000 Subject: [PATCH 2/2] Changelog --- html/changelogs/Yoshax-Yakkity.yml | 36 ++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 html/changelogs/Yoshax-Yakkity.yml diff --git a/html/changelogs/Yoshax-Yakkity.yml b/html/changelogs/Yoshax-Yakkity.yml new file mode 100644 index 00000000000..e23643a987b --- /dev/null +++ b/html/changelogs/Yoshax-Yakkity.yml @@ -0,0 +1,36 @@ +################################ +# 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 +################################# + +# Your name. +author: Yoshax + +# 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: "Doors that do not have an access requirement can now be opened when handcuffed."