rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
fish-station/Content.Client/Info
History
Vigers Ray 389ed704e1 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Client/Entry/EntryPoint.cs
#	Content.Client/IoC/ClientContentIoC.cs
#	Content.Server/Administration/Managers/BanManager.cs
#	Content.Server/Chat/Managers/ChatSanitizationManager.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Content.Server/Traitor/Uplink/UplinkSystem.cs
#	Content.Shared/Interaction/SharedInteractionSystem.cs
#	Content.Shared/Localizations/ContentLocalizationManager.cs
#	Content.Shared/Roles/JobRequirement/DepartmentTimeRequirement.cs
#	Content.Shared/Roles/JobRequirement/OverallPlaytimeRequirement.cs
#	Content.Shared/Roles/JobRequirement/RoleTimeRequirement.cs
#	Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
#	Resources/Audio/Ambience/Antag/attributions.yml
#	Resources/Audio/Weapons/Guns/Gunshots/attributions.yml
#	Resources/Locale/en-US/_strings/advertisements/other/firebot.ftl
#	Resources/Locale/en-US/_strings/shuttles/commands.ftl
#	Resources/Prototypes/Datasets/Names/last.yml
#	Resources/Prototypes/Entities/Mobs/Player/silicon.yml
#	Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/Prototypes/Roles/Jobs/Science/borg.yml
#	Resources/Prototypes/Shuttles/shuttle_incoming_event.yml
#	Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
#	Resources/Textures/Clothing/Head/Hats/warden.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hats/warden.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING-monkey.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json
#	Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json
#	Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
#	RobustToolbox
2024-10-30 13:26:32 +03:00
..
PlaytimeStats Fix playtime formatting (#32974) 2024-10-28 19:00:00 +01:00
DevInfoBanner.cs Редизайн лобби 2 2024-07-05 10:22:18 +03:00
Info.xaml Xaml Rules and Info (#5741) 2021-12-15 22:17:01 -08:00
Info.xaml.cs Seal/abstract/virtual everything (#6739) 2022-02-16 18:23:23 +11:00
InfoControlsSection.xaml Xaml Rules and Info (#5741) 2021-12-15 22:17:01 -08:00
InfoControlsSection.xaml.cs Seal/abstract/virtual everything (#6739) 2022-02-16 18:23:23 +11:00
InfoSection.xaml Xaml Rules and Info (#5741) 2021-12-15 22:17:01 -08:00
InfoSection.xaml.cs Remove calls to FormattedMessage obsolete methods (#31706) 2024-09-01 13:00:53 +02:00
LinkBanner.cs Фиксы и локализация профиля лобби 2024-10-12 17:43:21 +03:00
RulesAndInfoWindow.cs Convert rules to use guidebook parsing (#28647) 2024-06-06 03:11:26 -04:00
RulesControl.xaml Convert rules to use guidebook parsing (#28647) 2024-06-06 03:11:26 -04:00
RulesControl.xaml.cs Give jobs & antags prototypes a guide field (#28614) 2024-06-06 05:05:58 -07:00
RulesPopup.xaml Convert rules to use guidebook parsing (#28647) 2024-06-06 03:11:26 -04:00
RulesPopup.xaml.cs Convert rules to use guidebook parsing (#28647) 2024-06-06 03:11:26 -04:00
ServerInfo.cs Remove calls to FormattedMessage obsolete methods (#31706) 2024-09-01 13:00:53 +02:00