diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 579a96bd045..a8f6b2e869b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -81,7 +81,7 @@ jobs: fail-fast: false # Let all map tests run to completion matrix: maptype: ['/datum/map/cyberiad', '/datum/map/delta', '/datum/map/metastation', '/datum/map/cerestation'] - byondtype: ['STABLE', 'BETA'] + byondtype: ['STABLE'] services: mariadb: image: mariadb:latest diff --git a/_build_dependencies.sh b/_build_dependencies.sh index f943ddf72c2..0889f572f57 100644 --- a/_build_dependencies.sh +++ b/_build_dependencies.sh @@ -4,12 +4,12 @@ export SPACEMANDMM_TAG=suite-1.7.1 # For TGUI export NODE_VERSION=18 # Stable Byond Major -export STABLE_BYOND_MAJOR=514 +export STABLE_BYOND_MAJOR=515 # Stable Byond Minor -export STABLE_BYOND_MINOR=1589 +export STABLE_BYOND_MINOR=1614 # Beta Byond Major export BETA_BYOND_MAJOR=515 # Beta Byond Minor -export BETA_BYOND_MINOR=1610 +export BETA_BYOND_MINOR=1614 # Python version for mapmerge and other tools export PYTHON_VERSION=3.11.6 diff --git a/code/__byond_version_compat.dm b/code/__byond_version_compat.dm index adbd750816e..c95b0e51e38 100644 --- a/code/__byond_version_compat.dm +++ b/code/__byond_version_compat.dm @@ -1,5 +1,5 @@ // This file contains defines allowing targeting byond versions newer than the supported - +//TODO: REMOVE THE 514 STUFF WHEN DREAMCHECKER AND DM LANG SERVER GET THEIR ACT TOGETHER // So we want to have compile time guarantees these procs exist on local type, unfortunately 515 killed the .proc/procname syntax so we have to use nameof() #if DM_VERSION < 515 #define PROC_REF(X) (.proc/##X)