mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-26 06:29:23 +01:00
515 Compat (#17465)
* ONLY SKYRAT CHANGES * ACTUALLY SKYRAT CHANGES * yolo, revert later * Update alternate_byond_versions.txt Co-authored-by: AnturK <AnturK@users.noreply.github.com>
This commit is contained in:
@@ -171,9 +171,9 @@
|
||||
|
||||
/obj/item/circuit_component/module/add_to(obj/item/integrated_circuit/added_to)
|
||||
. = ..()
|
||||
RegisterSignal(added_to, COMSIG_CIRCUIT_SET_CELL, .proc/handle_set_cell)
|
||||
RegisterSignal(added_to, COMSIG_CIRCUIT_SET_ON, .proc/handle_set_on)
|
||||
RegisterSignal(added_to, COMSIG_CIRCUIT_SET_SHELL, .proc/handle_set_shell)
|
||||
RegisterSignal(added_to, COMSIG_CIRCUIT_SET_CELL, PROC_REF(handle_set_cell))
|
||||
RegisterSignal(added_to, COMSIG_CIRCUIT_SET_ON, PROC_REF(handle_set_on))
|
||||
RegisterSignal(added_to, COMSIG_CIRCUIT_SET_SHELL, PROC_REF(handle_set_shell))
|
||||
internal_circuit.set_cell(added_to.cell)
|
||||
internal_circuit.set_shell(added_to.shell)
|
||||
internal_circuit.set_on(added_to.on)
|
||||
|
||||
@@ -61,4 +61,4 @@
|
||||
current_variable = variable
|
||||
if(should_listen)
|
||||
current_variable.add_listener(src)
|
||||
RegisterSignal(current_variable, COMSIG_PARENT_QDELETING, .proc/remove_current_variable)
|
||||
RegisterSignal(current_variable, COMSIG_PARENT_QDELETING, PROC_REF(remove_current_variable))
|
||||
|
||||
@@ -78,7 +78,7 @@
|
||||
|
||||
/obj/item/circuit_component/mmi/register_shell(atom/movable/shell)
|
||||
. = ..()
|
||||
RegisterSignal(shell, COMSIG_PARENT_ATTACKBY, .proc/handle_attack_by)
|
||||
RegisterSignal(shell, COMSIG_PARENT_ATTACKBY, PROC_REF(handle_attack_by))
|
||||
|
||||
/obj/item/circuit_component/mmi/unregister_shell(atom/movable/shell)
|
||||
UnregisterSignal(shell, COMSIG_PARENT_ATTACKBY)
|
||||
@@ -101,8 +101,8 @@
|
||||
if(to_add.brainmob)
|
||||
update_mmi_mob(to_add, null, to_add.brainmob)
|
||||
brain = to_add
|
||||
RegisterSignal(to_add, COMSIG_PARENT_QDELETING, .proc/remove_current_brain)
|
||||
RegisterSignal(to_add, COMSIG_MOVABLE_MOVED, .proc/mmi_moved)
|
||||
RegisterSignal(to_add, COMSIG_PARENT_QDELETING, PROC_REF(remove_current_brain))
|
||||
RegisterSignal(to_add, COMSIG_MOVABLE_MOVED, PROC_REF(mmi_moved))
|
||||
|
||||
/obj/item/circuit_component/mmi/proc/mmi_moved(atom/movable/mmi)
|
||||
SIGNAL_HANDLER
|
||||
@@ -132,7 +132,7 @@
|
||||
UnregisterSignal(old_mmi, COMSIG_MOB_CLICKON)
|
||||
if(new_mmi)
|
||||
new_mmi.remote_control = src
|
||||
RegisterSignal(new_mmi, COMSIG_MOB_CLICKON, .proc/handle_mmi_attack)
|
||||
RegisterSignal(new_mmi, COMSIG_MOB_CLICKON, PROC_REF(handle_mmi_attack))
|
||||
|
||||
/obj/item/circuit_component/mmi/relaymove(mob/living/user, direct)
|
||||
if(user != brain.brainmob)
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
reason_failed = add_output_port("Fail reason", PORT_TYPE_STRING)
|
||||
|
||||
/obj/item/circuit_component/pathfind/input_received(datum/port/input/port)
|
||||
INVOKE_ASYNC(src, .proc/perform_pathfinding, port)
|
||||
INVOKE_ASYNC(src, PROC_REF(perform_pathfinding), port)
|
||||
|
||||
/obj/item/circuit_component/pathfind/proc/perform_pathfinding(datum/port/input/port)
|
||||
var/target_X = input_X.value
|
||||
|
||||
@@ -24,4 +24,4 @@
|
||||
if(!istype(shell) || get_dist(shell, target_atom) > 1 || shell.z != target_atom.z)
|
||||
return
|
||||
|
||||
INVOKE_ASYNC(shell, /atom/movable.proc/start_pulling, target_atom)
|
||||
INVOKE_ASYNC(shell, TYPE_PROC_REF(/atom/movable, start_pulling), target_atom)
|
||||
|
||||
@@ -47,7 +47,7 @@
|
||||
freq.set_value(sanitize_frequency(freq.value, TRUE))
|
||||
|
||||
/obj/item/circuit_component/radio/input_received(datum/port/input/port)
|
||||
INVOKE_ASYNC(src, .proc/handle_radio_input, port)
|
||||
INVOKE_ASYNC(src, PROC_REF(handle_radio_input), port)
|
||||
|
||||
/obj/item/circuit_component/radio/proc/handle_radio_input(datum/port/input/port)
|
||||
var/frequency = freq.value
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
target = add_input_port("Target", PORT_TYPE_ATOM)
|
||||
parallel = add_input_port("Parallel", PORT_TYPE_NUMBER, default = 1)
|
||||
animation_loops = add_input_port("Loops", PORT_TYPE_NUMBER)
|
||||
stop_all_animations = add_input_port("Stop All Animations", PORT_TYPE_SIGNAL, trigger = .proc/stop_animations)
|
||||
stop_all_animations = add_input_port("Stop All Animations", PORT_TYPE_SIGNAL, trigger = PROC_REF(stop_animations))
|
||||
animate_event = add_output_port("Perform Animation", PORT_TYPE_INSTANT_SIGNAL)
|
||||
|
||||
/obj/item/circuit_component/begin_animation/pre_input_received(datum/port/input/port)
|
||||
|
||||
@@ -53,7 +53,7 @@
|
||||
if(!istype(player))
|
||||
return
|
||||
|
||||
INVOKE_ASYNC(src, .proc/request_input_from_player, player)
|
||||
INVOKE_ASYNC(src, PROC_REF(request_input_from_player), player)
|
||||
|
||||
/obj/item/circuit_component/input_request/proc/request_input_from_player(mob/player)
|
||||
var/new_option = input_options.value
|
||||
|
||||
@@ -180,7 +180,7 @@
|
||||
params = recursive_list_resolve(params)
|
||||
|
||||
log_admin_circuit("[parent.get_creator()] proccalled '[to_invoke]' on [called_on] with params \[[params.Join(", ")]].")
|
||||
INVOKE_ASYNC(src, .proc/do_proccall, called_on, to_invoke, params)
|
||||
INVOKE_ASYNC(src, PROC_REF(do_proccall), called_on, to_invoke, 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)
|
||||
|
||||
@@ -19,8 +19,8 @@
|
||||
|
||||
/obj/item/circuit_component/save_shell/add_to(obj/item/integrated_circuit/added_to)
|
||||
. = ..()
|
||||
RegisterSignal(added_to, COMSIG_CIRCUIT_POST_LOAD, .proc/on_post_load)
|
||||
RegisterSignal(added_to, COMSIG_CIRCUIT_PRE_SAVE_TO_JSON, .proc/on_pre_save_to_json)
|
||||
RegisterSignal(added_to, COMSIG_CIRCUIT_POST_LOAD, PROC_REF(on_post_load))
|
||||
RegisterSignal(added_to, COMSIG_CIRCUIT_PRE_SAVE_TO_JSON, PROC_REF(on_pre_save_to_json))
|
||||
|
||||
/obj/item/circuit_component/save_shell/removed_from(obj/item/integrated_circuit/removed_from)
|
||||
UnregisterSignal(removed_from, list(COMSIG_CIRCUIT_POST_LOAD, COMSIG_CIRCUIT_PRE_SAVE_TO_JSON))
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
if(GLOB.AdminProcCaller)
|
||||
return TRUE
|
||||
|
||||
INVOKE_ASYNC(src, .proc/execute_sdql, port)
|
||||
INVOKE_ASYNC(src, PROC_REF(execute_sdql), port)
|
||||
|
||||
/obj/item/circuit_component/sdql_operation/proc/execute_sdql(datum/port/input/port)
|
||||
var/operation = sdql_operation.value
|
||||
|
||||
@@ -64,9 +64,9 @@
|
||||
|
||||
/obj/item/circuit_component/signal_handler/populate_ports()
|
||||
instant = add_input_port("Instant", PORT_TYPE_NUMBER, order = 0.5, trigger = null, default = 1)
|
||||
register = add_input_port("Register", PORT_TYPE_SIGNAL, order = 2, trigger = .proc/register_signals)
|
||||
unregister = add_input_port("Unregister", PORT_TYPE_SIGNAL, order = 2, trigger = .proc/unregister_signals)
|
||||
unregister_all = add_input_port("Unregister All", PORT_TYPE_SIGNAL, order = 2, trigger = .proc/unregister_signals_all)
|
||||
register = add_input_port("Register", PORT_TYPE_SIGNAL, order = 2, trigger = PROC_REF(register_signals))
|
||||
unregister = add_input_port("Unregister", PORT_TYPE_SIGNAL, order = 2, trigger = PROC_REF(unregister_signals))
|
||||
unregister_all = add_input_port("Unregister All", PORT_TYPE_SIGNAL, order = 2, trigger = PROC_REF(unregister_signals_all))
|
||||
|
||||
add_source_entity()
|
||||
event_triggered = add_output_port("Triggered", PORT_TYPE_INSTANT_SIGNAL, order = 2)
|
||||
@@ -134,7 +134,7 @@
|
||||
if(target_datum)
|
||||
log_admin_circuit("[parent.get_creator()] registered the signal '[registered_signal]' on [target_datum]")
|
||||
// We override because an admin may try registering a signal on the same object/datum again, so this prevents any runtimes from occuring
|
||||
RegisterSignal(target_datum, registered_signal, .proc/handle_signal_received, override = TRUE)
|
||||
RegisterSignal(target_datum, registered_signal, PROC_REF(handle_signal_received), override = TRUE)
|
||||
registered_entities |= WEAKREF(target_datum)
|
||||
|
||||
/obj/item/circuit_component/signal_handler/proc/load_new_ports(list/ports_to_load)
|
||||
@@ -148,7 +148,7 @@
|
||||
signal_ports = ports_to_load
|
||||
for(var/list/data in signal_ports)
|
||||
if(data["is_response"])
|
||||
var/datum/port/input/bitflag_input = add_input_port(data["name"], PORT_TYPE_SIGNAL, order = 3, trigger = .proc/handle_bitflag_received)
|
||||
var/datum/port/input/bitflag_input = add_input_port(data["name"], PORT_TYPE_SIGNAL, order = 3, trigger = PROC_REF(handle_bitflag_received))
|
||||
input_signal_ports[bitflag_input] = data["bitflag"]
|
||||
else
|
||||
output_signal_ports += add_output_port(data["name"], data["type"], order = 1)
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
/obj/item/circuit_component/hear/register_shell(atom/movable/shell)
|
||||
if(parent.loc != shell)
|
||||
shell.become_hearing_sensitive(CIRCUIT_HEAR_TRAIT)
|
||||
RegisterSignal(shell, COMSIG_MOVABLE_HEAR, .proc/on_shell_hear)
|
||||
RegisterSignal(shell, COMSIG_MOVABLE_HEAR, PROC_REF(on_shell_hear))
|
||||
|
||||
/obj/item/circuit_component/hear/unregister_shell(atom/movable/shell)
|
||||
REMOVE_TRAIT(shell, TRAIT_HEARING_SENSITIVE, CIRCUIT_HEAR_TRAIT)
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
/obj/item/circuit_component/counter_overlay/register_shell(atom/movable/shell)
|
||||
if(istype(shell, /obj/item/organ/internal/cyberimp/bci))
|
||||
bci = shell
|
||||
RegisterSignal(shell, COMSIG_ORGAN_REMOVED, .proc/on_organ_removed)
|
||||
RegisterSignal(shell, COMSIG_ORGAN_REMOVED, PROC_REF(on_organ_removed))
|
||||
|
||||
/obj/item/circuit_component/counter_overlay/unregister_shell(atom/movable/shell)
|
||||
bci = null
|
||||
|
||||
@@ -65,7 +65,7 @@
|
||||
/obj/item/circuit_component/object_overlay/register_shell(atom/movable/shell)
|
||||
if(istype(shell, /obj/item/organ/internal/cyberimp/bci))
|
||||
bci = shell
|
||||
RegisterSignal(shell, COMSIG_ORGAN_REMOVED, .proc/on_organ_removed)
|
||||
RegisterSignal(shell, COMSIG_ORGAN_REMOVED, PROC_REF(on_organ_removed))
|
||||
|
||||
/obj/item/circuit_component/object_overlay/unregister_shell(atom/movable/shell)
|
||||
bci = null
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
/obj/item/circuit_component/target_intercept/register_shell(atom/movable/shell)
|
||||
if(istype(shell, /obj/item/organ/internal/cyberimp/bci))
|
||||
bci = shell
|
||||
RegisterSignal(shell, COMSIG_ORGAN_REMOVED, .proc/on_organ_removed)
|
||||
RegisterSignal(shell, COMSIG_ORGAN_REMOVED, PROC_REF(on_organ_removed))
|
||||
|
||||
/obj/item/circuit_component/target_intercept/unregister_shell(atom/movable/shell)
|
||||
bci = null
|
||||
|
||||
@@ -52,7 +52,7 @@
|
||||
failure.set_output(COMPONENT_SIGNAL)
|
||||
return
|
||||
|
||||
INVOKE_ASYNC(src, .proc/thought_listen, owner)
|
||||
INVOKE_ASYNC(src, PROC_REF(thought_listen), owner)
|
||||
ready = FALSE
|
||||
|
||||
/obj/item/circuit_component/thought_listener/proc/thought_listen(mob/living/owner)
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
|
||||
/obj/item/circuit_component/compare/access/add_to(obj/item/integrated_circuit/added_to)
|
||||
. = ..()
|
||||
RegisterSignal(added_to, COMSIG_CIRCUIT_POST_LOAD, .proc/on_post_load)
|
||||
RegisterSignal(added_to, COMSIG_CIRCUIT_POST_LOAD, PROC_REF(on_post_load))
|
||||
|
||||
/obj/item/circuit_component/compare/access/removed_from(obj/item/integrated_circuit/removed_from)
|
||||
UnregisterSignal(removed_from, COMSIG_CIRCUIT_POST_LOAD)
|
||||
|
||||
@@ -49,7 +49,7 @@
|
||||
|
||||
/obj/item/circuit_component/filter_list/populate_ports()
|
||||
list_to_filter = add_input_port("List Input", PORT_TYPE_LIST(PORT_TYPE_ANY))
|
||||
accept_entry = add_input_port("Accept Entry", PORT_TYPE_SIGNAL, trigger = .proc/accept_entry_port)
|
||||
accept_entry = add_input_port("Accept Entry", PORT_TYPE_SIGNAL, trigger = PROC_REF(accept_entry_port))
|
||||
|
||||
element = add_output_port("Element", PORT_TYPE_ANY)
|
||||
current_index = add_output_port("Index", PORT_TYPE_NUMBER)
|
||||
|
||||
@@ -41,8 +41,8 @@
|
||||
|
||||
/obj/item/circuit_component/foreach/populate_ports()
|
||||
list_to_iterate = add_input_port("List Input", PORT_TYPE_LIST(PORT_TYPE_ANY))
|
||||
next_index = add_input_port("Next Index", PORT_TYPE_SIGNAL, trigger = .proc/trigger_next_index)
|
||||
reset_index = add_input_port("Reset And Trigger", PORT_TYPE_SIGNAL, trigger = .proc/restart)
|
||||
next_index = add_input_port("Next Index", PORT_TYPE_SIGNAL, trigger = PROC_REF(trigger_next_index))
|
||||
reset_index = add_input_port("Reset And Trigger", PORT_TYPE_SIGNAL, trigger = PROC_REF(restart))
|
||||
|
||||
element = add_output_port("Element", PORT_TYPE_ANY)
|
||||
current_index = add_output_port("Index", PORT_TYPE_NUMBER)
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
/obj/item/circuit_component/ntnet_receive/populate_ports()
|
||||
data_package = add_output_port("Data Package", PORT_TYPE_LIST(PORT_TYPE_ANY))
|
||||
enc_key = add_input_port("Encryption Key", PORT_TYPE_STRING)
|
||||
RegisterSignal(src, COMSIG_COMPONENT_NTNET_RECEIVE, .proc/ntnet_receive)
|
||||
RegisterSignal(src, COMSIG_COMPONENT_NTNET_RECEIVE, PROC_REF(ntnet_receive))
|
||||
|
||||
/obj/item/circuit_component/ntnet_receive/pre_input_received(datum/port/input/port)
|
||||
if(port == list_options)
|
||||
|
||||
@@ -25,8 +25,8 @@
|
||||
|
||||
/obj/item/circuit_component/delay/populate_ports()
|
||||
delay_amount = add_input_port("Delay", PORT_TYPE_NUMBER, trigger = null)
|
||||
trigger = add_input_port("Trigger", PORT_TYPE_SIGNAL, trigger = .proc/trigger_delay)
|
||||
interrupt = add_input_port("Interrupt", PORT_TYPE_SIGNAL, trigger = .proc/interrupt_timer)
|
||||
trigger = add_input_port("Trigger", PORT_TYPE_SIGNAL, trigger = PROC_REF(trigger_delay))
|
||||
interrupt = add_input_port("Interrupt", PORT_TYPE_SIGNAL, trigger = PROC_REF(interrupt_timer))
|
||||
|
||||
output = add_output_port("Result", PORT_TYPE_SIGNAL)
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
var/delay = delay_amount.value
|
||||
if(delay > COMP_DELAY_MIN_VALUE)
|
||||
// Convert delay into deciseconds
|
||||
timer_id = addtimer(CALLBACK(output, /datum/port/output.proc/set_output, trigger.value), delay*10, TIMER_UNIQUE|TIMER_STOPPABLE|TIMER_OVERRIDE)
|
||||
timer_id = addtimer(CALLBACK(output, TYPE_PROC_REF(/datum/port/output, set_output), trigger.value), delay*10, TIMER_UNIQUE|TIMER_STOPPABLE|TIMER_OVERRIDE)
|
||||
else
|
||||
if(timer_id != TIMER_ID_NULL)
|
||||
deltimer(timer_id)
|
||||
|
||||
Reference in New Issue
Block a user