From 04e3481bf3353b80c016424f986d320cab331dca Mon Sep 17 00:00:00 2001 From: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Tue, 7 Sep 2021 11:43:42 +0100 Subject: [PATCH 1/5] The 514 patch --- _build_dependencies.sh | 4 ++-- code/_compile_options.dm | 6 +++--- code/controllers/subsystem/metrics.dm | 2 +- code/modules/client/client_procs.dm | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/_build_dependencies.sh b/_build_dependencies.sh index 8cef5ce91b9..c648193a809 100644 --- a/_build_dependencies.sh +++ b/_build_dependencies.sh @@ -4,6 +4,6 @@ export SPACEMANDMM_TAG=suite-1.6 # For TGUI export NODE_VERSION=12 # Byond Major -export BYOND_MAJOR=513 +export BYOND_MAJOR=514 # Byond Minor -export BYOND_MINOR=1528 +export BYOND_MINOR=1556 diff --git a/code/_compile_options.dm b/code/_compile_options.dm index 0e73437dd93..8bd6165e080 100644 --- a/code/_compile_options.dm +++ b/code/_compile_options.dm @@ -22,12 +22,12 @@ #define IS_MODE_COMPILED(MODE) (ispath(text2path("/datum/game_mode/"+(MODE)))) //Update this whenever you need to take advantage of more recent byond features -#define MIN_COMPILER_VERSION 513 -#define MIN_COMPILER_BUILD 1514 +#define MIN_COMPILER_VERSION 514 +#define MIN_COMPILER_BUILD 1556 #if DM_VERSION < MIN_COMPILER_VERSION || DM_BUILD < MIN_COMPILER_BUILD //Don't forget to update this part #error Your version of BYOND is too out-of-date to compile this project. Go to https://secure.byond.com/download and update. -#error You need version 513.1514 or higher +#error You need version 514.1556 or higher #endif // Macros that must exist before world.dm diff --git a/code/controllers/subsystem/metrics.dm b/code/controllers/subsystem/metrics.dm index 7ebaadfae77..95055f99216 100644 --- a/code/controllers/subsystem/metrics.dm +++ b/code/controllers/subsystem/metrics.dm @@ -23,7 +23,7 @@ SUBSYSTEM_DEF(metrics) var/list/out = list() out["@timestamp"] = time_stamp() // This is required by ElasticSearch, complete with this name. DO NOT REMOVE THIS. out["cpu"] = world.cpu - // out["maptick"] = world.map_cpu // TODO: 514 + out["maptick"] = world.map_cpu out["elapsed_processed"] = world.time out["elapsed_real"] = (REALTIMEOFDAY - world_init_time) out["client_count"] = length(GLOB.clients) diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index 8c7dc4963f6..eb7ed55a169 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -6,10 +6,10 @@ #define TOPIC_SPAM_DELAY 2 //2 ticks is about 2/10ths of a second; it was 4 ticks, but that caused too many clicks to be lost due to lag #define UPLOAD_LIMIT 10485760 //Restricts client uploads to the server to 10MB //Boosted this thing. What's the worst that can happen? -#define MIN_CLIENT_VERSION 513 // Minimum byond major version required to play. +#define MIN_CLIENT_VERSION 514 // Minimum byond major version required to play. //I would just like the code ready should it ever need to be used. -#define SUGGESTED_CLIENT_VERSION 513 // only integers (e.g: 513, 514) are useful here. This is the part BEFORE the ".", IE 513 out of 513.1542 -#define SUGGESTED_CLIENT_BUILD 1542 // only integers (e.g: 1542, 1543) are useful here. This is the part AFTER the ".", IE 1542 out of 513.1542 +#define SUGGESTED_CLIENT_VERSION 514 // only integers (e.g: 513, 514) are useful here. This is the part BEFORE the ".", IE 513 out of 513.1542 +#define SUGGESTED_CLIENT_BUILD 1556 // only integers (e.g: 1542, 1543) are useful here. This is the part AFTER the ".", IE 1542 out of 513.1542 #define SSD_WARNING_TIMER 30 // cycles, not seconds, so 30=60s From 823f18c9abc455aaf86fd1828c19288bcaa19362 Mon Sep 17 00:00:00 2001 From: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Tue, 7 Sep 2021 12:24:51 +0100 Subject: [PATCH 2/5] Webedit who gives a shit --- _build_dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_build_dependencies.sh b/_build_dependencies.sh index c648193a809..8427e6976ee 100644 --- a/_build_dependencies.sh +++ b/_build_dependencies.sh @@ -1,6 +1,6 @@ # This file has all the information on what versions of libraries are thrown into the code # For dreamchecker -export SPACEMANDMM_TAG=suite-1.6 +export SPACEMANDMM_TAG=suite-1.7 # For TGUI export NODE_VERSION=12 # Byond Major From d01c6549bc5e091c489709e6f900b169b878d9da Mon Sep 17 00:00:00 2001 From: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Tue, 7 Sep 2021 17:51:58 +0100 Subject: [PATCH 3/5] Fixes this --- code/_compile_options.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/_compile_options.dm b/code/_compile_options.dm index 8bd6165e080..d418f30c78d 100644 --- a/code/_compile_options.dm +++ b/code/_compile_options.dm @@ -23,11 +23,11 @@ //Update this whenever you need to take advantage of more recent byond features #define MIN_COMPILER_VERSION 514 -#define MIN_COMPILER_BUILD 1556 +#define MIN_COMPILER_BUILD 1554 #if DM_VERSION < MIN_COMPILER_VERSION || DM_BUILD < MIN_COMPILER_BUILD //Don't forget to update this part #error Your version of BYOND is too out-of-date to compile this project. Go to https://secure.byond.com/download and update. -#error You need version 514.1556 or higher +#error You need version 514.1554 or higher #endif // Macros that must exist before world.dm From 8b23fc8726faf0b16b3f90d00dee9f7c461382f2 Mon Sep 17 00:00:00 2001 From: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Tue, 7 Sep 2021 17:52:18 +0100 Subject: [PATCH 4/5] And this --- code/modules/client/client_procs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index eb7ed55a169..af91031e434 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -6,7 +6,7 @@ #define TOPIC_SPAM_DELAY 2 //2 ticks is about 2/10ths of a second; it was 4 ticks, but that caused too many clicks to be lost due to lag #define UPLOAD_LIMIT 10485760 //Restricts client uploads to the server to 10MB //Boosted this thing. What's the worst that can happen? -#define MIN_CLIENT_VERSION 514 // Minimum byond major version required to play. +#define MIN_CLIENT_VERSION 513 // Minimum byond major version required to play. //I would just like the code ready should it ever need to be used. #define SUGGESTED_CLIENT_VERSION 514 // only integers (e.g: 513, 514) are useful here. This is the part BEFORE the ".", IE 513 out of 513.1542 #define SUGGESTED_CLIENT_BUILD 1556 // only integers (e.g: 1542, 1543) are useful here. This is the part AFTER the ".", IE 1542 out of 513.1542 From 99e58c6c0f5cbc69f027443ffd44164ed2deccd9 Mon Sep 17 00:00:00 2001 From: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Tue, 7 Sep 2021 20:49:33 +0100 Subject: [PATCH 5/5] Apply suggestions from code review --- _build_dependencies.sh | 2 +- code/modules/client/client_procs.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/_build_dependencies.sh b/_build_dependencies.sh index 8427e6976ee..3aabf9e3758 100644 --- a/_build_dependencies.sh +++ b/_build_dependencies.sh @@ -6,4 +6,4 @@ export NODE_VERSION=12 # Byond Major export BYOND_MAJOR=514 # Byond Minor -export BYOND_MINOR=1556 +export BYOND_MINOR=1566 diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index af91031e434..8150d4a70a0 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -9,7 +9,7 @@ #define MIN_CLIENT_VERSION 513 // Minimum byond major version required to play. //I would just like the code ready should it ever need to be used. #define SUGGESTED_CLIENT_VERSION 514 // only integers (e.g: 513, 514) are useful here. This is the part BEFORE the ".", IE 513 out of 513.1542 -#define SUGGESTED_CLIENT_BUILD 1556 // only integers (e.g: 1542, 1543) are useful here. This is the part AFTER the ".", IE 1542 out of 513.1542 +#define SUGGESTED_CLIENT_BUILD 1566 // only integers (e.g: 1542, 1543) are useful here. This is the part AFTER the ".", IE 1542 out of 513.1542 #define SSD_WARNING_TIMER 30 // cycles, not seconds, so 30=60s