NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-12 03:41:14 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 13
CatStation/Content.Client/Administration
History
Morb0 8a0a435965 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/jester.rsi/meta.json
2024-01-05 00:55:19 +03:00
..
Components Refactor serialization copying to use source generators (#19412) 2023-08-22 18:14:33 -07:00
Managers Un-revert IPlayerManager refactor (#21244) 2023-10-28 09:59:53 +11:00
Systems Revert "Update submodule to 175.0.0 (#21318)" (#21319) 2023-10-29 15:29:30 +11:00
UI Merge remote-tracking branch 'upstream/master' into upstream-sync 2024-01-05 00:55:19 +03:00
AdminNameOverlay.cs Revert "Update submodule to 175.0.0 (#21318)" (#21319) 2023-10-29 15:29:30 +11:00
QuickDialogSystem.cs Move/Rename stuff (#11209) 2022-09-11 18:56:21 -07:00