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
..
AnimalHusbandrySystem.cs	Add a system for modifying entity names without causing conflicts (#27863)	2024-06-16 15:38:53 -04:00
CreamPieSystem.cs	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-08-22 06:50:04 +03:00
DrinkSystem.cs	Remove obsolete code from Food, Drink and Respirator systems. (#30560)	2024-08-02 17:30:45 +10:00
FatExtractorSystem.cs	Use new ComponentPauseGenerator (#25183)	2024-02-26 14:36:19 +11:00
FlavorProfileSystem.cs	Revert 'Revert 'Solution Entities'' (#23168)	2023-12-29 08:47:43 -04:00
FoodSequenceSystem.cs	Fix lizards being unable to eat custom burgers (#31005)	2024-08-14 13:47:03 -06:00
FoodSystem.cs	Custom burgers - FoodSequence system (#30755)	2024-08-10 22:31:32 +03:00
IngestionBlockerSystem.cs	Fix masks not toggling voice mask component (#22506)	2023-12-14 20:39:11 -05:00
SliceableFoodSystem.cs	Cutting food now moves the food a little bit. (#31166)	2024-08-19 00:18:20 +03:00
SmokingSystem.Cigar.cs	Decouple interactions from hands, cleanup old events, add new fears (#28393)	2024-05-31 13:26:19 -07:00
SmokingSystem.cs	replace all uses of TryGetContainingContainer with non-obsolete overload (#30583)	2024-08-04 15:38:53 +10:00
SmokingSystem.SmokingPipe.cs	Update SmokingSystem.SmokingPipe.cs to not use Component.Owner (#29967)	2024-07-13 14:06:54 +10:00
SmokingSystem.Vape.cs	Move GasMixture to shared (#27480)	2024-04-30 14:31:05 -07:00
TrashOnSolutionEmptySystem.cs	Fix TrashOnSolutionEmptySystem modifying uninitialized entities (#23798)	2024-01-09 13:11:22 -05:00
UtensilSystem.cs	Secret stash refractor (#29396)	2024-08-09 09:51:58 +10:00