TGS Test Merge (#5746)

citadel.dme

@@ -39,12 +39,12 @@
 #include "code\__DEFINES\callbacks.dm"
 #include "code\__DEFINES\chat.dm"
 #include "code\__DEFINES\chemistry.dm"
+#include "code\__DEFINES\coloration.dm"
 #include "code\__DEFINES\configuration.dm"
 #include "code\__DEFINES\construction.dm"
 #include "code\__DEFINES\damage_organs.dm"
 #include "code\__DEFINES\directional.dm"
 #include "code\__DEFINES\dna.dm"
-#include "code\__DEFINES\event_args.dm"
 #include "code\__DEFINES\fonts.dm"
 #include "code\__DEFINES\gamemode.dm"
 #include "code\__DEFINES\holidays.dm"
@@ -151,24 +151,28 @@
 #include "code\__DEFINES\controllers\throwing.dm"
 #include "code\__DEFINES\controllers\ticker.dm"
 #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\datums\item_interface.dm"
 #include "code\__DEFINES\dcs\flags.dm"
 #include "code\__DEFINES\dcs\helpers.dm"
 #include "code\__DEFINES\dcs\components\riding.dm"
 #include "code\__DEFINES\dcs\signals\signals_area.dm"
 #include "code\__DEFINES\dcs\signals\signals_datum.dm"
 #include "code\__DEFINES\dcs\signals\signals_fish.dm"
 #include "code\__DEFINES\dcs\signals\signals_global.dm"
+#include "code\__DEFINES\dcs\signals\signals_legacy_beams.dm"
 #include "code\__DEFINES\dcs\signals\signals_object.dm"
 #include "code\__DEFINES\dcs\signals\signals_turf.dm"
 #include "code\__DEFINES\dcs\signals\datums\signals_beam.dm"
 #include "code\__DEFINES\dcs\signals\datums\signals_perspective.dm"
-#include "code\__DEFINES\dcs\signals\elements\conflict.dm"
+#include "code\__DEFINES\dcs\signals\elements\signal_conflict_checking.dm"
 #include "code\__DEFINES\dcs\signals\items\signals_inducer.dm"
-#include "code\__DEFINES\dcs\signals\signals_atom\context_system.dm"
 #include "code\__DEFINES\dcs\signals\signals_atom\signals_atom_appearance.dm"
 #include "code\__DEFINES\dcs\signals\signals_atom\signals_atom_attack.dm"
 #include "code\__DEFINES\dcs\signals\signals_atom\signals_atom_buckling.dm"
+#include "code\__DEFINES\dcs\signals\signals_atom\signals_atom_context.dm"
 #include "code\__DEFINES\dcs\signals\signals_atom\signals_atom_defense.dm"
 #include "code\__DEFINES\dcs\signals\signals_atom\signals_atom_lighting.dm"
 #include "code\__DEFINES\dcs\signals\signals_atom\signals_atom_main.dm"
@@ -177,9 +181,9 @@
 #include "code\__DEFINES\dcs\signals\signals_atom\signals_atom_movement.dm"
 #include "code\__DEFINES\dcs\signals\signals_atom\signals_atom_radiation.dm"
 #include "code\__DEFINES\dcs\signals\signals_atom\signals_atom_throwing.dm"
+#include "code\__DEFINES\dcs\signals\signals_atom\signals_atom_tool_system.dm"
 #include "code\__DEFINES\dcs\signals\signals_atom\signals_atom_visuals.dm"
 #include "code\__DEFINES\dcs\signals\signals_atom\signals_atom_x_act.dm"
-#include "code\__DEFINES\dcs\signals\signals_atom\tool_system.dm"
 #include "code\__DEFINES\dcs\signals\signals_item\signals_item_economy.dm"
 #include "code\__DEFINES\dcs\signals\signals_item\signals_item_inventory.dm"
 #include "code\__DEFINES\dcs\signals\signals_item\signals_item_mouse.dm"
@@ -200,6 +204,7 @@
 #include "code\__DEFINES\fishing\aquarium.dm"
 #include "code\__DEFINES\fishing\fish.dm"
 #include "code\__DEFINES\fishing\fishing.dm"
+#include "code\__DEFINES\hardsuits\rig.dm"
 #include "code\__DEFINES\inventory\accessories.dm"
 #include "code\__DEFINES\inventory\bodytypes.dm"
 #include "code\__DEFINES\inventory\carry_weight.dm"
@@ -295,7 +300,14 @@
 #include "code\__DEFINES\research\integrated_circuits.dm"
 #include "code\__DEFINES\research\research.dm"
 #include "code\__DEFINES\research\xenoarcheaology.dm"
-#include "code\__DEFINES\rigs\rig.dm"
+#include "code\__DEFINES\rigsuits\activation.dm"
+#include "code\__DEFINES\rigsuits\balancing.dm"
+#include "code\__DEFINES\rigsuits\control.dm"
+#include "code\__DEFINES\rigsuits\modules.dm"
+#include "code\__DEFINES\rigsuits\piece.dm"
+#include "code\__DEFINES\rigsuits\theme.dm"
+#include "code\__DEFINES\rigsuits\ui.dm"
+#include "code\__DEFINES\rigsuits\zones.dm"
 #include "code\__DEFINES\sound\alias.dm"
 #include "code\__DEFINES\sound\ambience.dm"
 #include "code\__DEFINES\sound\channels.dm"
@@ -324,11 +336,11 @@
 #include "code\__HELPERS\areas.dm"
 #include "code\__HELPERS\atom_movables.dm"
 #include "code\__HELPERS\chat.dm"
+#include "code\__HELPERS\coloration.dm"
 #include "code\__HELPERS\datum.dm"
 #include "code\__HELPERS\debugging.dm"
 #include "code\__HELPERS\do_after.dm"
 #include "code\__HELPERS\events.dm"
-#include "code\__HELPERS\filters.dm"
 #include "code\__HELPERS\game.dm"
 #include "code\__HELPERS\global_lists.dm"
 #include "code\__HELPERS\guid.dm"
@@ -354,15 +366,17 @@
 #include "code\__HELPERS\time.dm"
 #include "code\__HELPERS\turfs.dm"
 #include "code\__HELPERS\type_processing.dm"
-#include "code\__HELPERS\typelists.dm"
 #include "code\__HELPERS\unsorted.dm"
 #include "code\__HELPERS\vector.dm"
 #include "code\__HELPERS\verbs.dm"
 #include "code\__HELPERS\animations\attack.dm"
 #include "code\__HELPERS\datastructs\armor.dm"
 #include "code\__HELPERS\datastructs\bodytypes.dm"
+#include "code\__HELPERS\datastructs\filters.dm"
+#include "code\__HELPERS\datastructs\generators.dm"
 #include "code\__HELPERS\datastructs\ingredients.dm"
 #include "code\__HELPERS\datastructs\priority_queue.dm"
+#include "code\__HELPERS\datastructs\typelists.dm"
 #include "code\__HELPERS\files\client_io.dm"
 #include "code\__HELPERS\files\hashing.dm"
 #include "code\__HELPERS\files\paths.dm"
@@ -413,11 +427,13 @@
 #include "code\__HELPERS\sorts\InsertSort.dm"
 #include "code\__HELPERS\sorts\MergeSort.dm"
 #include "code\__HELPERS\sorts\TimSort.dm"
+#include "code\__HELPERS\text\sanitize.dm"
 #include "code\__HELPERS\text\scramble.dm"
 #include "code\__HELPERS\type2type\color.dm"
 #include "code\__HELPERS\type2type\type2type.dm"
 #include "code\__HELPERS\unsorted\contents.dm"
 #include "code\__HELPERS\unsorted\locate.dm"
+#include "code\__HELPERS\unsorted\profile.dm"
 #include "code\__HELPERS\unsorted\radiation.dm"
 #include "code\__HELPERS\vfx\appearance_cloning.dm"
 #include "code\__HELPERS\vfx\color_animations.dm"
@@ -623,6 +639,7 @@
 #include "code\datums\ai_law_sets.dm"
 #include "code\datums\ai_laws.dm"
 #include "code\datums\beam.dm"
+#include "code\datums\beam_legacy.dm"
 #include "code\datums\callback.dm"
 #include "code\datums\category.dm"
 #include "code\datums\changelog.dm"
@@ -635,13 +652,13 @@
 #include "code\datums\ghost_query.dm"
 #include "code\datums\hierarchy.dm"
 #include "code\datums\is_abstract.dm"
+#include "code\datums\item_interface.dm"
 #include "code\datums\material_container.dm"
 #include "code\datums\mind.dm"
 #include "code\datums\mixed.dm"
 #include "code\datums\mutable_appearance.dm"
 #include "code\datums\periodic_news.dm"
 #include "code\datums\position_point_vector.dm"
-#include "code\datums\profile.dm"
 #include "code\datums\progressbar.dm"
 #include "code\datums\prototype.dm"
 #include "code\datums\radiation_wave.dm"
@@ -731,7 +748,6 @@
 #include "code\datums\components\atoms\radiation_listener.dm"
 #include "code\datums\components\atoms\radioactive.dm"
 #include "code\datums\components\crafting\crafting.dm"
-#include "code\datums\components\crafting\guncrafting.dm"
 #include "code\datums\components\items\wielding.dm"
 #include "code\datums\components\movable\aquarium.dm"
 #include "code\datums\components\riding\riding_filter.dm"
@@ -785,6 +801,8 @@
 #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\melee_attack.dm"
+#include "code\datums\event_args\unarmed_attack.dm"
 #include "code\datums\helper_datums\construction_datum.dm"
 #include "code\datums\helper_datums\events.dm"
 #include "code\datums\helper_datums\getrev.dm"
@@ -809,6 +827,7 @@
 #include "code\datums\math\graph.dm"
 #include "code\datums\math\vec2.dm"
 #include "code\datums\mocking\client.dm"
+#include "code\datums\mocking\mocking.dm"
 #include "code\datums\observation\_debug.dm"
 #include "code\datums\observation\_defines.dm"
 #include "code\datums\observation\observation.dm"
@@ -982,8 +1001,9 @@
 #include "code\game\atoms\movable\pulling.dm"
 #include "code\game\atoms\movable\throwing.dm"
 #include "code\game\atoms\movable\vv.dm"
+#include "code\game\atoms\movable\special\graphics_render.dm"
 #include "code\game\atoms\movable\special\overlay.dm"
-#include "code\game\atoms\movable\special\render.dm"
+#include "code\game\atoms\movable\special\particle_render.dm"
 #include "code\game\click\adjacency.dm"
 #include "code\game\click\adjacency_legacy.dm"
 #include "code\game\click\ai.dm"
@@ -1532,6 +1552,7 @@
 #include "code\game\objects\items\glassjar.dm"
 #include "code\game\objects\items\godfigures.dm"
 #include "code\game\objects\items\gunbox.dm"
+#include "code\game\objects\items\guncrafting.dm"
 #include "code\game\objects\items\holosign_creator.dm"
 #include "code\game\objects\items\inducer.dm"
 #include "code\game\objects\items\inflatables.dm"
@@ -1540,6 +1561,7 @@
 #include "code\game\objects\items\paintkit.dm"
 #include "code\game\objects\items\pizza_voucher.dm"
 #include "code\game\objects\items\poi_items.dm"
+#include "code\game\objects\items\polyfill_cartridge.dm"
 #include "code\game\objects\items\robobag.dm"
 #include "code\game\objects\items\shooting_range.dm"
 #include "code\game\objects\items\signs.dm"
@@ -1696,6 +1718,9 @@
 #include "code\game\objects\items\storage\single_use\_single_use.dm"
 #include "code\game\objects\items\storage\single_use\med_pouch.dm"
 #include "code\game\objects\items\storage\single_use\mre.dm"
+#include "code\game\objects\items\stream_projector\holofabricator.dm"
+#include "code\game\objects\items\stream_projector\medichine.dm"
+#include "code\game\objects\items\stream_projector\stream_projector.dm"
 #include "code\game\objects\items\tools\_tool.dm"
 #include "code\game\objects\items\tools\crowbar.dm"
 #include "code\game\objects\items\tools\screwdriver.dm"
@@ -2237,6 +2262,7 @@
 #include "code\modules\asset_cache\assets\chemistry\patches.dm"
 #include "code\modules\asset_cache\assets\chemistry\pills.dm"
 #include "code\modules\asset_cache\assets\debug\fucky_wucky.dm"
+#include "code\modules\asset_cache\assets\items\holofabricator.dm"
 #include "code\modules\asset_cache\transports\asset_transport.dm"
 #include "code\modules\asset_cache\transports\webroot_transport.dm"
 #include "code\modules\atmospherics\atmosphere\atmosphere.dm"
@@ -3471,6 +3497,7 @@
 #include "code\modules\mob\living\carbon\give.dm"
 #include "code\modules\mob\living\carbon\health.dm"
 #include "code\modules\mob\living\carbon\inventory.dm"
+#include "code\modules\mob\living\carbon\life.dm"
 #include "code\modules\mob\living\carbon\organs.dm"
 #include "code\modules\mob\living\carbon\perspective.dm"
 #include "code\modules\mob\living\carbon\physiology.dm"
@@ -3507,6 +3534,7 @@
 #include "code\modules\mob\living\carbon\brain\say.dm"
 #include "code\modules\mob\living\carbon\human\appearance.dm"
 #include "code\modules\mob\living\carbon\human\blood.dm"
+#include "code\modules\mob\living\carbon\human\damage_procs.dm"
 #include "code\modules\mob\living\carbon\human\death.dm"
 #include "code\modules\mob\living\carbon\human\defense.dm"
 #include "code\modules\mob\living\carbon\human\dummy.dm"
@@ -3516,7 +3544,6 @@
 #include "code\modules\mob\living\carbon\human\health.dm"
 #include "code\modules\mob\living\carbon\human\human.dm"
 #include "code\modules\mob\living\carbon\human\human_attackhand.dm"
-#include "code\modules\mob\living\carbon\human\human_damage.dm"
 #include "code\modules\mob\living\carbon\human\human_defense.dm"
 #include "code\modules\mob\living\carbon\human\human_defines.dm"
 #include "code\modules\mob\living\carbon\human\human_helpers.dm"
@@ -3666,6 +3693,7 @@
 #include "code\modules\mob\living\silicon\robot\subtypes\syndicate.dm"
 #include "code\modules\mob\living\simple_mob\appearance.dm"
 #include "code\modules\mob\living\simple_mob\combat.dm"
+#include "code\modules\mob\living\simple_mob\damage_procs.dm"
 #include "code\modules\mob\living\simple_mob\defense.dm"
 #include "code\modules\mob\living\simple_mob\hands.dm"
 #include "code\modules\mob\living\simple_mob\harvesting.dm"
@@ -4466,6 +4494,48 @@
 #include "code\modules\resleeving\machines.dm"
 #include "code\modules\resleeving\mirror.dm"
 #include "code\modules\resleeving\sleevecard.dm"
+#include "code\modules\rigsuits\modules\dynamic.dm"
+#include "code\modules\rigsuits\modules\rig_module.dm"
+#include "code\modules\rigsuits\modules\toolset.dm"
+#include "code\modules\rigsuits\modules\engineering\holofabricator.dm"
+#include "code\modules\rigsuits\modules\engineering\toolset.dm"
+#include "code\modules\rigsuits\modules\medical\medichine.dm"
+#include "code\modules\rigsuits\modules\medical\toolset.dm"
+#include "code\modules\rigsuits\rig\activation.dm"
+#include "code\modules\rigsuits\rig\armor.dm"
+#include "code\modules\rigsuits\rig\console.dm"
+#include "code\modules\rigsuits\rig\construction.dm"
+#include "code\modules\rigsuits\rig\control.dm"
+#include "code\modules\rigsuits\rig\defense.dm"
+#include "code\modules\rigsuits\rig\environmentals.dm"
+#include "code\modules\rigsuits\rig\interaction.dm"
+#include "code\modules\rigsuits\rig\modules.dm"
+#include "code\modules\rigsuits\rig\pieces.dm"
+#include "code\modules\rigsuits\rig\power.dm"
+#include "code\modules\rigsuits\rig\rig.dm"
+#include "code\modules\rigsuits\rig\rig_console.dm"
+#include "code\modules\rigsuits\rig\rig_maint_panel.dm"
+#include "code\modules\rigsuits\rig\rig_piece.dm"
+#include "code\modules\rigsuits\rig\rig_zone.dm"
+#include "code\modules\rigsuits\rig\themes.dm"
+#include "code\modules\rigsuits\rig\ui.dm"
+#include "code\modules\rigsuits\rig\zones.dm"
+#include "code\modules\rigsuits\themes\rig_theme.dm"
+#include "code\modules\rigsuits\themes\rig_theme_piece.dm"
+#include "code\modules\rigsuits\themes\faction\mercenary.dm"
+#include "code\modules\rigsuits\themes\faction\nanotrasen.dm"
+#include "code\modules\rigsuits\themes\species\_species.dm"
+#include "code\modules\rigsuits\themes\species\nepid.dm"
+#include "code\modules\rigsuits\themes\species\protean.dm"
+#include "code\modules\rigsuits\themes\station\_station.dm"
+#include "code\modules\rigsuits\themes\station\cargo.dm"
+#include "code\modules\rigsuits\themes\station\civilian.dm"
+#include "code\modules\rigsuits\themes\station\command.dm"
+#include "code\modules\rigsuits\themes\station\engineering.dm"
+#include "code\modules\rigsuits\themes\station\exploration.dm"
+#include "code\modules\rigsuits\themes\station\medical.dm"
+#include "code\modules\rigsuits\themes\station\science.dm"
+#include "code\modules\rigsuits\themes\station\security.dm"
 #include "code\modules\rogueminer_vr\asteroid.dm"
 #include "code\modules\rogueminer_vr\controller.dm"
 #include "code\modules\rogueminer_vr\debug.dm"

code/__DEFINES/_bitfields.dm

@@ -13,3 +13,11 @@
 // todo: get rid of this, rename BITFIELD_NAMED to this
 #define BITFIELD(thing) #thing = thing
 #define BITFIELD_NAMED(name, thing) name = thing
+
+/// KEY: must be unique, may be arbitrary; not a string, as it's used in typepath generation
+/// CONSTRAINTS: list(/type = list(varname, ...), ...)
+/// BITFIELDS: list of BITFIELD_NEW().
+#define DEFINE_BITFIELD_NEW(KEY, CONSTRAINTS, BITFIELDS)
+/// NAME: must be a string
+/// VALUE: the actual enum value, whatever it is
+#define BITFIELD_NEW(NAME, VALUE) ##NAME = ##VALUE

code/__DEFINES/_flags/atom_flags.dm

@@ -9,6 +9,7 @@
 #define ATOM_OVERLAY_QUEUED (1<<3)
 /// Atom is absolute-abstract - should not be interactable or movable in any way shape or form
 /// This is for stuff like lighting.
+/// If you detect this in Cross() while registering crossed objects, you should probably ignore this!
 #define ATOM_ABSTRACT       (1<<4)
 /// Atom is not considered a game world object.
 /// This means semantic "wipe game world state" things like turf.empty(), saving, loading, etc, should ignore it,
@@ -29,6 +30,8 @@
 /// Does not leave user's fingerprints/fibers when used on things?
 #define NOPRINT             (1<<12) // TODO: item flag
 
+/// we were made by a holofabricator
+#define ATOM_HOLOFABRICATED			(1<<21)
 /// We are ticking in materials
 #define ATOM_MATERIALS_TICKING		(1<<22)
 /// Use initial icon/icon state for HTML renders in things like VV
@@ -48,6 +51,7 @@ DEFINE_BITFIELD(atom_flags, list(
 	BITFIELD(OPENCONTAINER),
 	BITFIELD(PHORONGUARD),
 	BITFIELD(NOPRINT),
+	BITFIELD_NEW("Holofabricated", ATOM_HOLOFABRICATED),
 	BITFIELD(ATOM_MATERIALS_TICKING),
 	BITFIELD(ATOM_HTML_INITIAL_ICON),
 ))

code/__DEFINES/_flags/item_flags.dm

@@ -112,7 +112,11 @@ DEFINE_BITFIELD(clothing_flags, list(
 /// Hides the user's hair, facial and otherwise.
 #define BLOCKHAIR			(1<<12)
 
-DEFINE_BITFIELD(inv_hide_flags, list(
+DEFINE_SHARED_BITFIELD(inv_hide_flags, list(
+	"inv_hide_flags",
+	"inv_hide_flags_active",
+	"inv_hide_flags_inactive",
+), list(
 	BITFIELD(HIDEGLOVES),
 	BITFIELD(HIDESUITSTORAGE),
 	BITFIELD(HIDEJUMPSUIT),

code/__DEFINES/coloration.dm

@@ -0,0 +1,25 @@
+//* This file is explicitly licensed under the MIT license. *//
+//* Copyright (c) 2023 Citadel Station developers.          *//
+
+//* coloration_mode
+
+/// no recoloring
+#define COLORATION_MODE_NONE (1<<0)
+/// free normal multiply color
+#define COLORATION_MODE_MULTIPLY (1<<1)
+/// free matrix or normal multiply color
+#define COLORATION_MODE_MATRIX (1<<2)
+/// red-green matrix for parts 1, 2.
+#define COLORATION_MODE_RG_MATRIX (1<<3)
+/// red-blue matrix for parts 1, 2
+#define COLORATION_MODE_RB_MATRIX (1<<4)
+/// green-blue matrix for parts 1, 2
+#define COLORATION_MODE_GB_MATRIX (1<<5)
+/// red-green-blue matrix for parts 1, 2, 3
+#define COLORATION_MODE_RGB_MATRIX (1<<6)
+/// overlays - dynamic amount
+//  todo: implement
+#define COLORATION_MODE_OVERLAYS (1<<7)
+
+#define COLORATION_MODES_COMPLEX (COLORATION_MODE_RG_MATRIX | COLORATION_MODE_RB_MATRIX | COLORATION_MODE_GB_MATRIX \
+	| COLORATION_MODE_RGB_MATRIX | COLORATION_MODE_OVERLAYS )

code/__DEFINES/datums/beam.dm

@@ -0,0 +1,7 @@
+//* This file is explicitly licensed under the MIT license. *//
+//* Copyright (c) 2023 Citadel Station developers.          *//
+
+/// use single, transform matrix'd line
+#define BEAM_VISUAL_STRETCH "stretch"
+/// use segments
+#define BEAM_VISUAL_SEGMENTS "segments"

code/__DEFINES/event_args.dm → code/__DEFINES/datums/event_args.dm

@@ -1,3 +1,5 @@
+// todo: seriously evaluate how we use these
+
 //? for /datum/event_args/actor
 
 #define WRAP_MOB_TO_ACTOR_EVENT_ARGS(VARNAME) VARNAME = ismob(VARNAME)? new /datum/event_args/actor(VARNAME) : VARNAME