rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
fish-station/Content.Client/Administration/UI/CustomControls
History
Vigers Ray 252e81c728 Merge remote-tracking branch 'space-wizards/master' 
# Conflicts:
#	Content.Client/Administration/UI/Logs/AdminLogsControl.xaml.cs
#	Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
#	Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
#	Content.Server/Mindshield/MindShieldSystem.cs
#	Content.Shared/Gravity/SharedGravitySystem.cs
#	Content.Shared/Implants/SharedSubdermalImplantSystem.cs
#	Resources/Locale/en-US/_strings/traits/traits.ftl
#	Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
#	Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml
#	Resources/Prototypes/Entities/Objects/Misc/implanters.yml
#	Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
#	Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
#	Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
#	Resources/Prototypes/Entities/Structures/Machines/surveillance_camera_routers.yml
#	Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
2025-08-23 23:10:05 +03:00
..
AdminLogImpactButton.cs Seal/abstract/virtual everything (#6739) 2022-02-16 18:23:23 +11:00
AdminLogPlayerButton.cs Seal/abstract/virtual everything (#6739) 2022-02-16 18:23:23 +11:00
AdminLogTypeButton.cs Seal/abstract/virtual everything (#6739) 2022-02-16 18:23:23 +11:00
CommandButton.cs Guidebook Revival (#13320) 2023-01-16 02:42:22 -06:00
HSeparator.cs Roadmap (#188) 2024-07-12 04:13:29 +03:00
PlayerListControl.xaml Admin UI localization (#29340) 2024-06-22 23:05:33 +10:00
PlayerListControl.xaml.cs Admin Log Browser Improvements (#39130) 2025-08-21 22:12:16 +02:00
PlayerListEntry.xaml aHelp fixes and improvements (#28639) 2024-07-30 18:28:32 +10:00
PlayerListEntry.xaml.cs Admin Log Browser Improvements (#39130) 2025-08-21 22:12:16 +02:00
UICommandButton.cs Seal/abstract/virtual everything (#6739) 2022-02-16 18:23:23 +11:00
VSeparator.cs Update content vectors to numerics (#17759) 2023-07-08 14:08:32 +10:00