rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
fish-station/Content.Client/Construction/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
..
ConstructionMenu.xaml Перевод меню строительства (#179) 2024-07-12 04:26:24 +03:00
ConstructionMenu.xaml.cs Перевод меню строительства (#179) 2024-07-12 04:26:24 +03:00
ConstructionMenuPresenter.cs Перевод меню строительства (#179) 2024-07-12 04:26:24 +03:00
FlatpackCreatorBoundUserInterface.cs Reapply "Remove some BUI boilerplate" (#30214) (#30219) 2024-07-21 14:48:13 +10:00
FlatpackCreatorMenu.xaml Flatpacker fixes (#28417) 2024-06-06 20:55:35 -04:00
FlatpackCreatorMenu.xaml.cs Reapply "Remove some BUI boilerplate" (#30214) (#30219) 2024-07-21 14:48:13 +10:00