Merge pull request #2793 from Yoshax/yakkity

Can open doors without access requirement when handcuffed
This commit is contained in:
Anewbe
2016-11-21 18:02:14 -06:00
committed by GitHub
2 changed files with 44 additions and 4 deletions
+8 -4
View File
@@ -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
+36
View File
@@ -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."