mirror of
https://github.com/wega-team/ss14-wega.git
synced 2026-02-15 03:31:44 +01:00
b70efe1fa8
# Conflicts: # Content.Client/Audio/ContentAudioSystem.cs # Content.Server/GameTicking/GameTicker.RoundFlow.cs # Resources/Prototypes/Catalog/Fills/Lockers/security.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml # Resources/Prototypes/Datasets/Names/first_male.yml # Resources/Prototypes/Entities/Clothing/Shoes/specific.yml # Resources/Prototypes/Entities/Mobs/NPCs/pets.yml # Resources/Prototypes/GameRules/roundstart.yml # Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json # Resources/Textures/Decals/Overlays/greyscale.rsi/checkerNESW.png # Resources/Textures/Decals/Overlays/greyscale.rsi/checkerNWSE.png # Resources/Textures/Decals/Overlays/greyscale.rsi/diagonal.png # Resources/Textures/Decals/Overlays/greyscale.rsi/diagonal_checker_a.png # Resources/Textures/Decals/Overlays/greyscale.rsi/diagonal_checker_b.png # Resources/Textures/Decals/Overlays/greyscale.rsi/fulltile_overlay.png # Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay.png # Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_180.png # Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_270.png # Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_90.png # Resources/Textures/Decals/Overlays/greyscale.rsi/herringbone.png # Resources/Textures/Decals/Overlays/greyscale.rsi/meta.json # Resources/Textures/Decals/Overlays/greyscale.rsi/minitile.png # Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_checker_a.png # Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_checker_b.png # Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_diagonal.png # Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_diagonal_a.png # Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_diagonal_b.png # Resources/Textures/Decals/Overlays/greyscale.rsi/mono.png # Resources/Textures/Decals/Overlays/greyscale.rsi/offset.png # Resources/Textures/Decals/Overlays/greyscale.rsi/offset_checker_a.png # Resources/Textures/Decals/Overlays/greyscale.rsi/offset_checker_b.png # Resources/Textures/Decals/Overlays/greyscale.rsi/pavement.png # Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_checker_a.png # Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_checker_b.png # Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_vertical.png # Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_vertical_checker_a.png # Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_vertical_checker_b.png # Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay.png # Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_180.png # Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_270.png # Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_90.png # Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay.png # Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_180.png # Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_270.png # Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_90.png # Resources/Textures/Objects/Materials/Sheets/glass.rsi/meta.json # Resources/Textures/Structures/Furniture/chairs.rsi/meta.json # Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json # Resources/Textures/Structures/Windows/directional.rsi/meta.json