Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-2025-11-12

This commit is contained in:
Roxy
2025-11-12 16:44:13 -05:00
379 changed files with 37535 additions and 33147 deletions
+2
View File
@@ -87,6 +87,7 @@
#define EASY_ALLOCATE(arguments...) allocate(__IMPLIED_TYPE__, run_loc_floor_bottom_left, ##arguments)
// BEGIN_INCLUDE
#include "aas_configs.dm"
#include "abductor_baton_spell.dm"
#include "ablative_hud.dm"
#include "achievements.dm"
@@ -261,6 +262,7 @@
#include "reagent_names.dm"
#include "reagent_recipe_collisions.dm"
#include "reagent_transfer.dm"
#include "recycle_recycling.dm"
#include "required_map_items.dm"
#include "resist.dm"
#include "reta_system.dm"