mirror of
https://github.com/space-syndicate/space-station-14.git
synced 2026-10-20 23:41:13 +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 |
||
|---|---|---|
| .. | ||
| cracks.rsi | ||
| cracks_diagonal.rsi | ||
| cracks_directional.rsi | ||
| directional.rsi | ||
| mining.rsi | ||
| mining_diagonal.rsi | ||
| plasma_diagonal.rsi | ||
| plasma_window.rsi | ||
| reinforced_plasma_diagonal.rsi | ||
| reinforced_plasma_window.rsi | ||
| reinforced_uranium_diagonal.rsi | ||
| reinforced_uranium_window.rsi | ||
| reinforced_window.rsi | ||
| reinforced_window_diagonal.rsi | ||
| shuttle_window.rsi | ||
| shuttle_window_diagonal.rsi | ||
| tinted_window.rsi | ||
| uranium_window.rsi | ||
| uranium_window_diagonal.rsi | ||
| window.rsi | ||
| window_diagonal.rsi | ||