NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-11 11:21:11 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 5
CatStation/Content.Client/Administration
History
Exact
Morb0 b1550d7db0 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	.github/CODEOWNERS
#	Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
#	Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
#	Resources/Textures/Effects/speech.rsi/meta.json
#	Resources/Textures/Structures/Machines/microwave.rsi/mwbloody1.png
2023-09-05 00:12:02 +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 Add ahelp typing indicator for admins (#19060) 2023-08-13 18:03:17 -05:00
UI Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-09-05 00:12:02 +03:00
AdminNameOverlay.cs Update content vectors to numerics (#17759) 2023-07-08 14:08:32 +10:00
QuickDialogSystem.cs Move/Rename stuff (#11209) 2022-09-11 18:56:21 -07:00