mirror of
https://github.com/space-syndicate/space-station-14.git
synced 2026-11-18 00:44:16 +03:00
# Conflicts: # Content.Client/Options/UI/Tabs/AudioTab.xaml.cs # Content.Server/Chat/Managers/ChatManager.cs # Content.Server/Chat/Systems/ChatSystem.cs # Content.Server/GameTicking/GameTicker.StatusShell.cs # Content.Server/RoundEnd/RoundEndSystem.cs # Resources/Prototypes/Datasets/Names/Operation_suffix.yml # Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml # Resources/Prototypes/Maps/core.yml # Resources/ServerInfo/Guidebook/Cargo/Salvage.xml # Resources/ServerInfo/Guidebook/Science/Robotics.xml |
||
|---|---|---|
| .. | ||
| crosshair_pointers.rsi | ||
| food_icons.rsi | ||
| health_bar.rsi | ||
| job_icons.rsi | ||
| pointing.rsi | ||
| program_icons.rsi | ||
| progress_bar.rsi | ||
| research_disciplines.rsi | ||
| beakerlarge.png | ||
| buffering_smite_icon.png | ||