mirror of
https://github.com/wega-team/ss14-wega.git
synced 2026-09-15 06:42:21 +02:00
Zekins3366
433019c843
# Conflicts: # Content.Client/Clothing/ClientClothingSystem.cs # Content.Client/Forensics/ForensicScannerBoundUserInterface.cs # Content.Client/Forensics/ForensicScannerMenu.xaml.cs # Content.Client/Inventory/StrippableBoundUserInterface.cs # Content.Client/UserInterface/Systems/DamageOverlays/DamageOverlayUiController.cs # Content.Client/UserInterface/Systems/Ghost/GhostUIController.cs # Content.Client/UserInterface/Systems/Ghost/Widgets/GhostGui.xaml # Content.Client/UserInterface/Systems/Ghost/Widgets/GhostGui.xaml.cs # Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs # Content.Server/Dragon/Components/DragonComponent.cs # Content.Server/Dragon/Components/DragonRiftComponent.cs # Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs # Content.Server/Forensics/Systems/ForensicScannerSystem.cs # Content.Server/Forensics/Systems/ForensicsSystem.cs # Content.Server/Power/EntitySystems/ApcSystem.cs # Content.Server/Radio/EntitySystems/RadioSystem.cs # Content.Shared/Chasm/ChasmSystem.cs # Content.Shared/Clothing/EntitySystems/MaskSystem.cs # Content.Shared/Containers/ItemSlot/ItemSlotsComponent.cs # Content.Shared/Nutrition/EntitySystems/IngestionSystem.Blockers.cs # Content.Shared/Revenant/Components/RevenantComponent.cs # Content.Shared/Verbs/VerbCategory.cs # Content.Shared/Zombies/ZombieComponent.cs # Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/healing.ftl # Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/projectiles/projectiles.ftl # Resources/Locale/ru-RU/store/store.ftl # Resources/Maps/Dungeon/experiment.yml # Resources/Maps/Dungeon/mineshaft.yml # Resources/Prototypes/Body/base_organs.yml # Resources/Prototypes/Catalog/Cargo/cargo_vending.yml # Resources/Prototypes/Damage/modifier_sets.yml # Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml # Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml # Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml # Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml # Resources/Prototypes/Entities/Mobs/Cyborgs/xenoborgs.yml # Resources/Prototypes/Entities/Mobs/NPCs/animals.yml # Resources/Prototypes/Entities/Mobs/Player/mothershipcore.yml # Resources/Prototypes/Entities/Objects/Fun/pai.yml # Resources/Prototypes/Entities/Objects/Misc/box.yml # Resources/Prototypes/Entities/Objects/Power/lights.yml # Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml # Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml # Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml # Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml # Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml # Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml # Resources/Prototypes/Entities/Structures/Furniture/chairs.yml # Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml # Resources/Prototypes/Entities/Structures/Power/chargers.yml # Resources/Prototypes/Entities/Structures/Walls/walls.yml # Resources/Prototypes/Entities/Structures/Windows/window.yml # Resources/Prototypes/Entities/Tiles/lava.yml # Resources/Prototypes/Entities/Tiles/liquid_plasma.yml # Resources/Prototypes/Entities/Tiles/water.yml # Resources/Prototypes/GameRules/roundstart.yml # Resources/Prototypes/Reagents/Consumable/Food/food.yml # Resources/Prototypes/Reagents/medicine.yml # Resources/Prototypes/Reagents/toxins.yml # Resources/Prototypes/radio_channels.yml # Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpskirts/Cargo/cargotech.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpskirts/Cargo/qm.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpskirts/Cargo/qmturtleskirt.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpskirts/Color/color.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpskirts/Color/color.rsi/prisoner-equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpskirts/Command/captain.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpskirts/Command/hop.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpskirts/Engineering/atmosf.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpskirts/Engineering/ce.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpskirts/Engineering/ce_turtle.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpskirts/Engineering/engineering.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpskirts/Medical/chemistry.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpskirts/Medical/cmo.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpskirts/Medical/cmo_turtle.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpskirts/Medical/genetics.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpskirts/Medical/medical.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpskirts/Medical/paramedic.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpskirts/Medical/virology.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpskirts/Science/rnd.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpskirts/Science/roboticist.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpskirts/Science/scientist.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpskirts/Security/brigmedic.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpskirts/Security/detective.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpskirts/Security/detective_grey.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpskirts/Security/hos.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpskirts/Security/hos_alt.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpskirts/Security/security.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpskirts/Security/security_grey.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpskirts/Security/warden.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/hydro.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/janitor.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/mime.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpskirts/Special/operative_s.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuits/Cargo/cargotech.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpsuits/Cargo/qm.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpsuits/Cargo/qmturtle.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpsuits/Cargo/salvage.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpsuits/Color/color.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpsuits/Color/color.rsi/prisoner-equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpsuits/Command/captain.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpsuits/Command/hop.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpsuits/Engineering/atmos.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpsuits/Engineering/ce.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpsuits/Engineering/ce_turtle.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpsuits/Engineering/engineering.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpsuits/Medical/chemistry.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpsuits/Medical/cmo.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpsuits/Medical/cmo_turtle.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpsuits/Medical/genetics.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpsuits/Medical/medical.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpsuits/Medical/paramedic.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpsuits/Medical/virology.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpsuits/Science/rnd.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpsuits/Science/roboticist.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpsuits/Science/scientist.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpsuits/Security/brigmedic.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpsuits/Security/detective.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpsuits/Security/detective_grey.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpsuits/Security/hos.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpsuits/Security/hos_alt.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpsuits/Security/security.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpsuits/Security/security_grey.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpsuits/Security/warden.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/hydro.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/janitor.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/mime.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpsuits/Special/operative.rsi/equipped-INNERCLOTHING-down.png # Resources/Textures/Clothing/Uniforms/Jumpsuits/Special/pyjamasyndicateblack.rsi/meta.json # Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json # Resources/Textures/Structures/Walls/rock.rsi/meta.json # Resources/Textures/Structures/Walls/stone-ore.rsi/rock_gems.png # Resources/Textures/Structures/Walls/stone-ore.rsi/rock_magmite.png