Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_allocation

This commit is contained in:
Crazylemon64
2016-08-03 13:31:42 -07:00
65 changed files with 174 additions and 2702 deletions
@@ -85,12 +85,12 @@
move_gamma_ship()
if(security_level < SEC_LEVEL_RED)
for(var/obj/machinery/door/airlock/highsecurity/red/R in world)
for(var/obj/machinery/door/airlock/highsecurity/red/R in airlocks)
if(is_station_level(R.z))
R.locked = 0
R.update_icon()
for(var/obj/machinery/door/airlock/hatch/gamma/H in world)
for(var/obj/machinery/door/airlock/hatch/gamma/H in airlocks)
if(is_station_level(H.z))
H.locked = 0
H.update_icon()