cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 05:00:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed airlock shells made from airlock electronics not triggering AAE circuit component (#69992)

Browse Source 
Airlock shells made from airlock electronic and door assemblies would not trigger the 'Airlock Access Event' circuit component because the registered signals did not include the signals called by regular airlocks. This fixes that.
This commit is contained in:
Watermelon914
2022-09-21 17:35:48 -07:00
committed by GitHub
parent 59bb7ec792
commit e91aa75843
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/wiremod/shell/airlock.dm
+10 -4
View File
@@ -31,7 +31,7 @@
return FALSE
/obj/machinery/door/airlock/shell/allowed(mob/user)
if(SEND_SIGNAL(src, COMSIG_AIRLOCK_SHELL_ALLOWED, user) & COMPONENT_AIRLOCK_SHELL_ALLOW)
if(SEND_SIGNAL(src, COMSIG_AIRLOCK_SHELL_ALLOWED, user) & COMPONENT_OBJ_ALLOW)
return TRUE
return isAdminGhostAI(user)
@@ -156,12 +156,16 @@
. = ..()
if(istype(shell, /obj/machinery/door/airlock))
attached_airlock = shell
RegisterSignal(shell, COMSIG_AIRLOCK_SHELL_ALLOWED , .proc/handle_allowed)
RegisterSignal(shell, list(
COMSIG_OBJ_ALLOWED,
COMSIG_AIRLOCK_SHELL_ALLOWED,
), .proc/handle_allowed)
/obj/item/circuit_component/airlock_access_event/unregister_shell(atom/movable/shell)
attached_airlock = null
UnregisterSignal(shell, list(
COMSIG_AIRLOCK_SHELL_ALLOWED ,
COMSIG_OBJ_ALLOWED,
COMSIG_AIRLOCK_SHELL_ALLOWED
))
return ..()
@@ -193,4 +197,6 @@
return
if(result["should_open"])
return COMPONENT_AIRLOCK_SHELL_ALLOW
return COMPONENT_OBJ_ALLOW
else
return COMPONENT_OBJ_DISALLOW