rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
fish-station/Content.Client/Research/UI
History
VigersRay d2c1a1df88 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
#	Content.Client/Power/PowerMonitoringWindow.xaml.cs
#	Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorBoundUi.cs
#	Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs
#	Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
#	Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/GameTicking/GameTicker.RoundFlow.cs
#	Content.Server/Ghost/Roles/GhostRoleSystem.cs
#	Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
#	Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs
#	Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
#	Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml
#	Resources/Textures/Structures/Walls/mining.rsi/meta.json
2024-07-22 04:16:05 +03:00
..
DiskConsoleBoundUserInterface.cs Reapply "Remove some BUI boilerplate" (#30214) (#30219) 2024-07-21 14:48:13 +10:00
DiskConsoleMenu.xaml Technology Disks (#13077) 2022-12-20 16:39:57 -06:00
DiskConsoleMenu.xaml.cs Technology Disks (#13077) 2022-12-20 16:39:57 -06:00
MiniTechnologyCardControl.xaml Remove custom tooltip timings (#19604) 2023-09-11 13:53:35 +10:00
MiniTechnologyCardControl.xaml.cs Avoid emptying and recreating all UI cards on every update (#21990) 2023-11-29 14:49:44 -05:00
ResearchClientBoundUserInterface.cs Reapply "Remove some BUI boilerplate" (#30214) (#30219) 2024-07-21 14:48:13 +10:00
ResearchClientServerSelectionMenu.xaml Fixing some warnings (#6250) 2022-01-21 10:38:35 +01:00
ResearchClientServerSelectionMenu.xaml.cs Reapply "Remove some BUI boilerplate" (#30214) (#30219) 2024-07-21 14:48:13 +10:00
ResearchConsoleBoundUserInterface.cs Reapply "Remove some BUI boilerplate" (#30214) (#30219) 2024-07-21 14:48:13 +10:00
ResearchConsoleMenu.xaml Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
ResearchConsoleMenu.xaml.cs Reapply "Remove some BUI boilerplate" (#30214) (#30219) 2024-07-21 14:48:13 +10:00
TechnologyCardControl.xaml Fix PDA capitalization to be PascalCase (#17335) 2023-06-15 11:44:28 +10:00
TechnologyCardControl.xaml.cs Fix some markup related obsolete warnings in research and anomaly related systems (#30072) 2024-07-15 22:14:37 +03:00