d791eb37bd
# Conflicts: # .github/CODEOWNERS # Content.Client/Options/UI/Tabs/AccessibilityTab.xaml # Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs # Content.Server/Access/Systems/AgentIDCardSystem.cs # Content.Server/Clothing/Systems/ChameleonClothingSystem.cs # Content.Server/Entry/IgnoredComponents.cs # Content.Shared/Access/Systems/SharedIdCardSystem.cs # Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs # Content.Shared/Inventory/InventorySystem.Relay.cs # Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs # Resources/Locale/en-US/_strings/atmos/atmos-pipe-layers.ftl # Resources/Locale/en-US/_strings/chat/highlights.ftl # Resources/Locale/en-US/_strings/implant/chameleon-controller.ftl # Resources/Locale/en-US/_strings/prototypes/roles/antags.ftl # Resources/Locale/en-US/_strings/reagents/absinthe.ftl # Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml # Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml # Resources/Prototypes/Entities/Structures/Wallmounts/mirror.yml # Resources/Prototypes/Entities/Structures/cryogenic_sleep_unit.yml # Resources/Prototypes/Recipes/Lathes/categories.yml # Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml # Resources/Prototypes/Roles/Jobs/CentComm/official.yml # Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml # Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml # Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml # Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml # Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml # Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml # Resources/Prototypes/Roles/Jobs/Science/research_director.yml # Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml # Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml # Resources/Prototypes/Roles/Jobs/Security/security_officer.yml # Resources/Prototypes/Roles/Jobs/Security/warden.yml # Resources/Textures/Structures/Doors/secret_door.rsi/assembly.png # Resources/Textures/Structures/Doors/secret_door.rsi/closed.png # Resources/Textures/Structures/Doors/secret_door.rsi/closing.png # Resources/Textures/Structures/Doors/secret_door.rsi/meta.json # Resources/Textures/Structures/Doors/secret_door.rsi/open.png # Resources/Textures/Structures/Doors/secret_door.rsi/opening.png # Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm0.png # Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm1.png # Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm2.png # Resources/migration.yml |
||
|---|---|---|
| .. | ||
| AccessibilityTab.xaml | ||
| AccessibilityTab.xaml.cs | ||
| AdminOptionsTab.xaml | ||
| AdminOptionsTab.xaml.cs | ||
| AudioTab.xaml | ||
| AudioTab.xaml.cs | ||
| ExtraTab.xaml | ||
| ExtraTab.xaml.cs | ||
| GraphicsTab.xaml | ||
| GraphicsTab.xaml.cs | ||
| KeyRebindTab.xaml | ||
| KeyRebindTab.xaml.cs | ||
| MiscTab.xaml | ||
| MiscTab.xaml.cs | ||