From 3505e14b45dd9f9eac3e37f76271140a966ed21c Mon Sep 17 00:00:00 2001
From: Joan Lung <3886584+ChangelingRain@users.noreply.github.com>
Date: Sun, 24 Sep 2017 11:09:42 -0400
Subject: [PATCH 1/2] Airlocks are once again actually open when they appear to
 be open, instead of being uninteractable for a noticeable period (#30899)

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

* tweak

* fix
---
 code/game/machinery/doors/airlock.dm          |  35 ++++++++++--------
 .../airlocks/abductor/abductor_airlock.dmi    | Bin 2370 -> 2374 bytes
 .../obj/doors/airlocks/survival/survival.dmi  | Bin 22406 -> 22410 bytes
 .../airlocks/survival/survival_overlays.dmi   | Bin 18377 -> 18378 bytes
 4 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 54292a3af3..e7fa7447b5 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -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
diff --git a/icons/obj/doors/airlocks/abductor/abductor_airlock.dmi b/icons/obj/doors/airlocks/abductor/abductor_airlock.dmi
index d0ef3d2462d3765ee2b6deb53ae4048aab020f35..58be8d778e9dc3833d7a1dfe77c82a6dd23009da 100644
GIT binary patch
delta 68
zcmV-K0K5Of62=mcUIC$zUv@KrYy&-09TG4XXHI^80jgafchk+T{Ji3lqSE9NV8G%E
a1Z4$RKNoNe002f-W#NgymA|tD0X_(>?i(Ng

delta 64
zcmV-G0Kfmn62cOYUICqvUv@7+Y#pqSi!&!bzW~)tko%}^W`16ANl|HX2{52=c}iKq
W)z1YSq5z9GT(QDQ44<<I0X_&{mKn7G

diff --git a/icons/obj/doors/airlocks/survival/survival.dmi b/icons/obj/doors/airlocks/survival/survival.dmi
index f96d174c47916180f8e4d48ef9931749be8c3768..b796b4c8e01f575fdbc11ba28a35f6e222ee6b8d 100644
GIT binary patch
delta 200
zcmV;(05|`JuK|j$0gxnrv3gWkbVOxyV{&P5bZKvH004NLjgLVJgD@0C*ZHRybSt8*
z(p5G^DK7L5V$vG0`I4k9y?qx#rC>p3HSp%a#5mWNrbE>>^wiE9wvZ^&jKs^RFhb&Z
zATerl8^cn3=!1qtG)(NZibyEqJR}MdSJ&UQheW<&JZrlPGWNDR&7DXnJ@s!$<Vlv6
zNtTvLzJ$cYJpamuiTys=lCN@8#?}Y-7=q!yH`ZB<x~ovN4SfK;MO?{y8K3yE+N@T2
C9AVo4

delta 196
zcmV;#06YJRuK|Xy0gxnrt$I{gbVOxyV{&P5bZKvH004NLjgGMjgD@C`=loA`=o(66
zg-%(DQXKRh#H1Rq`6WqP`t}_hq|k!gbnxBB<+#+>rbE>>^t2&5_RuH~M-ne*(gclD
zL1MCQoYGoi>XU^=Hq0EY$w(L%A~Z@8x6t2hgofHMUaa2*IY0h4=FTLHo%=U53aO-$
y#TpVb^YSekW{&$rYm`)fMC@Y<k0Ck!dw-kdsJjYP+t3Fm%3Dif;gbQe-mF$w>0OZk

diff --git a/icons/obj/doors/airlocks/survival/survival_overlays.dmi b/icons/obj/doors/airlocks/survival/survival_overlays.dmi
index e8bede8217d4b2738a2357913d64238161df66dc..94c1a9fa34a127b46ed3d86d80155a3fe6263d56 100644
GIT binary patch
delta 294
zcmV+>0one^j{(Y$0gxnr4SG~qbVOxyV{&P5bZKvH004NLosz+B!yphu&+rwi<Z4;Q
zN!k;a%2DM*@(Y#=TN{M{0+c9!pF^v}mF=2VoRHqk&Md6qZU0^$p*qy`f<7o~fWtN~
zD7h*bd*HAsDd|ylef+wF*hT~nE3LXdhUUZS7*>=><pXfoQu674+cO5>z(%k{qfk!M
zFO*2s?F~4v>~WqJSJZM&JD!AR^c@;;n--LVVP(b!wSsH?X{OLjM53*AKU28Ypl*b=
zAtCY*Zk)FfMNF1ihvtd0C3MRFSCP;*DAP@+c^xmL$ah(h@0Ql0Ot)0^f9BSqNz3~%
sTYAQC%Rl8!HWw@y^?#J9;ARe7!~R%7b*SkbZiFE`7$Y%KvpE5fM(v)C1poj5

delta 293
zcmV+=0owk`j{(V#0gxnr40=>pbVOxyV{&P5bZKvH004NLm6E}3!yphu&+rwi<cg|7
zqV~k4a#Z<{{DMWz)<z|O042)b=a8y)6+0%{6VjX6nH6jJ*nQRqsP;8IVNAw5kg$Du
zrQ~dM?m@yvP|~C6`h0t&tTKXxl{H<TQ}g9*PAf{Zi3ucZDfy0n>WB#>@H<$eGpMKO
zH%c^GbpZ*S{mo!;Myuzv_nYvDu|wBhrUhcOOfWvGm4b>tGlga%66<~VpCTxSwrQ<T
z1(C;a6Qa-9=3<!-=mwN8p;P`3MXmM8xNbVl`*0A!Zo?U8;_*q0>y~OhZ|noQvYedp
rU(02?r*ak<x4iThKZsIrGY76=cc`G+*YpYl)*e9r$cJ#VIsuSIYSxmr