mirror of
https://github.com/space-syndicate/space-station-14.git
synced 2026-10-09 18:31:17 +03:00
3ab6d3ef71
# Conflicts: # .github/workflows/publish.yml # Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs # Content.Server/GameTicking/GameTicker.Player.cs # Content.Server/VoiceMask/VoiceMaskComponent.cs # Content.Server/VoiceMask/VoiceMaskSystem.Equip.cs # Content.Server/VoiceMask/VoiceMaskSystem.cs # Content.Server/VoiceMask/VoiceMaskerComponent.cs # Resources/Prototypes/Catalog/Fills/Lockers/heads.yml # Resources/Prototypes/Entities/Clothing/Masks/specific.yml # Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml # Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml # Resources/Prototypes/Roles/Jobs/Command/captain.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/Science/research_director.yml # Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml # Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml # Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json # Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-psychologist.png # Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png # Resources/Textures/Tiles/attributions.yml # Resources/Textures/Tiles/blue_circuit.png # Resources/Textures/Tiles/green_circuit.png # Resources/Textures/Tiles/steel.png |
||
|---|---|---|
| .. | ||
| paper_background_black.svg | ||
| paper_background_black.svg.96dpi.png | ||
| paper_background_black.svg.96dpi.png.yml | ||
| paper_background_book.svg | ||
| paper_background_book.svg.96dpi.png | ||
| paper_background_book.svg.96dpi.png.yml | ||
| paper_background_default.svg | ||
| paper_background_default.svg.96dpi.png | ||
| paper_background_default.svg.96dpi.png.yml | ||
| paper_background_dotmatrix.svg | ||
| paper_background_dotmatrix.svg.96dpi.png | ||
| paper_background_dotmatrix.svg.96dpi.png.yml | ||
| paper_background_perforated.svg | ||
| paper_background_perforated.svg.96dpi.png | ||
| paper_background_perforated.svg.96dpi.png.yml | ||
| paper_content_dotmatrix.svg | ||
| paper_content_dotmatrix.svg.96dpi.png | ||
| paper_content_dotmatrix.svg.96dpi.png.yml | ||
| paper_content_lined.svg | ||
| paper_content_lined.svg.96dpi.png | ||
| paper_content_lined.svg.96dpi.png.yml | ||
| paper_heading_artifact_analyzer.svg | ||
| paper_heading_artifact_analyzer.svg.96dpi.png | ||
| paper_heading_artifact_analyzer.svg.96dpi.png.yml | ||
| paper_heading_captains_thoughts.svg | ||
| paper_heading_captains_thoughts.svg.96dpi.png | ||
| paper_heading_captains_thoughts.svg.96dpi.png.yml | ||
| paper_heading_cargo_invoice.svg | ||
| paper_heading_cargo_invoice.svg.96dpi.png | ||
| paper_heading_cargo_invoice.svg.96dpi.png.yml | ||
| paper_heading_forensic_scanner.svg | ||
| paper_heading_forensic_scanner.svg.96dpi.png | ||
| paper_heading_forensic_scanner.svg.96dpi.png.yml | ||
| paper_heading_postage_stamp.svg.96dpi.png | ||
| paper_heading_postage_stamp.svg.96dpi.png.yml | ||
| paper_heading_syndicate_logo.svg | ||
| paper_heading_syndicate_logo.svg.96dpi.png | ||
| paper_heading_syndicate_logo.svg.96dpi.png.yml | ||
| paper_heading_virus.svg | ||
| paper_heading_virus.svg.96dpi.png | ||
| paper_heading_virus.svg.96dpi.png.yml | ||
| paper_stamp_border.svg | ||
| paper_stamp_border.svg.96dpi.png | ||
