diff --git a/code/datums/wires/alarm.dm b/code/datums/wires/alarm.dm index 82bbd3ae221..30e3a602e28 100644 --- a/code/datums/wires/alarm.dm +++ b/code/datums/wires/alarm.dm @@ -3,6 +3,16 @@ holder_type = /obj/machinery/alarm wire_count = 5 +/datum/wires/alarm/New() + wire_names=list( + "[AALARM_WIRE_IDSCAN]" = "ID scan", + "[AALARM_WIRE_POWER]" = "Power", + "[AALARM_WIRE_SYPHON]" = "Syphon", + "[AALARM_WIRE_AI_CONTROL]" = "AI Control", + "[AALARM_WIRE_AALARM]" = "Alarm" + ) + ..() + var/const/AALARM_WIRE_IDSCAN = 1 var/const/AALARM_WIRE_POWER = 2 var/const/AALARM_WIRE_SYPHON = 4 diff --git a/code/datums/wires/apc.dm b/code/datums/wires/apc.dm index 96075d5941f..b0a6dd6ca44 100644 --- a/code/datums/wires/apc.dm +++ b/code/datums/wires/apc.dm @@ -2,6 +2,15 @@ holder_type = /obj/machinery/power/apc wire_count = 4 +/datum/wires/apc/New() + wire_names=list( + "[APC_WIRE_IDSCAN]" = "ID scan", + "[APC_WIRE_MAIN_POWER1]" = "Power 1", + "[APC_WIRE_MAIN_POWER2]" = "Power 2", + "[APC_WIRE_AI_CONTROL]" = "AI Control" + ) + ..() + var/const/APC_WIRE_IDSCAN = 1 var/const/APC_WIRE_MAIN_POWER1 = 2 var/const/APC_WIRE_MAIN_POWER2 = 4 @@ -75,4 +84,4 @@ var/const/APC_WIRE_AI_CONTROL = 8 else if (A.aidisabled == 1) A.aidisabled = 0 - A.updateDialog() \ No newline at end of file + A.updateDialog() diff --git a/code/datums/wires/camera.dm b/code/datums/wires/camera.dm index 9c87adb95b7..022ff084c94 100644 --- a/code/datums/wires/camera.dm +++ b/code/datums/wires/camera.dm @@ -5,6 +5,17 @@ holder_type = /obj/machinery/camera wire_count = 6 +/datum/wires/camera/New() + wire_names=list( + "[CAMERA_WIRE_FOCUS]" = "Focus", + "[CAMERA_WIRE_POWER]" = "Power", + "[CAMERA_WIRE_LIGHT]" = "Camera Lights", + "[CAMERA_WIRE_ALARM]" = "Alarm", + "[CAMERA_WIRE_NOTHING1]" = "Nothing 1", + "[CAMERA_WIRE_NOTHING2]" = "Nothing 2" + ) + ..() + /datum/wires/camera/GetInteractWindow() . = ..() @@ -73,4 +84,4 @@ var/const/CAMERA_WIRE_NOTHING2 = 32 if(IsIndexCut(CAMERA_WIRE_POWER) && IsIndexCut(CAMERA_WIRE_FOCUS) && IsIndexCut(CAMERA_WIRE_LIGHT) && IsIndexCut(CAMERA_WIRE_NOTHING1) && IsIndexCut(CAMERA_WIRE_NOTHING2)) return 1 else - return 0 \ No newline at end of file + return 0 diff --git a/code/datums/wires/jukebox.dm b/code/datums/wires/jukebox.dm index 5ef80101431..162e1d865ee 100644 --- a/code/datums/wires/jukebox.dm +++ b/code/datums/wires/jukebox.dm @@ -14,6 +14,17 @@ freq_config_data[JUKE_POWER_TWO] = rand(1,14) freq_config_data[JUKE_POWER_THREE] = rand(1,14) + wire_names=list( + "[JUKE_POWER_ONE]" = "Power 1", + "[JUKE_POWER_TWO]" = "Power 2", + "[JUKE_POWER_THREE]" = "Power 3", + "[JUKE_SHUFFLE]" = "Shuffle", + "[JUKE_CAPITAL]" = "Capital", + "[JUKE_TRANSMIT]" = "Transmit", + "[JUKE_CONFIG]" = "Config", + "[JUKE_SETTING]" = "Settings" + ) + var/const/JUKE_POWER_ONE = 1 //Power. Cut for shock and off. Pulse toggles. var/const/JUKE_POWER_TWO = 2 //Power. Cut for shock and off. Pulse toggles. var/const/JUKE_POWER_THREE = 4 //Power. Cut for shock and off. Pulse toggles. diff --git a/code/datums/wires/mulebot.dm b/code/datums/wires/mulebot.dm index 5ebbc58edc0..9e875bcc489 100644 --- a/code/datums/wires/mulebot.dm +++ b/code/datums/wires/mulebot.dm @@ -3,6 +3,20 @@ holder_type = /obj/machinery/bot/mulebot wire_count = 10 +/datum/wires/mulebot/New() + wire_names=list( + "[WIRE_POWER1]" = "Power 1", + "[WIRE_POWER2]" = "Power 2", + "[WIRE_AVOIDANCE]" = "Avoidance", + "[WIRE_LOADCHECK]" = "Load Check", + "[WIRE_MOTOR1]" = "Motor 1", + "[WIRE_MOTOR2]" = "Motor 2", + "[WIRE_REMOTE_RX]" = "Remote RX", + "[WIRE_REMOTE_TX]" = "Remote TX", + "[WIRE_BEACON_RX]" = "Beacon RX" + ) + ..() + var/const/WIRE_POWER1 = 1 // power connections var/const/WIRE_POWER2 = 2 var/const/WIRE_AVOIDANCE = 4 // mob avoidance @@ -69,4 +83,4 @@ var/const/WIRE_BEACON_RX = 256 // beacon ping recv return !(wires_status & WIRE_REMOTE_RX) /datum/wires/mulebot/proc/BeaconRX() - return !(wires_status & WIRE_BEACON_RX) \ No newline at end of file + return !(wires_status & WIRE_BEACON_RX) diff --git a/code/datums/wires/particle_accelerator.dm b/code/datums/wires/particle_accelerator.dm index cfd1c47e18b..e8d07514927 100644 --- a/code/datums/wires/particle_accelerator.dm +++ b/code/datums/wires/particle_accelerator.dm @@ -2,6 +2,15 @@ wire_count = 5 holder_type = /obj/machinery/particle_accelerator/control_box +/datum/wires/particle_acc/control_box/New() + wire_names=list( + "[PARTICLE_TOGGLE_WIRE]" = "Toggle", + "[PARTICLE_STRENGTH_WIRE]" = "Strength", + "[PARTICLE_INTERFACE_WIRE]" = "Interface", + "[PARTICLE_LIMIT_POWER_WIRE]" = "Power Limit" + ) + ..() + var/const/PARTICLE_TOGGLE_WIRE = 1 // Toggles whether the PA is on or not. var/const/PARTICLE_STRENGTH_WIRE = 2 // Determines the strength of the PA. var/const/PARTICLE_INTERFACE_WIRE = 4 // Determines the interface showing up. @@ -54,4 +63,4 @@ var/const/PARTICLE_LIMIT_POWER_WIRE = 8 // Determines how strong the PA can be. if(PARTICLE_LIMIT_POWER_WIRE) C.strength_upper_limit = (mended ? 2 : 3) if(C.strength_upper_limit < C.strength) - C.remove_strength() \ No newline at end of file + C.remove_strength() diff --git a/code/datums/wires/radio.dm b/code/datums/wires/radio.dm index a8171270008..4e7bc07d5cc 100644 --- a/code/datums/wires/radio.dm +++ b/code/datums/wires/radio.dm @@ -2,6 +2,14 @@ holder_type = /obj/item/device/radio wire_count = 3 +/datum/wires/radio/New() + wire_names=list( + "[WIRE_SIGNAL]" = "Signal", + "[WIRE_RECEIVE]" = "Receive", + "[WIRE_TRANSMIT]" = "Transmit" + ) + ..() + var/const/WIRE_SIGNAL = 1 var/const/WIRE_RECEIVE = 2 var/const/WIRE_TRANSMIT = 4 @@ -28,4 +36,4 @@ var/const/WIRE_TRANSMIT = 4 R.listening = !R.listening if(WIRE_TRANSMIT) - R.broadcasting = !R.broadcasting \ No newline at end of file + R.broadcasting = !R.broadcasting diff --git a/code/datums/wires/rnd_wires.dm b/code/datums/wires/rnd_wires.dm index b31e884101d..830aed9e044 100644 --- a/code/datums/wires/rnd_wires.dm +++ b/code/datums/wires/rnd_wires.dm @@ -2,6 +2,13 @@ holder_type = /obj/machinery/r_n_d wire_count = 5 +/datum/wires/rnd/New() + wire_names=list( + "[RND_WIRE_DISABLE]" = "Disable", + "[RND_WIRE_SHOCK]" = "Shock", + "[RND_WIRE_HACK]" = "Hack" + ) + ..() var/const/RND_WIRE_DISABLE = 1 var/const/RND_WIRE_SHOCK = 2 diff --git a/code/datums/wires/robot.dm b/code/datums/wires/robot.dm index 2e4606e76b2..ed17fedadaf 100644 --- a/code/datums/wires/robot.dm +++ b/code/datums/wires/robot.dm @@ -3,6 +3,16 @@ holder_type = /mob/living/silicon/robot wire_count = 5 +/datum/wires/robot/New() + wire_names=list( + "[BORG_WIRE_MAIN_POWER]" = "Power", + "[BORG_WIRE_LOCKED_DOWN]" = "Lockdown", + "[BORG_WIRE_CAMERA]" = "Camera", + "[BORG_WIRE_AI_CONTROL]" = "AI Control", + "[BORG_WIRE_LAWCHECK]" = "LawSync" + ) + ..() + /* /tg/ ordering doesn't work for us, we need lawsync at the end for MoMMIs. var/const/BORG_WIRE_LAWCHECK = 1 var/const/BORG_WIRE_MAIN_POWER = 2 // The power wires do nothing whyyyyyyyyyyyyy @@ -93,4 +103,4 @@ var/const/BORG_WIRE_LAWCHECK = 16 // Not used on MoMMIs return wires_status & BORG_WIRE_LAWCHECK /datum/wires/robot/proc/AIHasControl() - return wires_status & BORG_WIRE_AI_CONTROL \ No newline at end of file + return wires_status & BORG_WIRE_AI_CONTROL diff --git a/code/datums/wires/transmitter.dm b/code/datums/wires/transmitter.dm index ec4563ca521..5e8c8413355 100644 --- a/code/datums/wires/transmitter.dm +++ b/code/datums/wires/transmitter.dm @@ -3,6 +3,16 @@ wire_count = 5 var/counter = null +/datum/wires/transmitter/New() + wire_names=list( + "[TRANS_POWER]" = "Power", + "[TRANS_RAD_ONE]" = "Rad 1", + "[TRANS_RAD_TWO]" = "Rad 2", + "[TRANS_LINK]" = "Link", + "[TRANS_SETTINGS]" = "Settings" + ) + ..() + var/const/TRANS_POWER = 1 //Power. Cut for shock and off. Pulse toggles. var/const/TRANS_RAD_ONE = 2 //Reduces rad output by 50%. Requires at least one to function. Pulse does nothing. var/const/TRANS_RAD_TWO = 4 //Reduces rad output by 50%. Requires at least one to function. Pulse does nothing. diff --git a/code/datums/wires/vending.dm b/code/datums/wires/vending.dm index 3b4f4865119..b6223615009 100644 --- a/code/datums/wires/vending.dm +++ b/code/datums/wires/vending.dm @@ -2,6 +2,15 @@ holder_type = /obj/machinery/vending wire_count = 4 +/datum/wires/vending/New() + wire_names=list( + "[VENDING_WIRE_THROW]" = "Firing", + "[VENDING_WIRE_CONTRABAND]" = "Contraband", + "[VENDING_WIRE_ELECTRIFY]" = "Shock", + "[VENDING_WIRE_IDSCAN]" = "ID Scan" + ) + ..() + var/const/VENDING_WIRE_THROW = 1 var/const/VENDING_WIRE_CONTRABAND = 2 var/const/VENDING_WIRE_ELECTRIFY = 4 @@ -57,4 +66,4 @@ var/const/VENDING_WIRE_IDSCAN = 8 else V.seconds_electrified = -1 if(VENDING_WIRE_IDSCAN) - V.scan_id = 1 \ No newline at end of file + V.scan_id = 1 diff --git a/code/datums/wires/wires.dm b/code/datums/wires/wires.dm index 53d6e9b27c3..f89b59e5060 100644 --- a/code/datums/wires/wires.dm +++ b/code/datums/wires/wires.dm @@ -86,7 +86,8 @@ var/list/wireColours = list("red", "blue", "green", "black", "orange", "brown", popup.open() /datum/wires/proc/GetWireName(var/i) - return wire_names["[i]"] + if(wire_names.len) + return wire_names["[i]"] /datum/wires/proc/GetInteractWindow() var/html = "