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
..
AdminUI	Content update for NetEntities (#18935)	2023-09-11 09:42:41 +10:00
FaxConstants.cs	Improve Paper UI, allow an to entity configure how it's UI looks (#13494)	2023-01-17 19:32:46 +11:00
FaxMachineComponent.cs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-08-24 22:01:46 +03:00
FaxSystem.cs	Content update for UI prediction (#27214)	2024-04-26 18:16:24 +10:00