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

Allows shells that requiring anchoring to take power from APCs (#62907)

Browse Source 
Co-authored-by: Watermelon914 <3052169-Watermelon914@users.noreply.gitlab.com>
This commit is contained in:
Watermelon914
2021-11-19 11:56:14 -08:00
committed by GitHub
co-authored by Watermelon914
parent 7647b0a7a8
commit a2369f8f42
4 changed files with 48 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/wiremod/core/component.dm
+5 -3
View File
@@ -262,9 +262,11 @@
message_admins("[display_name] tried to execute on [parent.get_creator_admin()] that has admin_only set to 0")
return FALSE
var/obj/item/stock_parts/cell/cell = parent.get_cell()
if(!cell?.use(power_usage_per_input))
return FALSE
var/flags = SEND_SIGNAL(parent, COMSIG_CIRCUIT_PRE_POWER_USAGE, power_usage_per_input)
if(!(flags & COMPONENT_OVERRIDE_POWER_USAGE))
var/obj/item/stock_parts/cell/cell = parent.get_cell()
if(!cell?.use(power_usage_per_input))
return FALSE
if((!port || port.trigger == .proc/input_received) && (circuit_flags & CIRCUIT_FLAG_INPUT_SIGNAL) && !COMPONENT_TRIGGERED_BY(trigger_input, port))
return FALSE
code/modules/wiremod/shell/airlock.dm
+1 -1
View File
@@ -18,7 +18,7 @@
/datum/component/shell, \
unremovable_circuit_components = list(new /obj/item/circuit_component/airlock, new /obj/item/circuit_component/airlock_access_event), \
capacity = SHELL_CAPACITY_LARGE, \
shell_flags = SHELL_FLAG_ALLOW_FAILURE_ACTION \
shell_flags = SHELL_FLAG_ALLOW_FAILURE_ACTION|SHELL_FLAG_REQUIRE_ANCHOR \
)
/obj/machinery/door/airlock/shell/check_access(obj/item/I)