Skip to content

Commit

Permalink
Airlocks are once again actually open when they appear to be open, in…
Browse files Browse the repository at this point in the history
…stead of being uninteractable for a noticeable period (tgstation#30899)

* Airlocks are once again actually open when they appear to be open, instead of being uninteractable for a noticeable period

* tweak

* fix
  • Loading branch information
ChangelingRain authored and KorPhaeron committed Sep 24, 2017
1 parent 5fbc6c2 commit bedbdca
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 15 deletions.
33 changes: 18 additions & 15 deletions code/game/machinery/doors/airlock.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1347,19 +1347,19 @@
return TRUE
operating = TRUE
update_icon(AIRLOCK_OPENING, 1)
src.set_opacity(0)
sleep(5)
sleep(1)
set_opacity(0)
update_freelook_sight()
sleep(4)
density = FALSE
sleep(9)
src.layer = OPEN_DOOR_LAYER
air_update_turf(1)
sleep(1)
layer = OPEN_DOOR_LAYER
update_icon(AIRLOCK_OPEN, 1)
set_opacity(0)
operating = FALSE
air_update_turf(1)
update_freelook_sight()
if(delayed_close_requested)
delayed_close_requested = FALSE
addtimer(CALLBACK(src, .proc/close), 2)
addtimer(CALLBACK(src, .proc/close), 1)
return TRUE


Expand Down Expand Up @@ -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
Expand Down
Binary file modified icons/obj/doors/airlocks/abductor/abductor_airlock.dmi
Binary file not shown.
Binary file modified icons/obj/doors/airlocks/survival/survival.dmi
Binary file not shown.
Binary file modified icons/obj/doors/airlocks/survival/survival_overlays.dmi
Binary file not shown.

0 comments on commit bedbdca

Please sign in to comment.