Morb0 38506f90df Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync ... # Conflicts: # Content.Server/VoiceMask/VoiceMaskSystem.cs # Resources/Prototypes/Entities/Clothing/Hands/specific.yml # Resources/Prototypes/Entities/Clothing/Masks/specific.yml # Resources/Prototypes/Entities/Clothing/Uniforms/specific.yml # Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml		2024-04-27 13:24:36 +03:00
..
BlockGame	Content update for UI prediction (#27214)	2024-04-26 18:16:24 +10:00
SpaceVillainGame	Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync	2024-04-27 13:24:36 +03:00
WireActions	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00
ArcadeSystem.cs	ECS Arcade Machines (#16791)	2023-06-15 21:25:25 +10:00