Morb0 5aa1642ba2 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Server/Chat/Systems/ChatSystem.cs # Content.Server/VoiceMask/VoiceMaskComponent.cs # Resources/Prototypes/SoundCollections/lobby.yml # Resources/ServerInfo/Guidebook/Science/MachineUpgrading.xml # Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon-flash.png # Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon.png # Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET.png # Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET.png # Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-right.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json # Resources/Textures/Structures/Walls/solidrust.rsi/full.png # Resources/Textures/Structures/Walls/solidrust.rsi/meta.json # Resources/Textures/Structures/Walls/solidrust.rsi/solidrust0.png # Resources/Textures/Structures/Walls/solidrust.rsi/solidrust1.png # Resources/Textures/Structures/Walls/solidrust.rsi/solidrust2.png # Resources/Textures/Structures/Walls/solidrust.rsi/solidrust3.png # Resources/Textures/Structures/Walls/solidrust.rsi/solidrust4.png # Resources/Textures/Structures/Walls/solidrust.rsi/solidrust5.png # Resources/Textures/Structures/Walls/solidrust.rsi/solidrust6.png # Resources/Textures/Structures/Walls/solidrust.rsi/solidrust7.png		2024-01-26 01:14:50 +03:00
..
Controls	Use different chatbox placeholder when dependent keys unbound (#22747)	2023-12-22 11:39:29 -08:00
Widgets	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-01-26 01:14:50 +03:00
ChatUIController.cs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-01-02 23:07:58 +03:00