From 50c7d4914f2d32d3916699dd2afb606e7018c40a Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Sun, 14 Nov 2021 22:25:39 +0100 Subject: [PATCH 1/6] reebe loading (woo) --- code/__DEFINES/clockcult.dm | 1 + code/game/gamemodes/clock_cult/clock_cult.dm | 8 +------- code/modules/antagonists/clockcult/clockcult.dm | 16 ++++++++++++++++ 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/code/__DEFINES/clockcult.dm b/code/__DEFINES/clockcult.dm index dbca36aab4..1a684c7040 100644 --- a/code/__DEFINES/clockcult.dm +++ b/code/__DEFINES/clockcult.dm @@ -17,6 +17,7 @@ GLOBAL_LIST_EMPTY(all_clockwork_mobs) //All clockwork SERVANTS (not creatures) i GLOBAL_VAR_INIT(ratvar_approaches, 0) //The servants can choose to "herald" Ratvar, permanently buffing them but announcing their presence to the crew. GLOBAL_VAR_INIT(ratvar_awakens, 0) //If Ratvar has been summoned; not a boolean, for proper handling of multiple Ratvars GLOBAL_VAR_INIT(ark_of_the_clockwork_justiciar, FALSE) //The Ark on the Reebe z-level +GLOBAL_VAR_INIT(reebe_loaded, FALSE) //Is reebe loaded right now? If two seperate things in one round try loading reebe. GLOBAL_VAR_INIT(clockwork_gateway_activated, FALSE) //if a gateway to the celestial derelict has ever been successfully activated GLOBAL_VAR_INIT(script_scripture_unlocked, FALSE) //If script scripture is available, through converting at least one crewmember diff --git a/code/game/gamemodes/clock_cult/clock_cult.dm b/code/game/gamemodes/clock_cult/clock_cult.dm index e052f2e39f..65831f1003 100644 --- a/code/game/gamemodes/clock_cult/clock_cult.dm +++ b/code/game/gamemodes/clock_cult/clock_cult.dm @@ -152,13 +152,7 @@ Credit where due: /datum/game_mode/clockwork_cult/pre_setup() //Gamemode and job code is pain. Have fun codediving all of that stuff, whoever works on this next - Delta var/list/errorList = list() - var/list/reebes = SSmapping.LoadGroup(errorList, "Reebe", "map_files/generic", "City_of_Cogs.dmm", default_traits = ZTRAITS_REEBE, silent = TRUE) - if(errorList.len) // reebe failed to load - message_admins("Reebe failed to load!") - log_game("Reebe failed to load!") - return FALSE - for(var/datum/parsed_map/PM in reebes) //Temporarily commented because of z-level loading reliably segfaulting the server. - PM.initTemplateBounds() + load_reebe(errorList) if(CONFIG_GET(flag/protect_roles_from_antagonist)) restricted_jobs += protected_jobs if(CONFIG_GET(flag/protect_assistant_from_antagonist)) diff --git a/code/modules/antagonists/clockcult/clockcult.dm b/code/modules/antagonists/clockcult/clockcult.dm index 8bf26d6397..7f6e3ce50c 100644 --- a/code/modules/antagonists/clockcult/clockcult.dm +++ b/code/modules/antagonists/clockcult/clockcult.dm @@ -240,3 +240,19 @@ parts += printplayerlist(members - eminence) return "
[parts.Join("
")]
" + +//I have no idea where to put this so I'm leaving it here. Loads reebe. Only one reebe can exist, so it's checked via a global var. +/proc/load_reebe(list/errorList) + if(GLOB.reebe_loaded) + return + if(!errorList) + errorList = list() + var/list/reebes = SSmapping.LoadGroup(errorList, "Reebe", "map_files/generic", "City_of_Cogs.dmm", default_traits = ZTRAITS_REEBE, silent = TRUE) + if(errorList.len) // reebe failed to load + message_admins("Reebe failed to load!") + log_game("Reebe failed to load!") + return FALSE + for(var/datum/parsed_map/PM in reebes) //Temporarily commented because of z-level loading reliably segfaulting the server. + PM.initTemplateBounds() + GLOB.reebe_loaded = TRUE + return errorList From 314a3a049f96b613ca51e62aac358cf3b82e5598 Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Sun, 14 Nov 2021 22:38:48 +0100 Subject: [PATCH 2/6] lets just return true instead --- code/modules/antagonists/clockcult/clockcult.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/antagonists/clockcult/clockcult.dm b/code/modules/antagonists/clockcult/clockcult.dm index 7f6e3ce50c..5979365bcd 100644 --- a/code/modules/antagonists/clockcult/clockcult.dm +++ b/code/modules/antagonists/clockcult/clockcult.dm @@ -255,4 +255,4 @@ for(var/datum/parsed_map/PM in reebes) //Temporarily commented because of z-level loading reliably segfaulting the server. PM.initTemplateBounds() GLOB.reebe_loaded = TRUE - return errorList + return TRUE From 3f9ad6a9541aa10e3be04dd1288ee2d82f272367 Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Sun, 14 Nov 2021 22:44:43 +0100 Subject: [PATCH 3/6] should do this instead --- code/game/gamemodes/clock_cult/clock_cult.dm | 4 ++-- code/modules/antagonists/clockcult/clockcult.dm | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/code/game/gamemodes/clock_cult/clock_cult.dm b/code/game/gamemodes/clock_cult/clock_cult.dm index 65831f1003..08a8d69575 100644 --- a/code/game/gamemodes/clock_cult/clock_cult.dm +++ b/code/game/gamemodes/clock_cult/clock_cult.dm @@ -151,8 +151,8 @@ Credit where due: var/datum/team/clockcult/main_clockcult /datum/game_mode/clockwork_cult/pre_setup() //Gamemode and job code is pain. Have fun codediving all of that stuff, whoever works on this next - Delta - var/list/errorList = list() - load_reebe(errorList) + if(!load_reebe()) + return FALSE if(CONFIG_GET(flag/protect_roles_from_antagonist)) restricted_jobs += protected_jobs if(CONFIG_GET(flag/protect_assistant_from_antagonist)) diff --git a/code/modules/antagonists/clockcult/clockcult.dm b/code/modules/antagonists/clockcult/clockcult.dm index 5979365bcd..33cc6bcc99 100644 --- a/code/modules/antagonists/clockcult/clockcult.dm +++ b/code/modules/antagonists/clockcult/clockcult.dm @@ -242,11 +242,10 @@ return "
[parts.Join("
")]
" //I have no idea where to put this so I'm leaving it here. Loads reebe. Only one reebe can exist, so it's checked via a global var. -/proc/load_reebe(list/errorList) +/proc/load_reebe() if(GLOB.reebe_loaded) return - if(!errorList) - errorList = list() + var/list/errorList = list() var/list/reebes = SSmapping.LoadGroup(errorList, "Reebe", "map_files/generic", "City_of_Cogs.dmm", default_traits = ZTRAITS_REEBE, silent = TRUE) if(errorList.len) // reebe failed to load message_admins("Reebe failed to load!") From 9ae59be10eba690bb3cb3284549a179f8d983fb8 Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Sun, 14 Nov 2021 22:47:35 +0100 Subject: [PATCH 4/6] lies --- code/modules/antagonists/clockcult/clockcult.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/antagonists/clockcult/clockcult.dm b/code/modules/antagonists/clockcult/clockcult.dm index 33cc6bcc99..69a490ee23 100644 --- a/code/modules/antagonists/clockcult/clockcult.dm +++ b/code/modules/antagonists/clockcult/clockcult.dm @@ -251,7 +251,7 @@ message_admins("Reebe failed to load!") log_game("Reebe failed to load!") return FALSE - for(var/datum/parsed_map/PM in reebes) //Temporarily commented because of z-level loading reliably segfaulting the server. + for(var/datum/parsed_map/PM in reebes) PM.initTemplateBounds() GLOB.reebe_loaded = TRUE return TRUE From cf777da85fd3682c9c84260adf51298b05e38a4c Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Mon, 15 Nov 2021 17:54:32 +0100 Subject: [PATCH 5/6] success if already loaded --- code/modules/antagonists/clockcult/clockcult.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/antagonists/clockcult/clockcult.dm b/code/modules/antagonists/clockcult/clockcult.dm index 69a490ee23..0db3f9e6df 100644 --- a/code/modules/antagonists/clockcult/clockcult.dm +++ b/code/modules/antagonists/clockcult/clockcult.dm @@ -244,7 +244,7 @@ //I have no idea where to put this so I'm leaving it here. Loads reebe. Only one reebe can exist, so it's checked via a global var. /proc/load_reebe() if(GLOB.reebe_loaded) - return + return TRUE var/list/errorList = list() var/list/reebes = SSmapping.LoadGroup(errorList, "Reebe", "map_files/generic", "City_of_Cogs.dmm", default_traits = ZTRAITS_REEBE, silent = TRUE) if(errorList.len) // reebe failed to load From 0e93bd84f865e1ec9f2e381d2444d338d29ad5f4 Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Tue, 16 Nov 2021 02:22:12 +0100 Subject: [PATCH 6/6] no funky relay decon and wackyness --- code/game/machinery/telecomms/machines/relay.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/machinery/telecomms/machines/relay.dm b/code/game/machinery/telecomms/machines/relay.dm index 10328f0788..14d658e30b 100644 --- a/code/game/machinery/telecomms/machines/relay.dm +++ b/code/game/machinery/telecomms/machines/relay.dm @@ -84,6 +84,8 @@ icon = 'icons/obj/clockwork_objects.dmi' hide = TRUE autolinkers = list("h_relay") + flags_1 = DEFAULT_RICOCHET_1 | NODECONSTRUCT_1 + resistance_flags = INDESTRUCTIBLE //Generic preset relay /obj/machinery/telecomms/relay/preset/auto