cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-12 07:33:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #5953

Browse Source 
Conflicts:
	code/game/machinery/doors/airlock.dm
This commit is contained in:
mwerezak
2014-08-12 00:34:31 -04:00
committed by ZomgPonies
parent 4567a6d607
commit e44dbfcc4e
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/doors/airlock.dm
+3 -3
View File
@@ -1251,7 +1251,7 @@ About the new airlock wires panel:
return
/obj/machinery/door/airlock/proc/lock(var/forced=0)
if (src.locked) return
if (operating || src.locked) return
src.locked = 1
for(var/mob/M in range(1,src))
@@ -1259,9 +1259,9 @@ About the new airlock wires panel:
update_icon()
/obj/machinery/door/airlock/proc/unlock(var/forced=0)
if (!src.locked) return 0
if (operating || !src.locked) return
if(forced || src.arePowerSystemsOn()) //only can raise bolts if power's on
if (forced || (src.arePowerSystemsOn() && !(stat & NOPOWER))) //only can raise bolts if power's on
src.locked = 0
for(var/mob/M in range(1,src))
M.show_message("You hear a click from the bottom of the door.", 2)
code/game/machinery/doors/airlock_control.dm
+8 -2
View File
@@ -15,10 +15,13 @@ obj/machinery/door/airlock/proc/can_radio()
obj/machinery/door/airlock/process()
..()
execute_current_command()
if (arePowerSystemsOn() && !(stat & NOPOWER))
execute_current_command()
obj/machinery/door/airlock/receive_signal(datum/signal/signal)
if (!can_radio()) return
if (arePowerSystemsOn() && !(stat & NOPOWER)) return //no power
if (!can_radio()) return //no radio
if(!signal || signal.encryption) return
@@ -28,6 +31,9 @@ obj/machinery/door/airlock/receive_signal(datum/signal/signal)
execute_current_command()
obj/machinery/door/airlock/proc/execute_current_command()
if(!operating)
return //emagged or busy doing something else
if (!cur_command)
return