VigersRay 0441b8b814 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Client/Launcher/LauncherConnecting.cs # Content.Client/Launcher/LauncherConnectingGui.xaml # Content.Client/Launcher/LauncherConnectingGui.xaml.cs # Content.Server/Administration/Managers/BanManager.cs # Content.Server/Medical/Components/HealthAnalyzerComponent.cs # Content.Server/Medical/HealthAnalyzerSystem.cs # Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs # Content.Server/StationEvents/Events/RandomSentienceRule.cs # Content.Shared/Interaction/Components/BlockMovementComponent.cs # Content.Shared/Interaction/SharedInteractionSystem.Blocking.cs # Content.Shared/Materials/SharedMaterialReclaimerSystem.cs # Resources/Prototypes/Accents/word_replacements.yml # Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml # Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml # Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml # Resources/Prototypes/Entities/Structures/Machines/lathe.yml # Resources/Prototypes/Objectives/objectiveGroups.yml # Resources/Prototypes/Objectives/stealTargetGroups.yml # Resources/Prototypes/Roles/Jobs/Security/detective.yml # Resources/Prototypes/Species/human.yml # Resources/Prototypes/Voice/speech_emotes.yml # Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml # Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml # Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml # Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml # Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml # Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml # Resources/ServerInfo/Guidebook/Antagonist/Zombies.xml # Resources/migration.yml		2024-08-22 06:50:04 +03:00
..
Commands	Revert "Fix chat bubbles (#25643)" (#25645)	2024-02-28 00:51:20 +11:00
Completions	Fix cooking sizzle noise (#31096)	2024-08-18 21:01:43 -06:00
Components	Machine-code cleanup (#28489)	2024-06-05 16:23:23 -04:00
Conditions	Add MinHealth Construction Condition (#30892)	2024-08-11 19:14:35 +10:00
NodeEntities	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00
ConstructionSystem.Computer.cs	Content ecs containers (#22484)	2023-12-28 01:30:03 -04:00
ConstructionSystem.cs	Machine-code cleanup (#28489)	2024-06-05 16:23:23 -04:00
ConstructionSystem.Graph.cs	Machine-code cleanup (#28489)	2024-06-05 16:23:23 -04:00
ConstructionSystem.Guided.cs	Machine-code cleanup (#28489)	2024-06-05 16:23:23 -04:00
ConstructionSystem.Initial.cs	Статистика конца раунда (#239)	2024-07-25 02:01:01 +03:00
ConstructionSystem.Interactions.cs	Add BreakOnDropItem, update do afters, remove unnecessary declarations (#30361)	2024-08-08 13:39:46 +02:00
ConstructionSystem.Machine.cs	Machine-code cleanup (#28489)	2024-06-05 16:23:23 -04:00
ConstructionSystem.Pathfinding.cs	Cleanup the namespaces (#8132)	2022-05-13 17:59:03 +10:00
FlatpackSystem.cs	Fix flatpacker (#28736)	2024-06-08 18:48:23 +10:00
MachineFrameSystem.cs	Machine-code cleanup (#28489)	2024-06-05 16:23:23 -04:00