NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-14 12:51:10 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
CatStation/Content.Client/Administration
History
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
..
Components Refactor serialization copying to use source generators (#19412) 2023-08-22 18:14:33 -07:00
Managers Allow zoom command to ignore zoom limits (#19419) 2023-08-22 19:27:41 +10:00
Systems Content update for NetEntities (#18935) 2023-09-11 09:42:41 +10:00
UI Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-09-24 12:56:24 +03:00
AdminNameOverlay.cs Content update for NetEntities (#18935) 2023-09-11 09:42:41 +10:00
QuickDialogSystem.cs Move/Rename stuff (#11209) 2022-09-11 18:56:21 -07:00