From 56f8d3650fac99ca6720e50c3b9c1575724493f2 Mon Sep 17 00:00:00 2001 From: Mothblocks <35135081+Mothblocks@users.noreply.github.com> Date: Fri, 13 Aug 2021 12:15:03 -0700 Subject: [PATCH] Fix merge skew from NTNet components (#60845) --- .../wiremod/components/ntnet/ntnet_reciever.dm | 6 +++--- .../wiremod/components/ntnet/ntnet_request.dm | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/code/modules/wiremod/components/ntnet/ntnet_reciever.dm b/code/modules/wiremod/components/ntnet/ntnet_reciever.dm index a84ece8610e..9539e214103 100644 --- a/code/modules/wiremod/components/ntnet/ntnet_reciever.dm +++ b/code/modules/wiremod/components/ntnet/ntnet_reciever.dm @@ -45,15 +45,15 @@ return if(COMPONENT_TRIGGERED_BY(data_type_options, port)) - data_package.set_datatype(data_type_options.input_value) + data_package.set_datatype(data_type_options.value) if(COMPONENT_TRIGGERED_BY(secondary_data_type_options, port)) - secondary_package.set_datatype(secondary_data_type_options.input_value) + secondary_package.set_datatype(secondary_data_type_options.value) /obj/item/circuit_component/ntnet_receive/proc/ntnet_receive(datum/source, datum/netdata/data) SIGNAL_HANDLER - if(data.data["enc_key"] != enc_key.input_value) + if(data.data["enc_key"] != enc_key.value) return data_package.set_output(data.data["data"]) diff --git a/code/modules/wiremod/components/ntnet/ntnet_request.dm b/code/modules/wiremod/components/ntnet/ntnet_request.dm index c71b6091ce2..0c834978593 100644 --- a/code/modules/wiremod/components/ntnet/ntnet_request.dm +++ b/code/modules/wiremod/components/ntnet/ntnet_request.dm @@ -24,14 +24,14 @@ /obj/item/circuit_component/ntnet_send/input_received(datum/port/input/port) . = ..() - if(. || !data_package.input_value) + if(. || !data_package.value) return - var/list/datalist = list("data" = data_package.input_value) - if(secondary_package.input_value) - datalist["data_secondary"] = secondary_package.input_value - if(enc_key.input_value) - datalist["enc_key"] = enc_key.input_value + var/list/datalist = list("data" = data_package.value) + if(secondary_package.value) + datalist["data_secondary"] = secondary_package.value + if(enc_key.value) + datalist["enc_key"] = enc_key.value var/datum/netdata/data = new(datalist) data.receiver_id = __NETWORK_CIRCUITS ntnet_send(data)