Circuit Labels (sorta understanding git edition) (#37633)

* Customizable circuit names/descriptions

* Circuit descriptions are now copied

* Prevents code injection through the desc
This commit is contained in:
r-esistor
2018-05-21 03:10:35 -04:00
committed by letterjay
parent 6963275d45
commit 63e472050c
2 changed files with 11 additions and 1 deletions
@@ -3,7 +3,7 @@
/obj/item/electronic_assembly
name = "electronic assembly"
obj_flags = CAN_BE_HIT
obj_flags = CAN_BE_HIT | UNIQUE_RENAME
desc = "It's a case, for building small electronics with."
w_class = WEIGHT_CLASS_SMALL
icon = 'icons/obj/assemblies/electronic_setups.dmi'
@@ -124,6 +124,10 @@
// Save modified name
if(initial(name) != name)
assembly_params["name"] = name
// Save modified description
if(initial(desc) != desc)
assembly_params["desc"] = desc
// Save panel status
if(opened)
@@ -142,6 +146,8 @@
// Validate name and color
if(assembly_params["name"] && !reject_bad_name(assembly_params["name"], TRUE))
return "Bad assembly name."
if(assembly_params["desc"] && !reject_bad_text(assembly_params["desc"], TRUE))
return "Bad assembly description."
if(assembly_params["detail_color"] && !(assembly_params["detail_color"] in color_whitelist))
return "Bad assembly color."
@@ -151,6 +157,10 @@
// Load modified name, if any.
if(assembly_params["name"])
name = assembly_params["name"]
// Load modified description, if any.
if(assembly_params["desc"])
desc = assembly_params["desc"]
// Load panel status
if(assembly_params["opened"])