Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

This commit is contained in:
Chinsky
2013-02-19 18:46:29 +04:00
21 changed files with 50 additions and 10 deletions
+1 -1
View File
@@ -910,7 +910,7 @@ About the new airlock wires panel:
/obj/machinery/door/airlock/Topic(href, href_list, var/nowindow = 0)
if(!nowindow)
..()
if(usr.stat || usr.restrained())
if(usr.stat || usr.restrained()|| usr.small)
return
add_fingerprint(usr)
if(href_list["close"])
+1 -1
View File
@@ -47,7 +47,7 @@
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.
M.last_bumped = world.time
if(!M.restrained())
if(!M.restrained() && !M.small)
bumpopen(M)
return