From 0141042abc5c072d456c0774d5e070f3a265baed Mon Sep 17 00:00:00 2001 From: DGamerL <108773801+DGamerL@users.noreply.github.com> Date: Tue, 23 Jan 2024 17:52:15 +0100 Subject: [PATCH 1/3] Fuck (#23880) --- code/modules/food_and_drinks/food_base.dm | 1 + tools/UpdatePaths/Scripts/23063_patch_pill.txt | 4 ++-- tools/UpdatePaths/Scripts/23379_food_containers.txt | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/code/modules/food_and_drinks/food_base.dm b/code/modules/food_and_drinks/food_base.dm index d3c8247c6cc3..64facc6b031f 100644 --- a/code/modules/food_and_drinks/food_base.dm +++ b/code/modules/food_and_drinks/food_base.dm @@ -5,6 +5,7 @@ /obj/item/food resistance_flags = FLAMMABLE container_type = INJECTABLE + w_class = WEIGHT_CLASS_TINY var/filling_color = "#FFFFFF" //Used by sandwiches. var/junkiness = 0 //for junk food. used to lower human satiety. var/bitesize = 2 diff --git a/tools/UpdatePaths/Scripts/23063_patch_pill.txt b/tools/UpdatePaths/Scripts/23063_patch_pill.txt index 4141e9657ea1..d7f429b95e12 100644 --- a/tools/UpdatePaths/Scripts/23063_patch_pill.txt +++ b/tools/UpdatePaths/Scripts/23063_patch_pill.txt @@ -1,2 +1,2 @@ -/obj/item/reagent_containers/food/pill/patch : /obj/item/reagent_containers/patch/@SUBTYPES{OLD} -/obj/item/reagent_containers/food/pill : /obj/item/reagent_containers/pill/@SUBTYPES{OLD} +/obj/item/reagent_containers/food/pill/patch : /obj/item/reagent_containers/patch/@SUBTYPES{@OLD} +/obj/item/reagent_containers/food/pill : /obj/item/reagent_containers/pill/@SUBTYPES{@OLD} diff --git a/tools/UpdatePaths/Scripts/23379_food_containers.txt b/tools/UpdatePaths/Scripts/23379_food_containers.txt index f5cde328911d..3cf78ba948e6 100644 --- a/tools/UpdatePaths/Scripts/23379_food_containers.txt +++ b/tools/UpdatePaths/Scripts/23379_food_containers.txt @@ -1,2 +1,2 @@ -/obj/item/reagent_containers/food/drinks/@SUBTYPES : /obj/item/reagent_containers/drinks/@SUBTYPES{OLD} -/obj/item/reagent_containers/food/@SUBTYPES : /obj/item/food/@SUBTYPES{OLD} +/obj/item/reagent_containers/food/drinks/@SUBTYPES : /obj/item/reagent_containers/drinks/@SUBTYPES{@OLD} +/obj/item/reagent_containers/food/@SUBTYPES : /obj/item/food/@SUBTYPES{@OLD} From df2acccb3ea2d0e753658ecafca73b3e488d96a8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jan 2024 21:58:35 +0000 Subject: [PATCH 2/3] Bump pillow from 10.0.1 to 10.2.0 in /tools (#23889) Bumps [pillow](https://github.com/python-pillow/Pillow) from 10.0.1 to 10.2.0. - [Release notes](https://github.com/python-pillow/Pillow/releases) - [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst) - [Commits](https://github.com/python-pillow/Pillow/compare/10.0.1...10.2.0) --- updated-dependencies: - dependency-name: pillow dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- tools/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/requirements.txt b/tools/requirements.txt index 0c0b75cd37bf..bd5e92d7d756 100644 --- a/tools/requirements.txt +++ b/tools/requirements.txt @@ -1,6 +1,6 @@ pygit2==1.13.1 bidict==0.22.1 -Pillow==10.0.1 +Pillow==10.2.0 json5==0.9.14 # changelogs From aef771cc59142c42f91bd95dfa6890b467556c84 Mon Sep 17 00:00:00 2001 From: S34N <12197162+S34NW@users.noreply.github.com> Date: Tue, 23 Jan 2024 22:29:17 +0000 Subject: [PATCH 3/3] Bump BYOND ver for CI deps to 1628 (#23626) * moving on up * Apply suggestions from code review * 1627 * webedit heresy --- _build_dependencies.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_build_dependencies.sh b/_build_dependencies.sh index 7e4a8ce153ec..b481c560f49e 100644 --- a/_build_dependencies.sh +++ b/_build_dependencies.sh @@ -6,11 +6,11 @@ export NODE_VERSION=20 # Stable Byond Major export STABLE_BYOND_MAJOR=515 # Stable Byond Minor -export STABLE_BYOND_MINOR=1620 +export STABLE_BYOND_MINOR=1628 # Beta Byond Major export BETA_BYOND_MAJOR=515 # Beta Byond Minor -export BETA_BYOND_MINOR=1620 +export BETA_BYOND_MINOR=1628 # Python version for mapmerge and other tools export PYTHON_VERSION=3.11.6 # RUSTG version