cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-19 03:49:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update MC (#18112)

Browse Source 
* sdf

* fsda

* fuck

* fuck2

* toolz

* sdaf

* sdfa

* saf

* sdfa

* sdfa

* sdf

* sdfa

* temp rename

* temp rename

* temp rename

* sdaf

* the pain is immensurable in the land of byond

* the curse of rah

* safd

* sadf

* sadf

* gf

* asf

* fssdfa

* sfd

* sadf

* sfda

* brah

* brah

* it's easier for you to fix this

* ffs

* brah

* brah
This commit is contained in:
Fluffy
2024-01-06 17:03:57 +01:00
committed by GitHub
parent 8c76cfa9ea
commit e867030c2e
331 changed files with 2348 additions and 1643 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/modular_computers/file_system/programs/antagonist/hacked_camera.dm
+3 -3
View File
@@ -16,9 +16,9 @@
// The program is active and connected to one of the station's networks. Has a very small chance to trigger IDS alarm every tick.
if(current_network && (current_network in current_map.station_networks) && prob(0.1))
if(ntnet_global.intrusion_detection_enabled)
ntnet_global.add_log("IDS WARNING - Unauthorised access detected to camera network [current_network] by device with NID [computer.network_card.get_network_tag()]")
ntnet_global.intrusion_detection_alarm = TRUE
if(GLOB.ntnet_global.intrusion_detection_enabled)
GLOB.ntnet_global.add_log("IDS WARNING - Unauthorised access detected to camera network [current_network] by device with NID [computer.network_card.get_network_tag()]")
GLOB.ntnet_global.intrusion_detection_alarm = TRUE
/datum/computer_file/program/camera_monitor/hacked/can_access_network(var/mob/user, var/network_access)
return TRUE
code/modules/modular_computers/file_system/programs/engineering/lightingcontrol.dm
+1 -1
View File
@@ -28,7 +28,7 @@
// whether to only select areas explicitly marked for nightlighting
var/wl_only = context == "all" ? 0 : 1
SSnightlight.suspend()
SSnightlight.can_fire = FALSE
if (lstate == "dark")
log_and_message_admins("enabled night-mode [wl_only ? "in public areas" : "globally"].", lusr.resolve())
code/modules/modular_computers/file_system/programs/generic/news_browser.dm
+2 -2
View File
@@ -63,7 +63,7 @@
/datum/computer_file/program/newsbrowser/ui_static_data(mob/user)
var/list/data = list()
var/list/all_articles = list()
for(var/datum/computer_file/data/news_article/F in ntnet_global.available_news)
for(var/datum/computer_file/data/news_article/F in GLOB.ntnet_global.available_news)
if(!show_archived && F.archived)
continue
all_articles.Add(list(list(
@@ -84,7 +84,7 @@
if(downloading || loaded_article)
return TRUE
for(var/datum/computer_file/data/news_article/N in ntnet_global.available_news)
for(var/datum/computer_file/data/news_article/N in GLOB.ntnet_global.available_news)
if(N.uid == text2num(params["PRG_openarticle"]))
loaded_article = N.clone()
downloading = TRUE
code/modules/modular_computers/file_system/programs/generic/ntnrc_client.dm
+9 -9
View File
@@ -103,8 +103,8 @@
return
if(!(src in my_user.clients))
my_user.clients.Add(src)
if(!(src in ntnet_global.chat_clients))
ntnet_global.chat_clients.Add(src)
if(!(src in GLOB.ntnet_global.chat_clients))
GLOB.ntnet_global.chat_clients.Add(src)
computer.update_static_data_for_all_viewers()
/datum/computer_file/program/chat_client/proc/deactivate_chat_client()
@@ -112,8 +112,8 @@
return
if(src in my_user.clients)
my_user.clients.Remove(src)
if(src in ntnet_global.chat_clients)
ntnet_global.chat_clients.Remove(src)
if(src in GLOB.ntnet_global.chat_clients)
GLOB.ntnet_global.chat_clients.Remove(src)
computer.update_static_data_for_all_viewers()
/datum/computer_file/program/chat_client/proc/handle_ntnet_user_deletion(var/datum/ntnet_user)
@@ -161,7 +161,7 @@
var/list/data = list()
if(istype(my_user) && get_signal(NTNET_COMMUNICATION) && (service_state > PROGRAM_STATE_KILLED))
data["channels"] = list()
for(var/c in ntnet_global.chat_channels)
for(var/c in GLOB.ntnet_global.chat_channels)
var/datum/ntnet_conversation/channel = c
if(istype(channel) && (channel.can_see(src)))
var/ref = text_ref(channel)
@@ -184,7 +184,7 @@
data["channels"] += list(our_channel)
data["users"] = list()
for(var/u in ntnet_global.chat_users)
for(var/u in GLOB.ntnet_global.chat_users)
var/datum/ntnet_user/ntnet_user = u
if(ntnet_user != my_user)
data["users"] += list(list("ref" = text_ref(ntnet_user), "username" = ntnet_user.username))
@@ -298,21 +298,21 @@
. = TRUE
if(action == "new_channel")
ntnet_global.begin_conversation(src, sanitize(params["new_channel"]))
GLOB.ntnet_global.begin_conversation(src, sanitize(params["new_channel"]))
computer.update_static_data_for_all_viewers()
. = TRUE
if(action == "delete")
var/datum/ntnet_conversation/conv = locate(params["delete"])
if(istype(conv) && conv.can_manage(src))
ntnet_global.chat_channels.Remove(conv)
GLOB.ntnet_global.chat_channels.Remove(conv)
qdel(conv)
computer.update_static_data_for_all_viewers()
. = TRUE
if(action == "direct")
var/datum/ntnet_user/tUser = locate(params["direct"])
ntnet_global.begin_direct(src, tUser)
GLOB.ntnet_global.begin_direct(src, tUser)
computer.update_static_data_for_all_viewers()
. = TRUE
code/modules/modular_computers/file_system/programs/research/ntmonitor.dm
+22 -22
View File
@@ -15,23 +15,23 @@
tgui_id = "NTMonitor"
/datum/computer_file/program/ntnetmonitor/ui_data(mob/user)
if(!ntnet_global)
if(!GLOB.ntnet_global)
return
var/list/data = initial_data()
data["ntnetstatus"] = ntnet_global.check_function()
data["ntnetrelays"] = ntnet_global.relays.len
data["idsstatus"] = ntnet_global.intrusion_detection_enabled
data["idsalarm"] = ntnet_global.intrusion_detection_alarm
data["ntnetstatus"] = GLOB.ntnet_global.check_function()
data["ntnetrelays"] = GLOB.ntnet_global.relays.len
data["idsstatus"] = GLOB.ntnet_global.intrusion_detection_enabled
data["idsalarm"] = GLOB.ntnet_global.intrusion_detection_alarm
data["config_softwaredownload"] = ntnet_global.setting_softwaredownload
data["config_peertopeer"] = ntnet_global.setting_peertopeer
data["config_communication"] = ntnet_global.setting_communication
data["config_systemcontrol"] = ntnet_global.setting_systemcontrol
data["config_softwaredownload"] = GLOB.ntnet_global.setting_softwaredownload
data["config_peertopeer"] = GLOB.ntnet_global.setting_peertopeer
data["config_communication"] = GLOB.ntnet_global.setting_communication
data["config_systemcontrol"] = GLOB.ntnet_global.setting_systemcontrol
data["ntnetlogs"] = ntnet_global.logs
data["ntnetmessages"] = ntnet_global.messages
data["ntnetmaxlogs"] = ntnet_global.setting_maxlogcount
data["ntnetlogs"] = GLOB.ntnet_global.logs
data["ntnetmessages"] = GLOB.ntnet_global.messages
data["ntnetmaxlogs"] = GLOB.ntnet_global.setting_maxlogcount
return data
@@ -42,24 +42,24 @@
switch(action)
if("resetIDS")
. = TRUE
if(ntnet_global)
ntnet_global.resetIDS()
if(GLOB.ntnet_global)
GLOB.ntnet_global.resetIDS()
if("toggleIDS")
. = TRUE
if(ntnet_global)
ntnet_global.toggleIDS()
if(GLOB.ntnet_global)
GLOB.ntnet_global.toggleIDS()
if("purgelogs")
. = TRUE
if(ntnet_global)
ntnet_global.purge_logs()
if(GLOB.ntnet_global)
GLOB.ntnet_global.purge_logs()
if("updatemaxlogs")
. = TRUE
var/mob/user = usr
var/logcount = text2num(input(user,"Enter amount of logs to keep in memory ([MIN_NTNET_LOGS]-[MAX_NTNET_LOGS]):"))
if(ntnet_global)
ntnet_global.update_max_log_count(logcount)
if(GLOB.ntnet_global)
GLOB.ntnet_global.update_max_log_count(logcount)
if("toggle_function")
. = TRUE
if(!ntnet_global)
if(!GLOB.ntnet_global)
return FALSE
ntnet_global.toggle_function(params["toggle_function"])
GLOB.ntnet_global.toggle_function(params["toggle_function"])
code/modules/modular_computers/file_system/programs/system/client_manager.dm
+4 -4
View File
@@ -19,14 +19,14 @@
var/list/data = list()
data["enrollment"] = computer.enrolled
data["available_presets"] = list()
for(var/datum/modular_computer_app_presets/p in ntnet_global.available_software_presets)
for(var/datum/modular_computer_app_presets/p in GLOB.ntnet_global.available_software_presets)
if(p.available)
data["available_presets"][p.display_name] = p.description
return data
/datum/computer_file/program/clientmanager/ui_data(mob/user)
var/list/data = list()
data["ntnet_status"] = ntnet_global.check_function(NTNET_SOFTWAREDOWNLOAD)
data["ntnet_status"] = GLOB.ntnet_global.check_function(NTNET_SOFTWAREDOWNLOAD)
return data
/datum/computer_file/program/clientmanager/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
@@ -35,7 +35,7 @@
if(action == "enroll")
. = TRUE
if(!ntnet_global.check_function(NTNET_SOFTWAREDOWNLOAD))
if(!GLOB.ntnet_global.check_function(NTNET_SOFTWAREDOWNLOAD))
to_chat(ui.user, SPAN_WARNING("Cannot connect to NTNet download servers. Please try again later."))
return
if(params["enroll_type"] & DEVICE_COMPANY)
@@ -58,7 +58,7 @@
if(!computer)
return
for (var/datum/modular_computer_app_presets/prs in ntnet_global.available_software_presets)
for (var/datum/modular_computer_app_presets/prs in GLOB.ntnet_global.available_software_presets)
if(prs.display_name == preset && prs.available == 1)
var/list/prs_programs = prs.return_install_programs(computer)
for (var/datum/computer_file/program/prog in prs_programs)
code/modules/modular_computers/file_system/programs/system/ntdownloader.dm
+2 -2
View File
@@ -32,7 +32,7 @@
/datum/computer_file/program/ntnetdownload/ui_static_data(mob/user)
var/list/data = list()
for(var/datum/computer_file/program/P in ntnet_global.available_software)
for(var/datum/computer_file/program/P in GLOB.ntnet_global.available_software)
if(hard_drive.find_file_by_name(P.filename))
continue
@@ -81,7 +81,7 @@
return TRUE
if(action == "download")
var/datum/computer_file/program/PRG = ntnet_global.find_ntnet_file_by_name(params["filename"])
var/datum/computer_file/program/PRG = GLOB.ntnet_global.find_ntnet_file_by_name(params["filename"])
if(istype(PRG))
add_to_queue(PRG, usr)
. = TRUE