Merge upstream 10.03.2024 (#1069)

Ну тут эксплойт фикс и еще че то, че там подсосут и насколько ПР быстро вмержится...
ss220club · Mar 10, 2024 · 17b292e · 17b292e
2 parents 93f9f0e + 42012c5
commit 17b292e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git 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=1630
-# Beta Byond Major
-export BETA_BYOND_MAJOR=515
-# Beta Byond Minor
-export BETA_BYOND_MINOR=1630
+export STABLE_BYOND_MINOR=1633
+# Beta Byond Major - Uncomment and update if beta cycle active
+#export BETA_BYOND_MAJOR=515
+# Beta Byond Minor - Uncomment and update if beta cycle active
+#export BETA_BYOND_MINOR=1633
 # Python version for mapmerge and other tools
 export PYTHON_VERSION=3.11.6
 # RUSTG version

diff --git a/code/modules/food_and_drinks/food/foods/meat.dm b/code/modules/food_and_drinks/food/foods/meat.dm
@@ -335,10 +335,6 @@
 
 /obj/item/food/snacks/monkeycube/proc/Expand()
 	if(LAZYLEN(SSmobs.cubemonkeys) >= GLOB.configuration.general.monkey_cube_cap)
-		if(fingerprintslast)
-			to_chat(get_mob_by_ckey(fingerprintslast), "<span class='warning'>Bluespace harmonics prevent the spawning of more than [GLOB.configuration.general.monkey_cube_cap] monkeys on the station at one time!</span>")
-		else
-			visible_message("<span class='notice'>[src] fails to expand!</span>")
 		return
 	if(!QDELETED(src))
 		visible_message("<span class='notice'>[src] expands!</span>")