mirror of
https://github.com/space-syndicate/space-station-14.git
synced 2026-10-14 21:01:14 +03:00
c124b716a3
# Conflicts: # Content.Server/Traits/TraitSystem.cs # Resources/Prototypes/Catalog/Fills/Lockers/heads.yml # Resources/Prototypes/Catalog/Research/technologies.yml # Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml # Resources/Prototypes/Maps/aspid.yml # Resources/Prototypes/Maps/bagel.yml # Resources/Prototypes/Maps/barratry.yml # Resources/Prototypes/Maps/box.yml # Resources/Prototypes/Maps/cluster.yml # Resources/Prototypes/Maps/fland.yml # Resources/Prototypes/Maps/kettle.yml # Resources/Prototypes/Maps/marathon.yml # Resources/Prototypes/Maps/meta.yml # Resources/Prototypes/Maps/moose.yml # Resources/Prototypes/Maps/omega.yml # Resources/Prototypes/Maps/origin.yml # Resources/Prototypes/Maps/saltern.yml # Resources/Prototypes/secret_weights.yml # Resources/Textures/Objects/Weapons/Melee/cleaver.rsi/inhand-left.png # Resources/Textures/Objects/Weapons/Melee/cleaver.rsi/inhand-right.png |
||
|---|---|---|
| .. | ||
| BanList | ||
| Bwoink | ||
| CustomControls | ||
| Logs | ||
| ManageSolutions | ||
| Notes | ||
| SetOutfit | ||
| SpawnExplosion | ||
| Tabs | ||
| AdminAnnounceWindow.xaml | ||
| AdminAnnounceWindow.xaml.cs | ||
| AdminMenuWindow.xaml | ||
| AdminMenuWindow.xaml.cs | ||
| AdminMenuWindowEui.cs | ||
| PermissionsEui.cs | ||