NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-09 10:21:18 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
CatStation/Content.Client/CrewManifest
History
Exact
Morb0 721f7bfecf Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 
# Conflicts:
#	Content.Server/Connection/ConnectionManager.cs
#	Resources/Prototypes/Datasets/Names/ai.yml
#	Resources/Prototypes/Datasets/adjectives.yml
#	Resources/Prototypes/Datasets/verbs.yml
#	Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
#	Resources/Prototypes/Entities/Mobs/base.yml
#	Resources/Prototypes/Maps/bagel.yml
#	Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
#	Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
#	Resources/Textures/Structures/Wallmounts/barsign.rsi/officerbeersky.png
#	Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png
#	SpaceStation14.sln
2024-08-28 16:40:36 +03:00
..
UI Add tooltips to the agent ID job icons and improve status icon prototypes (#28575) 2024-08-09 16:14:07 +10:00
CrewManifestEui.cs Ensure EUIs close themselves (#15860) 2023-04-29 13:16:24 +10:00
CrewManifestSystem.cs Use ECS prototype-reload events (#22613) 2023-12-23 01:13:45 +11:00
CrewManifestUi.xaml Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-08-06 06:33:32 +03:00
CrewManifestUi.xaml.cs Power stuff (#31314) 2024-08-25 22:18:42 +10:00