TGS Test Merge (#5677)

citadel.dme

@@ -174,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"
@@ -186,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"
@@ -235,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"
@@ -277,6 +278,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"
@@ -447,6 +449,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"
@@ -858,6 +861,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"
@@ -1507,6 +1511,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"
@@ -2008,8 +2015,16 @@
 #include "code\game\objects\systems\cell_slot.dm"
 #include "code\game\objects\systems\storage.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"
@@ -2033,7 +2048,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"
@@ -3543,15 +3557,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"
@@ -3609,24 +3629,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"
@@ -3657,6 +3680,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"

code/__DEFINES/_planes+layers.dm

@@ -403,6 +403,7 @@
  *? Separate layer with which to apply colorblindness.
  */
 #define INVENTORY_PLANE 96
+	#define INVENTORY_PLATE_LAYER 100
 
 /**
  *! -- Above HUD Plane

code/__DEFINES/dcs/signals/datums/signals_inventory.dm

@@ -0,0 +1,17 @@
+//* This file is explicitly licensed under the MIT license. *//
+//* Copyright (c) 2024 Citadel Station Developers           *//
+
+//* for /datum/inventory *//
+
+/// raised with (obj/item/item, datum/inventory_slot/slot_or_index)
+///
+/// * raised after COMSIG_INVENTORY_ITEM_EXITED_SLOT during swaps
+#define COMSIG_INVENTORY_ITEM_ENTERED_SLOT "inventory-item-entered-slot"
+/// raised with (obj/item/item, datum/inventory_slot/slot_or_index)
+///
+/// * raised before COMSIG_INVENTORY_ITEM_ENTERED_SLOT during swaps
+#define COMSIG_INVENTORY_ITEM_EXITED_SLOT "inventory-item-exited-slot"
+/// raised with ()
+///
+/// * raised on any inventory slot mutation
+#define COMSIG_INVENTORY_SLOT_REBUILD "inventory-slot-rebuild"

code/__DEFINES/inventory/hud.dm

@@ -0,0 +1,55 @@
+//* This file is explicitly licensed under the MIT license. *//
+//* Copyright (c) 2024 Citadel Station Developers           *//
+
+//? HUD screen_loc's are in code/__DEFINES/screen.dm ?//
+
+//* inventory_hud_anchor *//
+
+/// anchor to the main inventory drawer
+///
+/// * main axis runs towards the middle of screen on Y axis
+/// * cross axis runs towards the middle of screen on X axis
+/// * both main and cross cannot be 0, as that is where the drawer button is
+///
+/// * valid main-axis indices: >= 0, cross-axis != 0 if 0
+/// * valid cross-axis indices: >= 0, main-axis != 0 if 0
+#define INVENTORY_HUD_ANCHOR_TO_DRAWER "drawer"
+/// anchor to next to hands panel
+///
+/// * main axis runs left/right of hands if negative/positive
+/// * cross axis runs away from edge of screen of hands
+///
+/// * valid main-axis indices: != 0
+/// * valid cross-axis indices: >= 0
+#define INVENTORY_HUD_ANCHOR_TO_HANDS "hands"
+/// automatic - shove it in anywhere we can
+///
+/// * axis cannot be specified for this
+#define INVENTORY_HUD_ANCHOR_AUTOMATIC "automatic"
+
+//* inventory_hud_class *//
+
+/// always visible
+#define INVENTORY_HUD_CLASS_ALWAYS "always"
+/// only when drawer is open
+#define INVENTORY_HUD_CLASS_DRAWER "drawer"
+
+//* inventory_hud hide sources *//
+
+/// from f12 / zoom toggle
+#define INVENTORY_HUD_HIDE_SOURCE_F12 "F12"
+/// from drawer toggle
+#define INVENTORY_HUD_HIDE_SOURCE_DRAWER "drawer"
+
+//* inventory slot remappings for species *//
+
+/// inventory_hud_main_axis
+#define INVENTORY_SLOT_REMAP_MAIN_AXIS "main-axis"
+/// inventory_hud_cross_axis
+#define INVENTORY_SLOT_REMAP_CROSS_AXIS "cross-axis"
+/// name
+#define INVENTORY_SLOT_REMAP_NAME "name"
+/// inventory_hud_class
+#define INVENTORY_SLOT_REMAP_CLASS "class"
+/// inventory_hud_anchor
+#define INVENTORY_SLOT_REMAP_ANCHOR "anchor"

code/__DEFINES/inventory/misc.dm

@@ -1,4 +1,5 @@
 // proc: dropped() on /obj/item
 // todo: this should be in procs.dm and the names need to be changed probably
+// todo: comsig instead?
 /// relocated; return false
 #define ITEM_RELOCATED_BY_DROPPED -1

code/__DEFINES/inventory/procs.dm

@@ -1,4 +1,8 @@
-//! flags for inventory ops
+//* This file is explicitly licensed under the MIT license. *//
+//* Copyright (c) 2024 silicons                             *//
+
+//* Inventory Operation Flags *//
+
 /// force; implies INV_OP_IGNORE_DELAY and INV_OP_IGNORE_REACHABILITY
 #define INV_OP_FORCE				(1<<0)
 /// components that intercept to relocate should refrain - usually used with force
@@ -9,7 +13,7 @@
 #define INV_OP_SUPPRESS_WARNING		(1<<3)
 /// do not run logic like checking if you should drop something when something's unequipped
 #define INV_OP_NO_LOGIC				(1<<4)
-/// do not updatei cons
+/// do not update icons
 #define INV_OP_NO_UPDATE_ICONS		(1<<5)
 /// hint: we are directly dropping to ground/off omb
 #define INV_OP_DIRECTLY_DROPPING	(1<<6)
@@ -45,7 +49,21 @@
 /// no sound, warnings, etc, entirely
 #define INV_OP_SILENT				(INV_OP_SUPPRESS_SOUND | INV_OP_SUPPRESS_WARNING)
 
-// todo: INV_OP_RECRUSE
+// todo: INV_OP_RECURSE for nested / worn-over pieces
+
+//* Inventory Return Flags *//
+
+/// Failed
+///
+/// * Yes, on a failure, we just return null.
+/// * This is to fail truthy checks, and be a valid switch() return.
+#define INV_RETURN_FAILED null
+/// Success
+#define INV_RETURN_SUCCESS "success"
+/// Success, but was relocated instead of going to where it should go.
+#define INV_RETURN_RELOCATED "relocated"
+/// Success, and was deleted for it
+#define INV_RETURN_DELETED "deleted"
 
 //! return values from can_equip_conflict_check
 /// yes

code/__DEFINES/mobs/hands.dm

@@ -0,0 +1,12 @@
+//* hand manipulation levels *//
+
+/// do surgery / precise tooling / precision work
+#define HAND_MANIPULATION_PRECISE 4
+/// use simple keyboards, manipulate a small switch, rotate objects, etc
+#define HAND_MANIPULATION_GENERAL 3
+/// pick up an item roughly, pull a switch, etc
+#define HAND_MANIPULATION_MOVE 2
+/// just hit your hand against something
+#define HAND_MANIPULATION_DULL 1
+/// level at which someone just can't use a hand at all
+#define HAND_MANIPULATION_NONE 0