Fix early return in airlock engineering override (#2212)

* move override early returns * fix CI on abductor airlock Co-authored-by: lessthanthree <[email protected]>
Fluffy-Frontier · Mar 1, 2024 · 384f06b · 384f06b
1 parent 6deefac
commit 384f06b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/modular_nova/modules/aesthetics/airlock/icons/airlocks/abductor/overlays.dmi b/modular_nova/modules/aesthetics/airlock/icons/airlocks/abductor/overlays.dmi
diff --git a/modular_nova/modules/airlock_override/code/airlock_override.dm b/modular_nova/modules/airlock_override/code/airlock_override.dm
@@ -103,8 +103,7 @@
 ///When the signal is received of a changed security level, check if it's orange.
 /obj/machinery/door/airlock/check_security_level(datum/source, level)
 	. = ..()
-	var/area/source_area = get_area(src)
-	if(!source_area.engineering_override_eligible)
+	if(!door_area.engineering_override_eligible)
 		return
 
 	if(isnull(req_access) && isnull(req_one_access)) // no restrictions, no problem
@@ -161,6 +160,9 @@ GLOBAL_VAR_INIT(force_eng_override, FALSE)
 /obj/machinery/door/airlock/proc/force_eng_override(datum/source, status)
 	SIGNAL_HANDLER
 
+	if(!door_area.engineering_override_eligible)
+		return
+
 	if(isnull(req_access) && isnull(req_one_access)) // no restrictions, no problem
 		return
 
@@ -170,9 +172,6 @@ GLOBAL_VAR_INIT(force_eng_override, FALSE)
 		update_appearance()
 		return
 
-	if(!door_area.engineering_override_eligible)
-		return
-
 	normalspeed = FALSE
 	update_appearance()
 
@@ -188,6 +187,9 @@ GLOBAL_VAR_INIT(force_eng_override, FALSE)
 /obj/machinery/door/airlock/proc/update_fire_status(datum/source, fire)
 	SIGNAL_HANDLER
 
+	if(!door_area.engineering_override_eligible)
+		return
+
 	if(isnull(req_access) && isnull(req_one_access)) // no restrictions, no problem
 		return
 
@@ -197,9 +199,6 @@ GLOBAL_VAR_INIT(force_eng_override, FALSE)
 		update_appearance()
 		return
 
-	if(!door_area.engineering_override_eligible)
-		return
-
 	normalspeed = FALSE
 	update_appearance()