Merge pull request #2928 from Citadel-Station-13/upstream-merge-30899

[MIRROR] Airlocks are once again actually open when they appear to be open, instead of being uninteractable for a noticeable period
This commit is contained in:
LetterJay
2017-09-24 11:34:01 -04:00
committed by GitHub
4 changed files with 19 additions and 16 deletions
+19 -16
View File
@@ -1347,19 +1347,19 @@
return TRUE
operating = TRUE
update_icon(AIRLOCK_OPENING, 1)
src.set_opacity(0)
sleep(5)
density = FALSE
sleep(9)
src.layer = OPEN_DOOR_LAYER
update_icon(AIRLOCK_OPEN, 1)
sleep(1)
set_opacity(0)
operating = FALSE
air_update_turf(1)
update_freelook_sight()
sleep(4)
density = FALSE
air_update_turf(1)
sleep(1)
layer = OPEN_DOOR_LAYER
update_icon(AIRLOCK_OPEN, 1)
operating = FALSE
if(delayed_close_requested)
delayed_close_requested = FALSE
addtimer(CALLBACK(src, .proc/close), 2)
addtimer(CALLBACK(src, .proc/close), 1)
return TRUE
@@ -1391,21 +1391,24 @@
return TRUE
operating = TRUE
update_icon(AIRLOCK_CLOSING, 1)
src.layer = CLOSED_DOOR_LAYER
layer = CLOSED_DOOR_LAYER
if(air_tight)
density = TRUE
sleep(5)
density = TRUE
air_update_turf(1)
sleep(1)
if(!air_tight)
density = TRUE
air_update_turf(1)
sleep(4)
if(!safe)
crush()
sleep(9)
update_icon(AIRLOCK_CLOSED, 1)
if(visible && !glass)
set_opacity(1)
update_freelook_sight()
sleep(1)
update_icon(AIRLOCK_CLOSED, 1)
operating = FALSE
delayed_close_requested = FALSE
air_update_turf(1)
update_freelook_sight()
if(safe)
CheckForMobs()
return TRUE