Morb0 f062cbcec2 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Server/Chat/Systems/ChatSystem.cs # LICENSE.TXT # Resources/Prototypes/Catalog/Fills/Lockers/heads.yml # Resources/Prototypes/Catalog/Fills/Lockers/security.yml # Resources/Prototypes/Entities/Mobs/Species/reptilian.yml # 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/Head/Hats/hoshat.rsi/equipped-HELMET-hamster.png # Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hats/hoshat.rsi/icon.png # Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-left.png # Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-right.png # Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/equipped-NECK.png # Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png # Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png # Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json # 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/Clothing/Uniforms/Jumpsuit/roboticist.rsi/meta.json # Resources/Textures/Structures/Piping/disposal.rsi/conmailing.png # Resources/Textures/Structures/Piping/disposal.rsi/mailing-charging.png # Resources/Textures/Structures/Piping/disposal.rsi/mailing-flush.png # Resources/Textures/Structures/Piping/disposal.rsi/mailing.png # Resources/Textures/Structures/Piping/disposal.rsi/mailover-handle.png # Resources/Textures/Structures/Piping/disposal.rsi/meta.json		2024-01-02 23:07:58 +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	2023-12-14 00:57:14 +03:00
ChatUIController.cs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-01-02 23:07:58 +03:00