mirror of
https://github.com/corvax-team/ss14-wl.git
synced 2026-02-14 19:29:57 +01:00
1d4ba544cc
# Resolved Conflicts: # Content.Client/Sprite/ContentSpriteSystem.cs # Content.Server/Corvax/StationGoal/StationGoalCommand.cs # Content.Server/Corvax/StationGoal/StationGoalPaperSystem.cs # Content.Server/GameTicking/GameTicker.Spawning.cs # Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs # Content.Server/Silicons/Borgs/BorgSystem.cs # Content.Shared.Database/LogType.cs # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Resources/Audio/Magic/attributions.yml # Resources/Changelog/ChangelogSyndie.yml # Resources/Credits/GitHub.txt # Resources/Locale/ru-RU/guidebook/guides.ftl # Resources/Prototypes/Actions/types.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/games.yml # Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml # Resources/Prototypes/Entities/Structures/Machines/lathe.yml # Resources/Prototypes/Entities/Structures/Power/apc.yml # Resources/Prototypes/Entities/Structures/Power/substation.yml # Resources/Prototypes/Research/experimental.yml # Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml # Resources/Textures/Clothing/Head/Hoods/Coat/hoodbartender.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hoods/Coat/hoodbartender.rsi/icon.png # Resources/Textures/Clothing/Head/Hoods/Coat/hoodbartender.rsi/meta.json # Resources/Textures/Clothing/Head/Hoods/Coat/hoodcaptain.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hoods/Coat/hoodcaptain.rsi/icon.png # Resources/Textures/Clothing/Head/Hoods/Coat/hoodcaptain.rsi/meta.json # Resources/Textures/Clothing/Head/Hoods/Coat/hoodcargo.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hoods/Coat/hoodcargo.rsi/icon.png # Resources/Textures/Clothing/Head/Hoods/Coat/hoodcargo.rsi/meta.json # Resources/Textures/Clothing/Head/Hoods/Coat/hoodce.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hoods/Coat/hoodce.rsi/icon.png # Resources/Textures/Clothing/Head/Hoods/Coat/hoodce.rsi/meta.json # Resources/Textures/Clothing/Head/Hoods/Coat/hoodcentcom.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hoods/Coat/hoodcentcom.rsi/icon.png # Resources/Textures/Clothing/Head/Hoods/Coat/hoodcentcom.rsi/meta.json # Resources/Textures/Clothing/Head/Hoods/Coat/hoodchemist.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hoods/Coat/hoodchemist.rsi/icon.png # Resources/Textures/Clothing/Head/Hoods/Coat/hoodchemist.rsi/meta.json # Resources/Textures/Clothing/Head/Hoods/Coat/hoodcmo.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hoods/Coat/hoodcmo.rsi/icon.png # Resources/Textures/Clothing/Head/Hoods/Coat/hoodcmo.rsi/meta.json # Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/icon.png # Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/meta.json # Resources/Textures/Clothing/Head/Hoods/Coat/hoodengi.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hoods/Coat/hoodengi.rsi/icon.png # Resources/Textures/Clothing/Head/Hoods/Coat/hoodengi.rsi/meta.json # Resources/Textures/Clothing/Head/Hoods/Coat/hoodhop.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hoods/Coat/hoodhop.rsi/icon.png # Resources/Textures/Clothing/Head/Hoods/Coat/hoodhop.rsi/meta.json # Resources/Textures/Clothing/Head/Hoods/Coat/hoodhos.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hoods/Coat/hoodhos.rsi/icon.png # Resources/Textures/Clothing/Head/Hoods/Coat/hoodhos.rsi/meta.json # Resources/Textures/Clothing/Head/Hoods/Coat/hoodhydro.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hoods/Coat/hoodhydro.rsi/icon.png # Resources/Textures/Clothing/Head/Hoods/Coat/hoodhydro.rsi/meta.json # Resources/Textures/Clothing/Head/Hoods/Coat/hoodjani.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hoods/Coat/hoodjani.rsi/icon.png # Resources/Textures/Clothing/Head/Hoods/Coat/hoodjani.rsi/meta.json # Resources/Textures/Clothing/Head/Hoods/Coat/hoodmed.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hoods/Coat/hoodmed.rsi/icon.png # Resources/Textures/Clothing/Head/Hoods/Coat/hoodmed.rsi/meta.json # Resources/Textures/Clothing/Head/Hoods/Coat/hoodminer.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hoods/Coat/hoodminer.rsi/icon.png # Resources/Textures/Clothing/Head/Hoods/Coat/hoodminer.rsi/meta.json # Resources/Textures/Clothing/Head/Hoods/Coat/hoodpara.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hoods/Coat/hoodpara.rsi/icon.png # Resources/Textures/Clothing/Head/Hoods/Coat/hoodpara.rsi/meta.json # Resources/Textures/Clothing/Head/Hoods/Coat/hoodqm.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hoods/Coat/hoodqm.rsi/icon.png # Resources/Textures/Clothing/Head/Hoods/Coat/hoodqm.rsi/meta.json # Resources/Textures/Clothing/Head/Hoods/Coat/hoodrd.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hoods/Coat/hoodrd.rsi/icon.png # Resources/Textures/Clothing/Head/Hoods/Coat/hoodrd.rsi/meta.json # Resources/Textures/Clothing/Head/Hoods/Coat/hoodrobo.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hoods/Coat/hoodrobo.rsi/icon.png # Resources/Textures/Clothing/Head/Hoods/Coat/hoodrobo.rsi/meta.json # Resources/Textures/Clothing/Head/Hoods/Coat/hoodsci.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hoods/Coat/hoodsci.rsi/icon.png # Resources/Textures/Clothing/Head/Hoods/Coat/hoodsci.rsi/meta.json # Resources/Textures/Clothing/Head/Hoods/Coat/hoodsec.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hoods/Coat/hoodsec.rsi/icon.png # Resources/Textures/Clothing/Head/Hoods/Coat/hoodsec.rsi/meta.json # Resources/Textures/Clothing/Head/Hoods/Coat/hoodsyndicate.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hoods/Coat/hoodsyndicate.rsi/icon.png # Resources/Textures/Clothing/Head/Hoods/Coat/hoodsyndicate.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ATMOS-equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/BAR-equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/BAR-icon.png # Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CAP-equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CARGO-equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CE-equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CENTCOM-equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CHEM-equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CMO-equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ENGI-equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/GENE-equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HOP-equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HYDRO-equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/JANI-equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MED-equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MINER-equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/PARA-equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/QM-equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/RD-equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ROBO-equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SCI-equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIE-equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/VIRO-equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/equipped-OUTERCLOTHING.png