mirror of
https://github.com/space-syndicate/space-station-14.git
synced 2026-10-10 02:41:18 +03:00
0b621a7b7e
# Conflicts: # Content.Client/Preferences/ClientPreferencesManager.cs # Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs # Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs # Content.Server/Preferences/Managers/ServerPreferencesManager.cs # Content.Server/Station/Systems/StationSpawningSystem.cs # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Content.Shared/Preferences/ICharacterProfile.cs # 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/Prototypes/Roles/Jobs/Wildcards/psychologist.yml # Resources/Textures/Clothing/Hands/Gloves/Color/blue.rsi/inhand-left.png # Resources/Textures/Clothing/Hands/Gloves/Color/blue.rsi/inhand-right.png # Resources/Textures/Clothing/Hands/Gloves/Color/brown.rsi/icon.png # Resources/Textures/Clothing/Hands/Gloves/Color/brown.rsi/inhand-left.png # Resources/Textures/Clothing/Hands/Gloves/Color/brown.rsi/inhand-right.png # Resources/Textures/Clothing/Hands/Gloves/Color/brown.rsi/meta.json # Resources/Textures/Clothing/Hands/Gloves/Color/color.rsi/meta.json # Resources/Textures/Clothing/Hands/Gloves/Color/gray.rsi/icon.png # Resources/Textures/Clothing/Hands/Gloves/Color/gray.rsi/inhand-left.png # Resources/Textures/Clothing/Hands/Gloves/Color/gray.rsi/inhand-right.png # Resources/Textures/Clothing/Hands/Gloves/Color/gray.rsi/meta.json # Resources/Textures/Clothing/Hands/Gloves/Color/green.rsi/equipped-HAND.png # Resources/Textures/Clothing/Hands/Gloves/Color/green.rsi/icon.png # Resources/Textures/Clothing/Hands/Gloves/Color/green.rsi/meta.json # Resources/Textures/Clothing/Hands/Gloves/Color/lightbrown.rsi/icon.png # Resources/Textures/Clothing/Hands/Gloves/Color/lightbrown.rsi/inhand-left.png # Resources/Textures/Clothing/Hands/Gloves/Color/lightbrown.rsi/inhand-right.png # Resources/Textures/Clothing/Hands/Gloves/Color/lightbrown.rsi/meta.json # Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/equipped-HAND.png # Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/icon.png # Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/inhand-left.png # Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/inhand-right.png # Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/meta.json # Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/equipped-HAND.png # Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/icon.png # Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/inhand-left.png # Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/inhand-right.png # Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/meta.json # Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/equipped-HAND.png # Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/icon.png # Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/inhand-left.png # Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/inhand-right.png # Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/meta.json # Resources/Textures/Clothing/Hands/Gloves/Color/white.rsi/icon.png # Resources/Textures/Clothing/Hands/Gloves/Color/white.rsi/meta.json # Resources/Textures/Clothing/Shoes/Color/black.rsi/meta.json # Resources/Textures/Clothing/Shoes/Color/blue.rsi/meta.json # Resources/Textures/Clothing/Shoes/Color/brown.rsi/meta.json # Resources/Textures/Clothing/Shoes/Color/green.rsi/meta.json # Resources/Textures/Clothing/Shoes/Color/orange.rsi/meta.json # Resources/Textures/Clothing/Shoes/Color/purple.rsi/meta.json # Resources/Textures/Clothing/Shoes/Color/red.rsi/meta.json # Resources/Textures/Clothing/Shoes/Color/white.rsi/meta.json # Resources/Textures/Clothing/Shoes/Color/yellow.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/equipped-INNERCLOTHING-reptilian.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/black.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/blue.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/brown.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkblue.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkgreen.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/green.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightbrown.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightpurple.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/maroon.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/orange.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/pink.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/red.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/teal.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/white.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/yellow.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/prisoner.rsi/meta.json |
||
|---|---|---|
| .. | ||
| artifact.rsi | ||
| cage.rsi | ||
| chemcrate_secure.rsi | ||
| coffin.rsi | ||
| command.rsi | ||
| electrical.rsi | ||
| engicrate_secure.rsi | ||
| engineering.rsi | ||
| freezer.rsi | ||
| generic.rsi | ||
| hydro_secure.rsi | ||
| hydroponics.rsi | ||
| labels.rsi | ||
| livestock.rsi | ||
| medical.rsi | ||
| medicalcrate_secure.rsi | ||
| o2.rsi | ||
| piratechest.rsi | ||
| plasma.rsi | ||
| plastic.rsi | ||
| privatecrate_secure.rsi | ||
| radiation.rsi | ||
| scicrate_secure.rsi | ||
| science.rsi | ||
| sec_gear.rsi | ||
| secure.rsi | ||
| stone_grave.rsi | ||
| surgery.rsi | ||
| syndicate.rsi | ||
| toybox.rsi | ||
| trashcart.rsi | ||
| trashcart_jani.rsi | ||
| weapon.rsi | ||
| web.rsi | ||
| wooden_grave.rsi | ||