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

Adds 2 new signals, adds pre/postattack_secondary signals to circuit signal handler presets (+a proccall component fix) (#62233)

Browse Source 
Adds COMSIG_ITEM_AFTERATTACK_SECONDARY and COMSIG_MOB_ITEM_AFTERATTACK_SECONDARY signals, which are both called by item/proc/afterattack_secondary.
Adds COMSIG_ITEM_PRE_ATTACK_SECONDARY and COMSIG_ITEM_AFTERATTACK_SECONDARY to the list of circuit signal handler presets.
The proc call, set var, and spawn atom components will resolve any weakrefs passed to them in their parameter port, seeing as the list literal component now converts datums into weakrefs.
This commit is contained in:
Y0SH1M4S73R
2021-10-21 07:41:22 -04:00
committed by GitHub
parent ec5dab073f
commit a8e01da16f
7 changed files with 54 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/wiremod/components/admin/proccall.dm
+2 -2
View File
@@ -62,7 +62,7 @@
return
var/to_invoke = proc_name.value
var/params = arguments.value || list()
var/list/params = arguments.value || list()
if(!to_invoke)
return
@@ -70,7 +70,7 @@
if(called_on != GLOBAL_PROC && !hascall(called_on, to_invoke))
return
INVOKE_ASYNC(src, .proc/do_proccall, called_on, to_invoke, params)
INVOKE_ASYNC(src, .proc/do_proccall, called_on, to_invoke, recursive_list_resolve(params))
/obj/item/circuit_component/proccall/proc/do_proccall(called_on, to_invoke, params)
var/result = HandleUserlessProcCall(parent.get_creator(), called_on, to_invoke, params)
code/modules/wiremod/components/admin/setvar.dm
+6 -1
View File
@@ -29,4 +29,9 @@
if(!var_name || !object)
return
object.vv_edit_var(var_name, new_value.value)
var/resolved_new_value = new_value.value
if(islist(resolved_new_value))
var/list/to_resolve = resolved_new_value
resolved_new_value = recursive_list_resolve(to_resolve)
object.vv_edit_var(var_name, resolved_new_value)
code/modules/wiremod/components/admin/signal_handler/signal_list.dm
+5 -1
View File
@@ -18,6 +18,8 @@ GLOBAL_LIST_INIT(integrated_circuit_signal_ids, generate_circuit_signal_list())
/proc/generate_circuit_signal_list()
var/cancel_attack = circuit_signal_response("Cancel Attack", COMPONENT_CANCEL_ATTACK_CHAIN)
var/secondary_cancel_attack = circuit_signal_response("Cancel Attack", COMPONENT_SECONDARY_CANCEL_ATTACK_CHAIN)
var/secondary_continue_attack = circuit_signal_response("Continue Attack", COMPONENT_SECONDARY_CONTINUE_ATTACK_CHAIN)
var/target = circuit_signal_param("Target", PORT_TYPE_ATOM)
var/user = circuit_signal_param("User", PORT_TYPE_ATOM)
var/item = circuit_signal_param("Item", PORT_TYPE_ATOM)
@@ -37,7 +39,9 @@ GLOBAL_LIST_INIT(integrated_circuit_signal_ids, generate_circuit_signal_list())
COMSIG_ITEM_ATTACK = list(cancel_attack, target, user),
COMSIG_ITEM_PRE_ATTACK = list(cancel_attack, target, user),
COMSIG_ITEM_AFTERATTACK = list(cancel_attack, target, user),
COMSIG_ITEM_ATTACK_SECONDARY = list(circuit_signal_response("Cancel Attack", COMPONENT_SECONDARY_CANCEL_ATTACK_CHAIN), target, user),
COMSIG_ITEM_ATTACK_SECONDARY = list(secondary_cancel_attack, secondary_continue_attack, target, user),
COMSIG_ITEM_PRE_ATTACK_SECONDARY = list(secondary_cancel_attack, secondary_continue_attack, target, user),
COMSIG_ITEM_AFTERATTACK_SECONDARY = list(secondary_cancel_attack, secondary_continue_attack, target, user),
COMSIG_ITEM_ATTACK_SELF = list(cancel_attack, user),
COMSIG_ITEM_ATTACK_SELF_SECONDARY = list(cancel_attack, user),
)
code/modules/wiremod/components/admin/spawn.dm
+4 -2
View File
@@ -38,8 +38,10 @@
if(!params)
params = list()
params.Insert(1, spawn_at.value)
var/list/resolved_params = recursive_list_resolve(params)
var/atom/spawned = new typepath(arglist(params))
resolved_params.Insert(1, spawn_at.value)
var/atom/spawned = new typepath(arglist(resolved_params))
spawned.datum_flags |= DF_VAR_EDITED
spawned_atom.set_output(spawned)