mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-25 22:12:58 +01:00
Wires Panel and Signaler Expansion (#22846)
Fleshes out wire panel skill behavior and signaler management. Electrical Engineering 4 was very OP for revealing all wire labels of all machines, and it was super fun while it lasted. Wire panels now have associated skills with their use, and increased skill ranks will increase the proportion of wires (chosen at random) that are easily recognizable on sight for certain types of wiring panels. **Professional:** 75% revealed **Trained:** 50% revealed **Familiar:** 30% revealed _(note: having both Electrical and Mechanical engineering at least Trained gives you that baseline 30%, reflecting how your knowledge can probably translate to decent guesswork.)_ The following wire panels are affected: **Electrical Engineering:** - APCs - Cameras - IFF Beacons - Radios - Smartfridges - SMES Units **Mechanical Engineering** - Airlocks - Disposal Units - Fabricators - Vending Machines **Atmospherics Systems** - Air Alarms **Reactor Systems** - Particle Accelerator Control Boxes (lol) **Robotics** - Hardsuits - Suit Storage Units (sharing the love is all) - Robots - Tag Scanners **Xenobiology** - Stasis Cages Also, I made it possible to blow out all the lights in an APC's area by snipping the power regulator cable and then pulsing the lights wire. Great for signalers. Speaking of signalers, new app deployed to all Engineering, Research, and Robotics personal modular computers: <img width="816" height="722" alt="Screenshot 2026-07-14 144049" src="https://github.com/user-attachments/assets/3d588712-ebfd-47ac-b699-7cdac2c04907" /> Self-explanatory. Please only use corporate-provided software for behavior within your contract regulations.
This commit is contained in:
Batrachophreno
@@ -55,6 +55,7 @@ ABSTRACT_TYPE(/datum/modular_computer_app_presets)
|
||||
/datum/computer_file/program/camera_monitor,\
|
||||
/datum/computer_file/program/lighting_control,\
|
||||
/datum/computer_file/program/fusion_codex,\
|
||||
/datum/computer_file/program/signaler,\
|
||||
)
|
||||
|
||||
#define COMPUTER_APP_PRESET_HORIZON_MEDICAL list(\
|
||||
@@ -71,6 +72,7 @@ ABSTRACT_TYPE(/datum/modular_computer_app_presets)
|
||||
/datum/computer_file/program/scanner/science,\
|
||||
/datum/computer_file/program/scanner/gas,\
|
||||
/datum/computer_file/program/away_manifest,\
|
||||
/datum/computer_file/program/signaler,\
|
||||
)
|
||||
|
||||
#define COMPUTER_APP_PRESET_HORIZON_SECURITY list(\
|
||||
|
||||
@@ -294,7 +294,7 @@
|
||||
|
||||
/datum/modular_computer_app_presets/supply/machinist/New()
|
||||
. = ..()
|
||||
program_list += list(/datum/computer_file/program/records/medical, /datum/computer_file/program/scanner/science, /datum/computer_file/program/robotics)
|
||||
program_list += list(/datum/computer_file/program/records/medical, /datum/computer_file/program/scanner/science, /datum/computer_file/program/robotics, /datum/computer_file/program/signaler)
|
||||
//Machinist is the bastard child of supply/operation, it doesn't have access to shit essentially
|
||||
program_list -= list(/datum/computer_file/program/civilian/cargocontrol, /datum/computer_file/program/civilian/cargodelivery, /datum/computer_file/program/away_manifest)
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
program_icon_state = "medcomp"
|
||||
program_key_icon_state = "teal_key"
|
||||
extended_desc = "Useful program to reference reaction chains for nuclear fusion reactors."
|
||||
size = 14
|
||||
size = 4
|
||||
requires_access_to_run = PROGRAM_ACCESS_LIST_ONE
|
||||
required_access_run = list(ACCESS_ENGINE)
|
||||
required_access_download = list(ACCESS_ENGINE)
|
||||
|
||||
@@ -0,0 +1,249 @@
|
||||
#define NTOS_SIGNALER_CHANNEL_COUNT 8
|
||||
#define NTOS_SIGNALER_RECEIVE_CHANNELS 2
|
||||
#define NTOS_SIGNALER_DEFAULT_FREQUENCY 1457
|
||||
#define NTOS_SIGNALER_DEFAULT_CODE 30
|
||||
#define NTOS_SIGNALER_MAX_LABEL_LENGTH 24
|
||||
|
||||
/datum/computer_file/program/signaler
|
||||
filename = "signaler"
|
||||
filedesc = "Signal Manager"
|
||||
extended_desc = "This program configures signaler-capable network cards for receiving and sending signals on custom frequencies."
|
||||
program_icon_state = "generic"
|
||||
program_key_icon_state = "green_key"
|
||||
color = LIGHT_COLOR_GREEN
|
||||
size = 1
|
||||
requires_ntnet = FALSE
|
||||
available_on_ntnet = TRUE
|
||||
usage_flags = PROGRAM_ALL_REGULAR
|
||||
tgui_id = "NTOSSignaler"
|
||||
|
||||
var/list/signal_configurations = list()
|
||||
|
||||
/datum/computer_file/program/signaler/New(obj/item/modular_computer/comp)
|
||||
. = ..()
|
||||
ensure_signal_configurations()
|
||||
|
||||
/datum/computer_file/program/signaler/clone(var/rename = FALSE, var/computer)
|
||||
ensure_signal_configurations()
|
||||
var/datum/computer_file/program/signaler/signaler_clone = ..(rename, computer)
|
||||
signaler_clone.signal_configurations = list()
|
||||
for(var/list/configuration in signal_configurations)
|
||||
signaler_clone.signal_configurations += list(configuration.Copy())
|
||||
return signaler_clone
|
||||
|
||||
/datum/computer_file/program/signaler/run_program(var/mob/user)
|
||||
if(!..())
|
||||
return FALSE
|
||||
sync_receive_radios()
|
||||
return TRUE
|
||||
|
||||
/datum/computer_file/program/signaler/ui_data(mob/user)
|
||||
ensure_signal_configurations()
|
||||
sync_receive_radios()
|
||||
|
||||
var/list/data = initial_data()
|
||||
data["hardware_ready"] = !!get_signaler_card()
|
||||
data["hardware_status"] = get_hardware_status()
|
||||
data["min_frequency"] = RADIO_LOW_FREQ
|
||||
data["max_frequency"] = RADIO_HIGH_FREQ
|
||||
data["receive_channels"] = NTOS_SIGNALER_RECEIVE_CHANNELS
|
||||
data["silent"] = silent
|
||||
data["channels"] = list()
|
||||
|
||||
for(var/i = 1 to NTOS_SIGNALER_CHANNEL_COUNT)
|
||||
var/list/configuration = signal_configurations[i]
|
||||
data["channels"] += list(list(
|
||||
"index" = i,
|
||||
"label" = configuration["label"],
|
||||
"frequency" = configuration["frequency"],
|
||||
"code" = configuration["code"],
|
||||
"receiving" = i <= NTOS_SIGNALER_RECEIVE_CHANNELS,
|
||||
"receiving_enabled" = configuration["receiving_enabled"],
|
||||
"last_received_code" = configuration["last_received_code"],
|
||||
"last_received_time" = configuration["last_received_time"]
|
||||
))
|
||||
|
||||
return data
|
||||
|
||||
/datum/computer_file/program/signaler/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
|
||||
if(..())
|
||||
return TRUE
|
||||
|
||||
if(action == "toggle_silent")
|
||||
silent = !silent
|
||||
. = TRUE
|
||||
return
|
||||
|
||||
ensure_signal_configurations()
|
||||
var/channel_index = clamp(round(text2num(params["index"])), 1, NTOS_SIGNALER_CHANNEL_COUNT)
|
||||
var/list/configuration = signal_configurations[channel_index]
|
||||
if(!configuration)
|
||||
return TRUE
|
||||
|
||||
switch(action)
|
||||
if("rename")
|
||||
var/new_label = tgui_input_text(usr, "Enter a new label for this [channel_index <= NTOS_SIGNALER_RECEIVE_CHANNELS ? "receiver" : "signaler"].", "Rename Signal", configuration["label"], NTOS_SIGNALER_MAX_LABEL_LENGTH)
|
||||
if(isnull(new_label))
|
||||
return TRUE
|
||||
new_label = sanitize(new_label, NTOS_SIGNALER_MAX_LABEL_LENGTH)
|
||||
configuration["label"] = length(new_label) ? new_label : default_label(channel_index)
|
||||
. = TRUE
|
||||
if("frequency")
|
||||
configuration["frequency"] = clean_frequency(text2num(params["frequency"]))
|
||||
if(channel_index <= NTOS_SIGNALER_RECEIVE_CHANNELS)
|
||||
sync_receive_radios()
|
||||
. = TRUE
|
||||
if("toggle_receive")
|
||||
if(channel_index <= NTOS_SIGNALER_RECEIVE_CHANNELS)
|
||||
configuration["receiving_enabled"] = !configuration["receiving_enabled"]
|
||||
if(!configuration["receiving_enabled"])
|
||||
configuration["last_received_code"] = null
|
||||
configuration["last_received_time"] = null
|
||||
sync_receive_radios()
|
||||
. = TRUE
|
||||
if("code")
|
||||
if(channel_index > NTOS_SIGNALER_RECEIVE_CHANNELS)
|
||||
configuration["code"] = clamp(round(text2num(params["code"])), 1, 100)
|
||||
. = TRUE
|
||||
if("reset")
|
||||
configuration["frequency"] = NTOS_SIGNALER_DEFAULT_FREQUENCY
|
||||
configuration["code"] = NTOS_SIGNALER_DEFAULT_CODE
|
||||
if(channel_index <= NTOS_SIGNALER_RECEIVE_CHANNELS)
|
||||
configuration["receiving_enabled"] = FALSE
|
||||
configuration["last_received_code"] = null
|
||||
configuration["last_received_time"] = null
|
||||
sync_receive_radios()
|
||||
. = TRUE
|
||||
if("send")
|
||||
if(channel_index > NTOS_SIGNALER_RECEIVE_CHANNELS)
|
||||
send_signal(channel_index, usr)
|
||||
. = TRUE
|
||||
|
||||
/datum/computer_file/program/signaler/proc/ensure_signal_configurations()
|
||||
for(var/i = 1 to min(length(signal_configurations), NTOS_SIGNALER_CHANNEL_COUNT))
|
||||
var/list/configuration = signal_configurations[i]
|
||||
if(!configuration)
|
||||
continue
|
||||
if(isnull(configuration["receiving_enabled"]))
|
||||
configuration["receiving_enabled"] = FALSE
|
||||
|
||||
for(var/i = length(signal_configurations) + 1 to NTOS_SIGNALER_CHANNEL_COUNT)
|
||||
signal_configurations += list(list(
|
||||
"label" = default_label(i),
|
||||
"frequency" = NTOS_SIGNALER_DEFAULT_FREQUENCY,
|
||||
"code" = NTOS_SIGNALER_DEFAULT_CODE,
|
||||
"receiving_enabled" = FALSE,
|
||||
"last_received_code" = null,
|
||||
"last_received_time" = null
|
||||
))
|
||||
|
||||
/datum/computer_file/program/signaler/proc/default_label(var/channel_index)
|
||||
if(channel_index <= NTOS_SIGNALER_RECEIVE_CHANNELS)
|
||||
return "Receiver [channel_index]"
|
||||
return "Signal [channel_index - NTOS_SIGNALER_RECEIVE_CHANNELS]"
|
||||
|
||||
/datum/computer_file/program/signaler/proc/clean_frequency(var/frequency)
|
||||
if(!isnum(frequency))
|
||||
frequency = NTOS_SIGNALER_DEFAULT_FREQUENCY
|
||||
frequency = sanitize_frequency(frequency, RADIO_LOW_FREQ, RADIO_HIGH_FREQ)
|
||||
if(frequency > RADIO_HIGH_FREQ)
|
||||
frequency = RADIO_HIGH_FREQ - 1
|
||||
return frequency
|
||||
|
||||
/datum/computer_file/program/signaler/proc/get_signaler_card()
|
||||
if(!computer?.network_card)
|
||||
return null
|
||||
var/obj/item/computer_hardware/network_card/network_card = computer.network_card
|
||||
if(!network_card.enabled || !network_card.check_functionality() || !network_card.sradio)
|
||||
return null
|
||||
return network_card
|
||||
|
||||
/datum/computer_file/program/signaler/proc/get_hardware_status()
|
||||
if(!computer?.network_card)
|
||||
return "No network card detected."
|
||||
var/obj/item/computer_hardware/network_card/network_card = computer.network_card
|
||||
if(!network_card.sradio)
|
||||
return "Installed network card does not support signaling."
|
||||
if(!network_card.enabled)
|
||||
return "Signaler network card is disabled."
|
||||
if(!network_card.check_functionality())
|
||||
return "Signaler network card is damaged."
|
||||
return "Ready."
|
||||
|
||||
/datum/computer_file/program/signaler/proc/sync_receive_radios()
|
||||
var/obj/item/computer_hardware/network_card/network_card = get_signaler_card()
|
||||
if(!network_card)
|
||||
return FALSE
|
||||
|
||||
for(var/i = 1 to NTOS_SIGNALER_RECEIVE_CHANNELS)
|
||||
var/obj/item/integrated_signaler/signal/radio = network_card.get_signaler_radio(i)
|
||||
var/list/configuration = signal_configurations[i]
|
||||
if(radio && configuration)
|
||||
if(configuration["receiving_enabled"])
|
||||
radio.set_frequency(configuration["frequency"])
|
||||
radio.set_listening(TRUE)
|
||||
else
|
||||
radio.set_listening(FALSE)
|
||||
|
||||
return TRUE
|
||||
|
||||
/datum/computer_file/program/signaler/proc/send_signal(var/channel_index, var/mob/user)
|
||||
var/obj/item/computer_hardware/network_card/network_card = get_signaler_card()
|
||||
if(!network_card)
|
||||
computer?.output_error(FONT_SMALL(SPAN_WARNING("Hardware Error - Signaler network card unavailable.")))
|
||||
return FALSE
|
||||
|
||||
var/list/configuration = signal_configurations[channel_index]
|
||||
if(!configuration)
|
||||
return FALSE
|
||||
|
||||
var/obj/item/integrated_signaler/signal/radio = network_card.get_signaler_radio(0)
|
||||
if(!radio)
|
||||
return FALSE
|
||||
|
||||
var/old_frequency = radio.frequency
|
||||
var/old_code = radio.code
|
||||
|
||||
radio.set_frequency(configuration["frequency"])
|
||||
radio.code = configuration["code"]
|
||||
var/sent = radio.send_signal("ACTIVATE", user)
|
||||
radio.code = old_code
|
||||
radio.set_frequency(old_frequency)
|
||||
|
||||
if(sent)
|
||||
computer?.output_notice("Signal sent on [format_frequency(configuration["frequency"])]/[configuration["code"]].", 0)
|
||||
else
|
||||
computer?.output_error(FONT_SMALL(SPAN_WARNING("Unable to send signal. The transmitter may be cooling down or jammed.")))
|
||||
|
||||
return sent
|
||||
|
||||
/datum/computer_file/program/signaler/proc/receive_signal(var/channel_index, var/datum/signal/signal)
|
||||
if(channel_index < 1 || channel_index > NTOS_SIGNALER_RECEIVE_CHANNELS)
|
||||
return FALSE
|
||||
|
||||
ensure_signal_configurations()
|
||||
var/list/configuration = signal_configurations[channel_index]
|
||||
if(!configuration)
|
||||
return FALSE
|
||||
if(!configuration["receiving_enabled"])
|
||||
return FALSE
|
||||
|
||||
configuration["last_received_code"] = signal.encryption
|
||||
configuration["last_received_time"] = worldtime2text()
|
||||
|
||||
if(computer)
|
||||
var/received_message = "Signal received on [configuration["label"]]: [isnull(signal.encryption) ? "no code" : signal.encryption]."
|
||||
if(silent)
|
||||
computer.output_notice(received_message, 0)
|
||||
else
|
||||
playsound(get_turf(computer), 'sound/machines/twobeep.ogg', 20, 1)
|
||||
computer.audible_message("[icon2html(computer, viewers(1, get_turf(computer)))] [computer] beeps, \"[received_message]\"")
|
||||
|
||||
SStgui.update_uis(src)
|
||||
return TRUE
|
||||
|
||||
#undef NTOS_SIGNALER_CHANNEL_COUNT
|
||||
#undef NTOS_SIGNALER_RECEIVE_CHANNELS
|
||||
#undef NTOS_SIGNALER_DEFAULT_FREQUENCY
|
||||
#undef NTOS_SIGNALER_DEFAULT_CODE
|
||||
#undef NTOS_SIGNALER_MAX_LABEL_LENGTH
|
||||
Reference in New Issue
Block a user