Merge remote-tracking branch 'upstream/master' into synth_defibs

Citadel-Station-13 · Nov 20, 2024 · ff1e5d8 · ff1e5d8
2 parents bbfa785 + 3f70c7a
commit ff1e5d8
Show file tree

Hide file tree

Showing 552 changed files with 28,183 additions and 15,602 deletions.
diff --git a/_mapload/victory.dm → _mapload/endeavour.dm b/_mapload/victory.dm → _mapload/endeavour.dm
@@ -2,4 +2,4 @@
 	#error Duplicate FORCE_MAP, what are you doing!?
 #endif
 
-#define FORCE_MAP "victory"
+#define FORCE_MAP "endeavour"
diff --git a/citadel.dme b/citadel.dme
@@ -64,7 +64,7 @@
 #include "code\__DEFINES\maps.dm"
 #include "code\__DEFINES\math.dm"
 #include "code\__DEFINES\matrices.dm"
-#include "code\__DEFINES\MC.dm"
+#include "code\__DEFINES\metrics.dm"
 #include "code\__DEFINES\misc.dm"
 #include "code\__DEFINES\move_force.dm"
 #include "code\__DEFINES\movement.dm"
@@ -156,9 +156,14 @@
 #include "code\__DEFINES\combat\damage.dm"
 #include "code\__DEFINES\combat\explosions.dm"
 #include "code\__DEFINES\combat\shieldcall.dm"
-#include "code\__DEFINES\controllers\_repositories.dm"
-#include "code\__DEFINES\controllers\_subsystems.dm"
+#include "code\__DEFINES\controllers\_master-runlevel.dm"
+#include "code\__DEFINES\controllers\_master.dm"
+#include "code\__DEFINES\controllers\_repository.dm"
+#include "code\__DEFINES\controllers\_subsystem-init.dm"
+#include "code\__DEFINES\controllers\_subsystem-priority.dm"
+#include "code\__DEFINES\controllers\_subsystem.dm"
 #include "code\__DEFINES\controllers\assets.dm"
+#include "code\__DEFINES\controllers\atoms.dm"
 #include "code\__DEFINES\controllers\dbcore.dm"
 #include "code\__DEFINES\controllers\grids.dm"
 #include "code\__DEFINES\controllers\persistence.dm"
@@ -169,7 +174,6 @@
 #include "code\__DEFINES\controllers\timer.dm"
 #include "code\__DEFINES\datums\beam.dm"
 #include "code\__DEFINES\datums\design.dm"
-#include "code\__DEFINES\datums\event_args.dm"
 #include "code\__DEFINES\dcs\flags.dm"
 #include "code\__DEFINES\dcs\helpers.dm"
 #include "code\__DEFINES\dcs\components\riding.dm"
@@ -181,6 +185,7 @@
 #include "code\__DEFINES\dcs\signals\signals_turf.dm"
 #include "code\__DEFINES\dcs\signals\datums\signals_beam.dm"
 #include "code\__DEFINES\dcs\signals\datums\signals_beam_legacy.dm"
+#include "code\__DEFINES\dcs\signals\datums\signals_inventory.dm"
 #include "code\__DEFINES\dcs\signals\datums\signals_perspective.dm"
 #include "code\__DEFINES\dcs\signals\elements\signals_element_conflict_checking.dm"
 #include "code\__DEFINES\dcs\signals\items\signals_inducer.dm"
@@ -230,6 +235,7 @@
 #include "code\__DEFINES\inventory\accessories.dm"
 #include "code\__DEFINES\inventory\bodytypes.dm"
 #include "code\__DEFINES\inventory\carry_weight.dm"
+#include "code\__DEFINES\inventory\hud.dm"
 #include "code\__DEFINES\inventory\icons.dm"
 #include "code\__DEFINES\inventory\misc.dm"
 #include "code\__DEFINES\inventory\procs.dm"
@@ -273,6 +279,7 @@
 #include "code\__DEFINES\mobs\biology.dm"
 #include "code\__DEFINES\mobs\characteristics.dm"
 #include "code\__DEFINES\mobs\grab.dm"
+#include "code\__DEFINES\mobs\hands.dm"
 #include "code\__DEFINES\mobs\iff.dm"
 #include "code\__DEFINES\mobs\intent.dm"
 #include "code\__DEFINES\mobs\life.dm"
@@ -443,6 +450,7 @@
 #include "code\__HELPERS\lists\traverse.dm"
 #include "code\__HELPERS\lists\types_typecaches.dm"
 #include "code\__HELPERS\lists\unique.dm"
+#include "code\__HELPERS\lists\unsorted\pack_2d_flat_list.dm"
 #include "code\__HELPERS\math\angle.dm"
 #include "code\__HELPERS\math\distance.dm"
 #include "code\__HELPERS\math\fractions.dm"
@@ -535,6 +543,7 @@
 #include "code\controllers\observer_listener\atom\observer.dm"
 #include "code\controllers\repository\designs.dm"
 #include "code\controllers\repository\guidebook.dm"
+#include "code\controllers\repository\languages.dm"
 #include "code\controllers\repository\material_traits.dm"
 #include "code\controllers\repository\materials.dm"
 #include "code\controllers\repository\structs.dm"
@@ -571,7 +580,6 @@
 #include "code\controllers\subsystem\legacy_atc.dm"
 #include "code\controllers\subsystem\legacy_lore.dm"
 #include "code\controllers\subsystem\lighting.dm"
-#include "code\controllers\subsystem\lobby.dm"
 #include "code\controllers\subsystem\machines.dm"
 #include "code\controllers\subsystem\materials.dm"
 #include "code\controllers\subsystem\media_tracks.dm"
@@ -607,6 +615,7 @@
 #include "code\controllers\subsystem\ticker.dm"
 #include "code\controllers\subsystem\time_track.dm"
 #include "code\controllers\subsystem\timer.dm"
+#include "code\controllers\subsystem\titlescreen.dm"
 #include "code\controllers\subsystem\transcore_vr.dm"
 #include "code\controllers\subsystem\transfer.dm"
 #include "code\controllers\subsystem\turbolift.dm"
@@ -618,7 +627,6 @@
 #include "code\controllers\subsystem\characters\_characters.dm"
 #include "code\controllers\subsystem\characters\backgrounds.dm"
 #include "code\controllers\subsystem\characters\character_species.dm"
-#include "code\controllers\subsystem\characters\languages.dm"
 #include "code\controllers\subsystem\characters\species.dm"
 #include "code\controllers\subsystem\dbcore\_dbcore.dm"
 #include "code\controllers\subsystem\dbcore\query.dm"
@@ -854,6 +862,7 @@
 #include "code\datums\event_args\_event_args.dm"
 #include "code\datums\event_args\actor.dm"
 #include "code\datums\event_args\clickchain.dm"
+#include "code\datums\event_args\event_args.dm"
 #include "code\datums\helper_datums\construction_datum.dm"
 #include "code\datums\helper_datums\events.dm"
 #include "code\datums\helper_datums\getrev.dm"
@@ -1503,6 +1512,9 @@
 #include "code\game\objects\items-carry_weight.dm"
 #include "code\game\objects\items-defense.dm"
 #include "code\game\objects\items-interaction.dm"
+#include "code\game\objects\items-inventory-hooks.dm"
+#include "code\game\objects\items-inventory-rendering.dm"
+#include "code\game\objects\items-inventory.dm"
 #include "code\game\objects\items.dm"
 #include "code\game\objects\materials.dm"
 #include "code\game\objects\misc.dm"
@@ -2003,10 +2015,21 @@
 #include "code\game\objects\structures\tables\update_triggers.dm"
 #include "code\game\objects\systems\_system.dm"
 #include "code\game\objects\systems\cell_slot.dm"
-#include "code\game\objects\systems\storage.dm"
+#include "code\game\objects\systems\storage\storage-screen_object.dm"
+#include "code\game\objects\systems\storage\storage.dm"
+#include "code\game\objects\systems\storage\subtypes\stack.dm"
+#include "code\game\objects\systems\storage\subtypes\stock_parts.dm"
 #include "code\game\rendering\client.dm"
+#include "code\game\rendering\hud_preferences.dm"
+#include "code\game\rendering\hud_style.dm"
 #include "code\game\rendering\mob.dm"
 #include "code\game\rendering\screen.dm"
+#include "code\game\rendering\screen_legacy.dm"
+#include "code\game\rendering\actor_huds\actor_hud-screen_object.dm"
+#include "code\game\rendering\actor_huds\actor_hud.dm"
+#include "code\game\rendering\actor_huds\actor_hud_holder.dm"
+#include "code\game\rendering\actor_huds\huds\inventory-screen_object.dm"
+#include "code\game\rendering\actor_huds\huds\inventory.dm"
 #include "code\game\rendering\atom_huds\atom_hud.dm"
 #include "code\game\rendering\atom_huds\atom_hud_provider.dm"
 #include "code\game\rendering\atom_huds\legacy.dm"
@@ -2030,7 +2053,6 @@
 #include "code\game\rendering\legacy\robot.dm"
 #include "code\game\rendering\legacy\spell_screen_objects.dm"
 #include "code\game\rendering\legacy\intents\throwing.dm"
-#include "code\game\rendering\legacy\inventory\inventory.dm"
 #include "code\game\rendering\legacy\objects\waypoint_tracker.dm"
 #include "code\game\rendering\parallax\parallax.dm"
 #include "code\game\rendering\parallax\parallax_holder.dm"
@@ -3198,6 +3220,10 @@
 #include "code\modules\language\languages\species\vulpkanin.dm"
 #include "code\modules\language\languages\species\zaddat.dm"
 #include "code\modules\language\languages\species\zorren.dm"
+#include "code\modules\legacy_metric\activity.dm"
+#include "code\modules\legacy_metric\count.dm"
+#include "code\modules\legacy_metric\department.dm"
+#include "code\modules\legacy_metric\metric.dm"
 #include "code\modules\library\book.dm"
 #include "code\modules\library\lib_items.dm"
 #include "code\modules\library\lib_machines.dm"
@@ -3492,10 +3518,14 @@
 #include "code\modules\media\media_tracks.dm"
 #include "code\modules\media\mediamanager.dm"
 #include "code\modules\media\walkpod.dm"
-#include "code\modules\metric\activity.dm"
-#include "code\modules\metric\count.dm"
-#include "code\modules\metric\department.dm"
-#include "code\modules\metric\metric.dm"
+#include "code\modules\metrics\metric.dm"
+#include "code\modules\metrics\metric_base.dm"
+#include "code\modules\metrics\api\nested_numerical.dm"
+#include "code\modules\metrics\api\numerical.dm"
+#include "code\modules\metrics\api\spatial_series.dm"
+#include "code\modules\metrics\api\string_set.dm"
+#include "code\modules\metrics\api\time_series.dm"
+#include "code\modules\metrics\metrics\controllers.dm"
 #include "code\modules\mining\mine_turfs.dm"
 #include "code\modules\mining\drilling\drill.dm"
 #include "code\modules\mining\drilling\scanner.dm"
@@ -3537,15 +3567,21 @@
 #include "code\modules\mob\health.dm"
 #include "code\modules\mob\hear_say.dm"
 #include "code\modules\mob\holder.dm"
-#include "code\modules\mob\inventory.dm"
+#include "code\modules\mob\inventory_legacy.dm"
 #include "code\modules\mob\life.dm"
-#include "code\modules\mob\login.dm"
-#include "code\modules\mob\logout.dm"
 #include "code\modules\mob\mob-client.dm"
 #include "code\modules\mob\mob-damage.dm"
 #include "code\modules\mob\mob-defense.dm"
+#include "code\modules\mob\mob-hands.dm"
 #include "code\modules\mob\mob-iff.dm"
+#include "code\modules\mob\mob-inventory-abstraction.dm"
+#include "code\modules\mob\mob-inventory-helpers.dm"
+#include "code\modules\mob\mob-inventory-internal.dm"
+#include "code\modules\mob\mob-inventory-stripping.dm"
+#include "code\modules\mob\mob-inventory.dm"
 #include "code\modules\mob\mob-keybind-triggers.dm"
+#include "code\modules\mob\mob-login.dm"
+#include "code\modules\mob\mob-logout.dm"
 #include "code\modules\mob\mob.dm"
 #include "code\modules\mob\mob_defines.dm"
 #include "code\modules\mob\mob_helpers.dm"
@@ -3603,24 +3639,27 @@
 #include "code\modules\mob\freelook\mask\cultnet.dm"
 #include "code\modules\mob\freelook\mask\eye.dm"
 #include "code\modules\mob\freelook\mask\update_triggers.dm"
-#include "code\modules\mob\inventory\hands.dm"
-#include "code\modules\mob\inventory\helpers.dm"
+#include "code\modules\mob\inventory\inventory-hands-check.dm"
+#include "code\modules\mob\inventory\inventory-hands-drop.dm"
+#include "code\modules\mob\inventory\inventory-hands-get.dm"
+#include "code\modules\mob\inventory\inventory-hands-legacy.dm"
+#include "code\modules\mob\inventory\inventory-hands-put.dm"
+#include "code\modules\mob\inventory\inventory-hands.dm"
+#include "code\modules\mob\inventory\inventory-hooks.dm"
+#include "code\modules\mob\inventory\inventory-rendering.dm"
 #include "code\modules\mob\inventory\inventory.dm"
 #include "code\modules\mob\inventory\inventory_slot.dm"
-#include "code\modules\mob\inventory\items.dm"
-#include "code\modules\mob\inventory\mobs.dm"
-#include "code\modules\mob\inventory\rendering.dm"
-#include "code\modules\mob\inventory\stripping.dm"
 #include "code\modules\mob\living\autohiss.dm"
 #include "code\modules\mob\living\butchering.dm"
 #include "code\modules\mob\living\death.dm"
 #include "code\modules\mob\living\default_language.dm"
 #include "code\modules\mob\living\health.dm"
-#include "code\modules\mob\living\inventory.dm"
+#include "code\modules\mob\living\inventory_legacy.dm"
 #include "code\modules\mob\living\life.dm"
 #include "code\modules\mob\living\living-damage.dm"
 #include "code\modules\mob\living\living-defense-legacy.dm"
 #include "code\modules\mob\living\living-defense.dm"
+#include "code\modules\mob\living\living-inventory.dm"
 #include "code\modules\mob\living\living.dm"
 #include "code\modules\mob\living\living_defines.dm"
 #include "code\modules\mob\living\living_powers.dm"
@@ -3651,6 +3690,7 @@
 #include "code\modules\mob\living\bot\SLed209bot.dm"
 #include "code\modules\mob\living\carbon\breathe.dm"
 #include "code\modules\mob\living\carbon\carbon-defense.dm"
+#include "code\modules\mob\living\carbon\carbon-hands.dm"
 #include "code\modules\mob\living\carbon\carbon.dm"
 #include "code\modules\mob\living\carbon\carbon_defense.dm"
 #include "code\modules\mob\living\carbon\carbon_defines.dm"

diff --git a/code/__DEFINES/MC.dm b/code/__DEFINES/MC.dm