shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into semi-sync

Browse Source
This commit is contained in:
Letter N
2020-12-21 21:19:06 +08:00
parent 2966f985a3 ce3cfca619
commit abd94d1c03
189 changed files with 10453 additions and 8486 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/integrated_electronics/core/helpers.dm
View File

@@ -32,7 +32,10 @@
/obj/item/integrated_circuit/proc/get_pin_data(pin_type, pin_number)
var/datum/integrated_io/pin = get_pin_ref(pin_type, pin_number)
return pin.get_data()
var/data = pin.get_data()
if(istext(data))
data = sanitize_text(data)
return data
/obj/item/integrated_circuit/proc/get_pin_data_as_type(pin_type, pin_number, as_type)
var/datum/integrated_io/pin = get_pin_ref(pin_type, pin_number)

10
code/modules/integrated_electronics/core/saved_circuits.dm
View File

@@ -91,7 +91,7 @@
/obj/item/integrated_circuit/proc/load(list/component_params)
// Load name
if(component_params["name"])
displayed_name = component_params["name"]
displayed_name = html_encode(component_params["name"])
// Load input values
if(component_params["inputs"])
@@ -104,7 +104,7 @@
var/datum/integrated_io/pin = inputs[index]
// The pins themselves validate the data.
pin.write_data_to_pin(input_value)
pin.write_data_to_pin(istext(input_value)? html_encode(input_value) : input_value)
// TODO: support for special input types, such as internal refs and maybe typepaths
if(!isnull(component_params["special"]))
@@ -152,19 +152,17 @@
/obj/item/electronic_assembly/proc/load(list/assembly_params)
// Load modified name, if any.
if(assembly_params["name"])
name = assembly_params["name"]
name = html_encode(assembly_params["name"])
// Load modified description, if any.
if(assembly_params["desc"])
desc = assembly_params["desc"]
desc = html_encode(assembly_params["desc"])
if(assembly_params["detail_color"])
detail_color = assembly_params["detail_color"]
update_icon()
// Attempts to save an assembly into a save file format.
// Returns null if assembly is not complete enough to be saved.
/datum/controller/subsystem/processing/circuit/proc/save_electronic_assembly(obj/item/electronic_assembly/assembly)