Merge remote-tracking branch 'upstream/dev-freeze' into dev

This commit is contained in:
PsiOmega
2015-03-16 12:39:32 +01:00
23 changed files with 834 additions and 764 deletions

View File

@@ -34,6 +34,7 @@
idle_power_usage = 2
active_power_usage = 4
/obj/machinery/door_control/attack_ai(mob/user as mob)
if(wires & 2)
return src.attack_hand(user)