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
..
ActiveMaterialReclaimerComponent.cs	Use new ComponentPauseGenerator (#25183)	2024-02-26 14:36:19 +11:00
CollideMaterialReclaimerComponent.cs	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00
InsertingMaterialStorageComponent.cs	Use new ComponentPauseGenerator (#25183)	2024-02-26 14:36:19 +11:00
MaterialComponent.cs	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00
MaterialPrototype.cs	Makes machine parts stackable, removes unused field in stack prototypes (#28434)	2024-06-01 13:49:28 -04:00
MaterialReclaimerComponent.cs	Recycler Overhaul (#30802)	2024-08-18 21:39:00 -06:00
MaterialStorageComponent.cs	Make the material ejection control completely generic (#23308)	2023-12-31 23:16:25 -08:00
PhysicalCompositionComponent.cs	Allow solutions to store extra reagent data (#19323)	2023-09-05 07:55:10 +10:00
SharedMaterialReclaimerSystem.cs	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-08-22 06:50:04 +03:00
SharedMaterialStorageSystem.cs	Fix material storage going BRRT (#29167)	2024-06-18 17:47:19 -04:00