From 5120f98f00bb35d13e9aea0a8569a3a6f5c3f657 Mon Sep 17 00:00:00 2001 From: Kapu1178 <75460809+Kapu1178@users.noreply.github.com> Date: Sun, 12 May 2024 00:39:43 -0400 Subject: [PATCH 1/3] bump --- .../configuration/entries/general.dm | 4 ++++ code/modules/client/client_procs.dm | 24 +++++++++++-------- config/config.txt | 11 +++++---- dependencies.sh | 2 +- 4 files changed, 25 insertions(+), 16 deletions(-) diff --git a/code/controllers/configuration/entries/general.dm b/code/controllers/configuration/entries/general.dm index 4d457118477e..de4a2d78b37f 100644 --- a/code/controllers/configuration/entries/general.dm +++ b/code/controllers/configuration/entries/general.dm @@ -470,6 +470,10 @@ default = null min_val = 500 +/datum/config_entry/number/client_warn_build + default = null + min_val = 0 + /datum/config_entry/string/client_warn_message default = "Your version of byond may have issues or be blocked from accessing this server in the future." diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index bc299dff38af..62e798153377 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -432,33 +432,37 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( connection_realtime = world.realtime connection_timeofday = world.timeofday winset(src, null, "command=\".configure graphics-hwmode on\"") - var/cev = CONFIG_GET(number/client_error_version) - var/ceb = CONFIG_GET(number/client_error_build) - var/cwv = CONFIG_GET(number/client_warn_version) - if (byond_version < cev || (byond_version == cev && byond_build < ceb)) //Out of date client. + + var/breaking_version = CONFIG_GET(number/client_error_version) + var/breaking_build = CONFIG_GET(number/client_error_build) + var/warn_version = CONFIG_GET(number/client_warn_version) + var/warn_build = CONFIG_GET(number/client_warn_build) + + if (byond_version < breaking_version || (byond_version == breaking_version && byond_build < breaking_build)) //Out of date client. to_chat(src, span_danger("Your version of BYOND is too old:")) to_chat(src, CONFIG_GET(string/client_error_message)) to_chat(src, "Your version: [byond_version].[byond_build]") - to_chat(src, "Required version: [cev].[ceb] or later") + to_chat(src, "Required version: [breaking_version].[breaking_build] or later") to_chat(src, "Visit BYOND's website to get the latest version of BYOND.") if (connecting_admin) to_chat(src, "Because you are an admin, you are being allowed to walk past this limitation, But it is still STRONGLY suggested you upgrade") else qdel(src) return - else if (byond_version < cwv) //We have words for this client. + + else if (byond_version < warn_version || (byond_version == warn_version && byond_build < warn_build)) //We have words for this client. if(CONFIG_GET(flag/client_warn_popup)) var/msg = "Your version of byond may be getting out of date:
" msg += CONFIG_GET(string/client_warn_message) + "

" - msg += "Your version: [byond_version]
" - msg += "Required version to remove this message: [cwv] or later
" + msg += "Your version: [byond_version].[byond_build]
" + msg += "Required version to remove this message: [warn_version].[warn_build] or later
" msg += "Visit BYOND's website to get the latest version of BYOND.
" src << browse(msg, "window=warning_popup") else to_chat(src, span_danger("Your version of byond may be getting out of date:")) to_chat(src, CONFIG_GET(string/client_warn_message)) - to_chat(src, "Your version: [byond_version]") - to_chat(src, "Required version to remove this message: [cwv] or later") + to_chat(src, "Your version: [byond_version].[byond_build]") + to_chat(src, "Required version to remove this message: [warn_version].[warn_build] or later") to_chat(src, "Visit BYOND's website to get the latest version of BYOND.") if (connection == "web" && !connecting_admin) diff --git a/config/config.txt b/config/config.txt index ea147662240e..21bdd7b85f96 100644 --- a/config/config.txt +++ b/config/config.txt @@ -445,13 +445,14 @@ AUTOADMIN_RANK Trial Admin ## These trigger for any version below (non-inclusive) the given version, so 510 triggers on 509 or lower. ## These messages will be followed by one stating the clients current version and the required version for clarity. ## If CLIENT_WARN_POPUP is uncommented a popup window with the message will be displayed instead -#CLIENT_WARN_VERSION 511 +#CLIENT_WARN_VERSION 515 +#CLIENT_WARN_BUILD 1537 #CLIENT_WARN_POPUP -#CLIENT_WARN_MESSAGE Byond released 511 as the stable release. You can set the framerate your client runs at, which makes the game feel very different and cool. Shortly after its release we will end up using 511 client features and you will be forced to update. -CLIENT_ERROR_VERSION 511 +#CLIENT_WARN_MESSAGE This version of BYOND added new tools for manipulating sound and icons. + +CLIENT_ERROR_VERSION 515 +CLIENT_ERROR_BUILD 1509 CLIENT_ERROR_MESSAGE Your version of byond is not supported. Please upgrade. -## The minimum build needed for joining the server, if using 512, a good minimum build would be 1421 as that disables the Middle Mouse Button exploit. -CLIENT_ERROR_BUILD 1421 ## TOPIC RATE LIMITING ## This allows you to limit how many topic calls (clicking on an interface window) the client can do in any given game second and/or game minute. diff --git a/dependencies.sh b/dependencies.sh index 05c90dfc5472..cdbf3b9a6c98 100755 --- a/dependencies.sh +++ b/dependencies.sh @@ -5,7 +5,7 @@ # byond version export BYOND_MAJOR=515 -export BYOND_MINOR=1630 +export BYOND_MINOR=1637 #rust_g git tag export RUST_G_VERSION=3.1.0 From 6b3ad9ce25518a0e1a889fd0abfbd426522beb87 Mon Sep 17 00:00:00 2001 From: Kapu1178 <75460809+Kapu1178@users.noreply.github.com> Date: Sun, 12 May 2024 00:42:46 -0400 Subject: [PATCH 2/3] more lenient --- config/config.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/config.txt b/config/config.txt index 21bdd7b85f96..1ce8ec86576b 100644 --- a/config/config.txt +++ b/config/config.txt @@ -446,7 +446,7 @@ AUTOADMIN_RANK Trial Admin ## These messages will be followed by one stating the clients current version and the required version for clarity. ## If CLIENT_WARN_POPUP is uncommented a popup window with the message will be displayed instead #CLIENT_WARN_VERSION 515 -#CLIENT_WARN_BUILD 1537 +#CLIENT_WARN_BUILD 1635 #CLIENT_WARN_POPUP #CLIENT_WARN_MESSAGE This version of BYOND added new tools for manipulating sound and icons. From f345407fdd2e377d7a9f53db65d147f9c7511374 Mon Sep 17 00:00:00 2001 From: Kapu1178 <75460809+Kapu1178@users.noreply.github.com> Date: Sun, 12 May 2024 15:27:49 -0400 Subject: [PATCH 3/3] fix --- code/game/objects/items/singularityhammer.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/singularityhammer.dm b/code/game/objects/items/singularityhammer.dm index 7daa895ecfb8..0c98af3d61ca 100644 --- a/code/game/objects/items/singularityhammer.dm +++ b/code/game/objects/items/singularityhammer.dm @@ -12,7 +12,7 @@ slot_flags = ITEM_SLOT_BACK force = 5 - force_wielded = type::force * 4 + force_wielded = 20 throwforce = 15 throw_range = 1 @@ -80,7 +80,7 @@ slot_flags = ITEM_SLOT_BACK force = 5 - force_wielded = type::force * 5 + force_wielded = 25 throwforce = 30 throw_range = 7