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
..
Systems	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-10-11 16:56:19 +03:00
WireActions	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00