Morb0 75443d7fb6 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Server/Communications/CommunicationsConsoleSystem.cs # README.md # Resources/Prototypes/Entities/Mobs/Species/reptilian.yml # Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml # Resources/Prototypes/secret_weights.yml # Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-left.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-right.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/meta.json		2023-10-11 16:56:19 +03:00
..
Controls	Update content vectors to numerics (#17759)	2023-07-08 14:08:32 +10:00
Widgets	:( (#20440)	2023-09-23 13:44:49 -05:00
ChatUIController.cs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-10-11 16:56:19 +03:00