Morb0 13b3bfa217 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # .github/CODEOWNERS # .github/workflows/update-wiki.yml # Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs # Content.Shared/Humanoid/HumanoidCharacterAppearance.cs # Content.Shared/Humanoid/Markings/MarkingPrototype.cs # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Resources/Prototypes/Entities/Clothing/Hands/gloves.yml # Resources/ServerInfo/Guidebook/Engineering/AME.xml # Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml # Resources/manifest.yml		2023-09-24 12:56:24 +03:00
..
UI	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-09-24 12:56:24 +03:00
VendingMachineBoundUserInterface.cs	Adds a search bar to vending machines (#20326)	2023-09-20 15:40:41 -04:00
VendingMachineSystem.cs	more component ref removal + combining server/client comps (#13178)	2022-12-25 05:28:21 +01:00