5245c5ddcb
# Conflicts: # Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml.cs # Content.Server/Chat/Managers/ChatManager.cs # Content.Server/IoC/ServerContentIoC.cs # Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMonitorSystem.cs # Content.Shared/Preferences/Loadouts/RoleLoadout.cs # Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml # Resources/Prototypes/Entities/Stations/nanotrasen.yml # Resources/Prototypes/InventoryTemplates/arachnid_inventory_template.yml # Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml # Resources/Prototypes/Loadouts/role_loadouts.yml # Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml # Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml # Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml # Resources/Prototypes/Roles/Jobs/Medical/chemist.yml # Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml # Resources/Prototypes/Roles/Jobs/Science/research_director.yml # Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml # Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/icon.png # Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/meta.json # Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/icon.png # Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/meta.json # Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET-hamster.png # Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hats/hoshat.rsi/icon.png # Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-left.png # Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-right.png # Resources/Textures/Clothing/Head/Hats/hoshat.rsi/meta.json # Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json # Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-left.png # Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-right.png # Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png # Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png # Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-left.png # Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-right.png # Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING-monkey.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/inhand-left.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/inhand-right.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING-monkey.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/inhand-left.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/inhand-right.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING-monkey.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/inhand-left.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/inhand-right.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING-monkey.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/inhand-left.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/inhand-right.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING-monkey.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/inhand-left.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/inhand-right.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/meta.json # Resources/Textures/Objects/Storage/boxes.rsi/meta.json # Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_scrubber.rsi/unlit-full.png # Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_scrubber.rsi/unlit.png # Resources/migration.yml |
||
|---|---|---|
| .. | ||
| ISSUE_TEMPLATE | ||
| workflows | ||
| CODEOWNERS | ||
| config.yml | ||
| labeler.yml | ||
| PULL_REQUEST_TEMPLATE.md | ||
| rsi-schema.json | ||