ssdaniel24 d399099102 Merge remote-tracking branch 'corvax/master' into wl-upstream-sync-try-2 ...

Conflicts:
   Content.Client/Humanoid/HumanoidAppearanceSystem.cs
   Content.Client/LateJoin/LateJoinGui.cs
   Content.Client/Stylesheets/StyleNano.cs
   Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
   Content.Server/Fax/FaxSystem.cs
   Content.Server/GameTicking/GameTicker.Spawning.cs
   Content.Server/Objectives/Systems/KillPersonConditionSystem.cs
   Content.Server/Station/Systems/StationSpawningSystem.cs
   Content.Shared.Database/LogType.cs
   Content.Shared/Ghost/GhostComponent.cs
   Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
   Content.Shared/Preferences/HumanoidCharacterProfile.cs
   Content.Shared/Roles/SharedRoleSystem.cs
   README.md
   Resources/ConfigPresets/Corvax/common.toml
   Resources/Credits/GitHub.txt
   Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/cyborgs/base_borg_chassis.ftl
   Resources/Maps/Shuttles/trading_outpost.yml
   Resources/Prototypes/Corvax/Roles/Jobs/Command/iaa.yml
   Resources/Prototypes/Corvax/Roles/Jobs/Security/brigmedic.yml
   Resources/Prototypes/Corvax/Roles/Jobs/Security/pilot.yml
   Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
   Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml
   Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
   Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
   Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
   Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
   Resources/Prototypes/Entities/Structures/Power/substation.yml
   Resources/Prototypes/GameRules/cargo_gifts.yml
   Resources/Prototypes/GameRules/events.yml
   Resources/Prototypes/GameRules/meteorswarms.yml
   Resources/Prototypes/Maps/bagel.yml
   Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
   Resources/Prototypes/Reagents/chemicals.yml
   Resources/Prototypes/Reagents/medicine.yml
   Resources/Prototypes/Reagents/pyrotechnic.yml
   Resources/Prototypes/Reagents/toxins.yml
   Resources/Prototypes/Recipes/Cooking/meal_recipes.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/Medical/paramedic.yml
   Resources/Prototypes/Roles/Jobs/Science/research_director.yml
   Resources/Prototypes/Roles/Jobs/Security/detective.yml
   Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
   Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
   Resources/Prototypes/Roles/Jobs/Security/warden.yml
   Resources/Prototypes/Voice/disease_emotes.yml
   Resources/Prototypes/Voice/speech_emotes.yml
   Resources/Prototypes/radio_channels.yml
   Resources/Textures/Effects/speech.rsi/meta.json
   Resources/Textures/Interface/Default/Slots/id.png
   Resources/Textures/Interface/Minimalist/Slots/pda.png
   Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json
   Resources/Textures/Mobs/Silicon/chassis.rsi/meta.json
   RobustToolbox

2025-06-02 12:30:02 +03:00

51 KiB

Raw Permalink Blame History

View Raw