Arthur Asimov 0b621a7b7e Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync ... # 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		2024-04-17 11:57:44 +03:00
..
cabinets.rsi	Filing Cabinet Resprites (#8043)	2022-05-09 17:46:23 -07:00
canister.rsi	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-02-17 12:43:04 +03:00
closet.rsi	Add emergency nitrogen lockers (#26752)	2024-04-10 14:20:05 -07:00
Crates	Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync	2024-04-17 11:57:44 +03:00
glassbox.rsi	Glassbox shatter resprite (#25136)	2024-02-13 16:43:37 -05:00
morgue.rsi
orebox.rsi	Ore boxes (#19838)	2023-09-16 21:49:54 +10:00
suit_storage.rsi	Revert suit storage & light tube sprites (#1770)	2024-01-17 20:38:58 +03:00
tanks.rsi	Recorvax things (#1740)	2024-01-15 00:06:33 +03:00
wall_locker.rsi	makes closets/lockers better (#24942)	2024-03-18 21:53:13 +01:00