rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
fish-station/Content.Client/Administration/UI/Tabs
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
..
AdminbusTab Admin UI localization (#29340) 2024-06-22 23:05:33 +10:00
AdminTab Admin UI localization (#29340) 2024-06-22 23:05:33 +10:00
AtmosTab Admin UI localization (#29340) 2024-06-22 23:05:33 +10:00
BabyJailTab Fix baby jail (#29896) 2024-07-11 15:14:01 +10:00
ObjectsTab Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-07-22 04:16:05 +03:00
PanicBunkerTab Panic Bunker uses minutes not hours (#28805) 2024-06-09 22:45:47 +02:00
PlayerTab Фиксы спонсорки 2024-07-01 17:24:00 +03:00
RoundTab.xaml Admin UI localization (#29340) 2024-06-22 23:05:33 +10:00
RoundTab.xaml.cs Seal/abstract/virtual everything (#6739) 2022-02-16 18:23:23 +11:00
ServerTab.xaml Add panic bunker UI and automatic panic bunker (#20954) 2023-10-13 11:56:12 -07:00
ServerTab.xaml.cs Add panic bunker UI and automatic panic bunker (#20954) 2023-10-13 11:56:12 -07:00