From 57df59713850fcfcd4b0a9e599274eb40fb070de Mon Sep 17 00:00:00 2001 From: AnturK Date: Mon, 9 Oct 2023 07:01:55 +0200 Subject: [PATCH] Fixes runtime on initalizing science programs (#78842) Datums don't have location, so there's no z level to search here. --- code/controllers/subsystem/research.dm | 2 ++ code/modules/modular_computers/file_system/programs/frontier.dm | 2 +- code/modules/modular_computers/file_system/programs/techweb.dm | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/controllers/subsystem/research.dm b/code/controllers/subsystem/research.dm index 7f0b52d471b..1cc3468fb7d 100644 --- a/code/controllers/subsystem/research.dm +++ b/code/controllers/subsystem/research.dm @@ -313,6 +313,8 @@ SUBSYSTEM_DEF(research) */ /datum/controller/subsystem/research/proc/get_available_servers(turf/location) var/list/local_servers = list() + if(!location) + return local_servers for (var/datum/techweb/individual_techweb as anything in techwebs) var/list/servers = find_valid_servers(location, individual_techweb) if(length(servers)) diff --git a/code/modules/modular_computers/file_system/programs/frontier.dm b/code/modules/modular_computers/file_system/programs/frontier.dm index cf6cc4b2bc2..b724892da7e 100644 --- a/code/modules/modular_computers/file_system/programs/frontier.dm +++ b/code/modules/modular_computers/file_system/programs/frontier.dm @@ -25,7 +25,7 @@ /datum/computer_file/program/scipaper_program/on_start(mob/living/user) . = ..() if(!CONFIG_GET(flag/no_default_techweb_link) && !linked_techweb) - CONNECT_TO_RND_SERVER_ROUNDSTART(linked_techweb, src) + CONNECT_TO_RND_SERVER_ROUNDSTART(linked_techweb, computer) /datum/computer_file/program/scipaper_program/application_attackby(obj/item/attacking_item, mob/living/user) if(!istype(attacking_item, /obj/item/multitool)) diff --git a/code/modules/modular_computers/file_system/programs/techweb.dm b/code/modules/modular_computers/file_system/programs/techweb.dm index 9c097b2fb9b..dc9538cf358 100644 --- a/code/modules/modular_computers/file_system/programs/techweb.dm +++ b/code/modules/modular_computers/file_system/programs/techweb.dm @@ -24,7 +24,7 @@ /datum/computer_file/program/science/on_start(mob/living/user) . = ..() if(!CONFIG_GET(flag/no_default_techweb_link) && !stored_research) - CONNECT_TO_RND_SERVER_ROUNDSTART(stored_research, src) + CONNECT_TO_RND_SERVER_ROUNDSTART(stored_research, computer) /datum/computer_file/program/science/application_attackby(obj/item/attacking_item, mob/living/user) if(!istype(attacking_item, /obj/item/multitool))