Morb0 4ee0df9498 Merge remote-tracking branch 'upstream/master' into master-syndie ... # Conflicts: # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Resources/Prototypes/Catalog/Fills/Lockers/heads.yml # Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml # Resources/Prototypes/Voice/speech_emotes.yml # Resources/Textures/Structures/stairs.rsi/meta.json # Resources/Textures/Structures/stairs.rsi/stairs.png # Resources/Textures/Structures/stairs.rsi/stairs_stage.png		2024-02-22 13:19:02 +03:00
..
VendingMachineMenu.xaml	Vending UI facelift (#25377)	2024-02-19 15:18:26 -07:00
VendingMachineMenu.xaml.cs	Merge remote-tracking branch 'upstream/master' into master-syndie	2024-02-22 13:19:02 +03:00