From eaa98e87d1e8e58ae9f3114f495a0787f084182f Mon Sep 17 00:00:00 2001 From: Timberpoes Date: Tue, 4 Aug 2020 04:57:43 +0100 Subject: [PATCH] Updates wire datum proper_name vars (#52679) * New wire proper_names * Update comment. --- code/datums/wires/_wires.dm | 2 +- code/datums/wires/airlock.dm | 1 + code/datums/wires/conveyor.dm | 2 +- code/datums/wires/emitter.dm | 1 + code/datums/wires/explosive.dm | 1 + code/datums/wires/mulebot.dm | 1 + code/datums/wires/r_n_d.dm | 1 + code/datums/wires/robot.dm | 1 + code/datums/wires/syndicatebomb.dm | 1 + code/datums/wires/tesla_coil.dm | 4 ++-- 10 files changed, 11 insertions(+), 4 deletions(-) diff --git a/code/datums/wires/_wires.dm b/code/datums/wires/_wires.dm index 5c433e150c6..dfcb73dce52 100644 --- a/code/datums/wires/_wires.dm +++ b/code/datums/wires/_wires.dm @@ -26,7 +26,7 @@ var/holder_type = null /// Key that enables wire assignments to be common across different holders. If null, will use the holder_type as a key. var/dictionary_key = null - /// The display name for the wire set shown in station blueprints. Not used if randomize is true or it's an item NT wouldn't know about (Explosives/Nuke) + /// The display name for the wire set shown in station blueprints. Not shown in blueprints if randomize is TRUE or it's an item NT wouldn't know about (Explosives/Nuke). Also used in the hacking interface. var/proper_name = "Unknown" /// List of all wires. diff --git a/code/datums/wires/airlock.dm b/code/datums/wires/airlock.dm index 95db19e6331..d67d2c04edb 100644 --- a/code/datums/wires/airlock.dm +++ b/code/datums/wires/airlock.dm @@ -3,6 +3,7 @@ proper_name = "Generic Airlock" /datum/wires/airlock/secure + proper_name = "High Security Airlock" randomize = TRUE /datum/wires/airlock/maint diff --git a/code/datums/wires/conveyor.dm b/code/datums/wires/conveyor.dm index 0e82fb13cfb..6aa9ad28854 100644 --- a/code/datums/wires/conveyor.dm +++ b/code/datums/wires/conveyor.dm @@ -1,6 +1,6 @@ /datum/wires/conveyor holder_type = /obj/machinery/conveyor_switch - proper_name = "conveyor" + proper_name = "Conveyor" /// var holder that logs who put the assembly inside and gets transfered to the switch on pulse var/mob/fingerman diff --git a/code/datums/wires/emitter.dm b/code/datums/wires/emitter.dm index d0e1352c0ef..2dd8cba79b6 100644 --- a/code/datums/wires/emitter.dm +++ b/code/datums/wires/emitter.dm @@ -1,6 +1,7 @@ /datum/wires/emitter holder_type = /obj/machinery/power/emitter + proper_name = "Emitter" /datum/wires/emitter/New(atom/holder) wires = list(WIRE_ZAP,WIRE_HACK) diff --git a/code/datums/wires/explosive.dm b/code/datums/wires/explosive.dm index e3f73d287b7..db5e6a1d6ae 100644 --- a/code/datums/wires/explosive.dm +++ b/code/datums/wires/explosive.dm @@ -1,5 +1,6 @@ /datum/wires/explosive var/duds_number = 2 // All "dud" wires cause an explosion when cut or pulsed + proper_name = "Explosive Device" randomize = TRUE // Prevents wires from showing up on blueprints /datum/wires/explosive/New(atom/holder) diff --git a/code/datums/wires/mulebot.dm b/code/datums/wires/mulebot.dm index 08a10afbfca..60721e9c449 100644 --- a/code/datums/wires/mulebot.dm +++ b/code/datums/wires/mulebot.dm @@ -1,5 +1,6 @@ /datum/wires/mulebot holder_type = /mob/living/simple_animal/bot/mulebot + proper_name = "Mulebot" randomize = TRUE /datum/wires/mulebot/New(atom/holder) diff --git a/code/datums/wires/r_n_d.dm b/code/datums/wires/r_n_d.dm index ea61c1779ef..eda9a2776e9 100644 --- a/code/datums/wires/r_n_d.dm +++ b/code/datums/wires/r_n_d.dm @@ -1,5 +1,6 @@ /datum/wires/rnd holder_type = /obj/machinery/rnd + proper_name = "R&D Machinery" randomize = TRUE /datum/wires/rnd/New(atom/holder) diff --git a/code/datums/wires/robot.dm b/code/datums/wires/robot.dm index febb3d0ce2e..0a5a1ef74da 100644 --- a/code/datums/wires/robot.dm +++ b/code/datums/wires/robot.dm @@ -1,5 +1,6 @@ /datum/wires/robot holder_type = /mob/living/silicon/robot + proper_name = "Cyborg" randomize = TRUE /datum/wires/robot/New(atom/holder) diff --git a/code/datums/wires/syndicatebomb.dm b/code/datums/wires/syndicatebomb.dm index 8732a0a21d7..32a7739b36d 100644 --- a/code/datums/wires/syndicatebomb.dm +++ b/code/datums/wires/syndicatebomb.dm @@ -1,5 +1,6 @@ /datum/wires/syndicatebomb holder_type = /obj/machinery/syndicatebomb + proper_name = "Syndicate Explosive Device" randomize = TRUE /datum/wires/syndicatebomb/New(atom/holder) diff --git a/code/datums/wires/tesla_coil.dm b/code/datums/wires/tesla_coil.dm index fa858a9a8ff..a924548f0b9 100644 --- a/code/datums/wires/tesla_coil.dm +++ b/code/datums/wires/tesla_coil.dm @@ -1,6 +1,6 @@ - /datum/wires/tesla_coil - randomize = 1 //Only one wire don't need blueprints + proper_name = "Tesla Coil" + randomize = TRUE //Only one wire don't need blueprints holder_type = /obj/machinery/power/tesla_coil /datum/wires/tesla_coil/New(atom/holder)