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
..
Electronics/Systems	Content update for UI prediction (#27214)	2024-04-26 18:16:24 +10:00
Systems	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-02-26 15:14:44 +03:00
WireActions	Predict doors and airlocks (#25419)	2024-02-23 10:01:31 +11:00