Morb0 32a8d1a21e Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Client/Preferences/UI/HumanoidProfileEditor.xaml # Content.Server/Power/Generator/GeneratorSystem.cs # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml # Resources/Prototypes/Entities/Objects/Misc/paper.yml # Resources/Prototypes/Voice/speech_emotes.yml # Resources/Textures/Effects/speech.rsi/meta.json # Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/assembly.png		2024-02-03 03:38:29 +03:00
..
Bartender.xml	DNA and Bartender guidebooks translade (#1643)	2023-12-16 02:40:55 +03:00
Botany.xml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-01-21 04:05:37 +03:00
Chef.xml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-21 03:03:30 +03:00
FoodRecipes.xml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-01-10 00:23:02 +03:00
Janitorial.xml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-02-03 03:38:29 +03:00