Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge conflict #38

Closed
wants to merge 81 commits into from
Closed

Merge conflict #38

wants to merge 81 commits into from

Commits on Jun 9, 2024

  1. Автоматическая компиляция чейнджлогов [ci skip]

    @SierraHelper
    SierraHelper committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    4ddf753 View commit details
    Browse the repository at this point in the history

  2. [TWEAK] Вендоматы с контрабандой (SierraBay#2319)

    @YegorKandziuba
    YegorKandziuba authored Jun 9, 2024
    Configuration menu
    Copy the full SHA
    a37dbe6 View commit details
    Browse the repository at this point in the history

  3. Чейнджлог для PR SierraBay#2319 [ci skip]

    @SierraHelper
    SierraHelper committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    1c550a9 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2024

  1. Автоматическая компиляция чейнджлогов [ci skip]

    @SierraHelper
    SierraHelper committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    31e5137 View commit details
    Browse the repository at this point in the history

  2. Fix mercenary and add tapes roll autolat (SierraBay#2318)

    @Teteshnik1
    Teteshnik1 authored Jun 10, 2024
    Configuration menu
    Copy the full SHA
    5d17026 View commit details
    Browse the repository at this point in the history

  3. Чейнджлог для PR SierraBay#2318 [ci skip]

    @SierraHelper
    SierraHelper committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    9954e0d View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2024

  1. Автоматическая компиляция чейнджлогов [ci skip]

    @SierraHelper
    SierraHelper committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    2367b02 View commit details
    Browse the repository at this point in the history

  2. DEV-SIERRA: Colony types and runtime fixes (SierraBay#2317) 

    Co-authored-by: UEDCommander <[email protected]>
    @AmShegars @UEDCommander
    AmShegars and UEDCommander authored Jun 11, 2024
    Configuration menu
    Copy the full SHA
    49ddad6 View commit details
    Browse the repository at this point in the history

  3. Чейнджлог для PR SierraBay#2317 [ci skip]

    @SierraHelper
    SierraHelper committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    5ab3809 View commit details
    Browse the repository at this point in the history

  4. Fix ремонт позитронки (SierraBay#2336)

    @Lexanx
    Lexanx authored Jun 11, 2024
    Configuration menu
    Copy the full SHA
    9c80bb1 View commit details
    Browse the repository at this point in the history

  5. Фикс автолата, затяжек от сигарет. Меняем тактички на нашлемный ПНВ (S… 

    …ierraBay#2338)
    @Teteshnik1
    Teteshnik1 authored Jun 11, 2024
    Configuration menu
    Copy the full SHA
    9a4e88a View commit details
    Browse the repository at this point in the history

  6. Чейнджлог для PR SierraBay#2336 [ci skip]

    @SierraHelper
    SierraHelper committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    ce05c41 View commit details
    Browse the repository at this point in the history

  7. Чейнджлог для PR SierraBay#2338 [ci skip]

    @SierraHelper
    SierraHelper committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    c8cefb8 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2024

  1. Автоматическая компиляция чейнджлогов [ci skip]

    @SierraHelper
    SierraHelper committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    c924014 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2024

  1. [MIRROR] client_defines.dm cleanup and documentation (SierraBay#2249) 

    Co-authored-by: Spookerton <[email protected]>
Co-authored-by: UEDCommander <[email protected]>
    @SierraHelper @Spookerton @UEDCommander
    3 people authored Jun 14, 2024
    Configuration menu
    Copy the full SHA
    f8c1db8 View commit details
    Browse the repository at this point in the history

  2. [MIRROR] Play local sound volume (SierraBay#2250) 

    Co-authored-by: cuddleandtea <[email protected]>
    @SierraHelper @cuddleandtea
    SierraHelper and cuddleandtea authored Jun 14, 2024
    Configuration menu
    Copy the full SHA
    f2c7973 View commit details
    Browse the repository at this point in the history

  3. [MIRROR] toggleable accessory New -> Initialize (SierraBay#2251) 

    Co-authored-by: Spookerton <[email protected]>
    @SierraHelper @Spookerton
    SierraHelper and Spookerton authored Jun 14, 2024
    Configuration menu
    Copy the full SHA
    41635d4 View commit details
    Browse the repository at this point in the history

  4. Чейнджлог для PR SierraBay#2250 [ci skip]

    @SierraHelper
    SierraHelper committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    e1e8781 View commit details
    Browse the repository at this point in the history

  5. [MIRROR] helmet visor toggle refactor (SierraBay#2252) 

    Co-authored-by: Spookerton <[email protected]>
    @SierraHelper @Spookerton
    SierraHelper and Spookerton authored Jun 14, 2024
    Configuration menu
    Copy the full SHA
    20054f3 View commit details
    Browse the repository at this point in the history

  6. [MIRROR] tweaked accessory slots to use shorter keys and better names (… 

    …SierraBay#2253)

Co-authored-by: Spookerton <[email protected]>
    @SierraHelper @Spookerton
    SierraHelper and Spookerton authored Jun 14, 2024
    Configuration menu
    Copy the full SHA
    ef3bbf4 View commit details
    Browse the repository at this point in the history

  7. [MIRROR] foreign body removal repeats until halted or there's nothing… 

    … left (SierraBay#2254)

Co-authored-by: Spookerton <[email protected]>
    @SierraHelper @Spookerton
    SierraHelper and Spookerton authored Jun 14, 2024
    Configuration menu
    Copy the full SHA
    015e7c2 View commit details
    Browse the repository at this point in the history

  8. Чейнджлог для PR SierraBay#2254 [ci skip]

    @SierraHelper
    SierraHelper committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    6801b62 View commit details
    Browse the repository at this point in the history

  9. [MIRROR] QoL and immersion engineering improvements (SierraBay#2255) 

    Co-authored-by: Sbotkin <[email protected]>
Co-authored-by: UEDCommander <[email protected]>
    @SierraHelper @Sbotkin @UEDCommander
    3 people authored Jun 14, 2024
    Configuration menu
    Copy the full SHA
    44ddd99 View commit details
    Browse the repository at this point in the history

  10. Чейнджлог для PR SierraBay#2255 [ci skip]

    @SierraHelper
    SierraHelper committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    c188c17 View commit details
    Browse the repository at this point in the history

  11. [MIRROR] prevent audible emote spam (SierraBay#2256) 

    Co-authored-by: MuckerMayhem <[email protected]>
    @SierraHelper @MuckerMayhem
    SierraHelper and MuckerMayhem authored Jun 14, 2024
    Configuration menu
    Copy the full SHA
    87ce9fa View commit details
    Browse the repository at this point in the history

  12. Чейнджлог для PR SierraBay#2256 [ci skip]

    @SierraHelper
    SierraHelper committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    63eb165 View commit details
    Browse the repository at this point in the history

  13. [MIRROR] GLOBify radial menu (SierraBay#2258) 

    Co-authored-by: Spookerton <[email protected]>
    @SierraHelper @Spookerton
    SierraHelper and Spookerton authored Jun 14, 2024
    Configuration menu
    Copy the full SHA
    6ec6306 View commit details
    Browse the repository at this point in the history

  14. [MIRROR] Allows protolathes to actually accept chemicals (SierraBay#2263 

    )

Co-authored-by: Merlin1230 <[email protected]>
    @SierraHelper @Merlin1230
    SierraHelper and Merlin1230 authored Jun 14, 2024
    Configuration menu
    Copy the full SHA
    418b6cf View commit details
    Browse the repository at this point in the history

  15. Чейнджлог для PR SierraBay#2263 [ci skip]

    @SierraHelper
    SierraHelper committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    46e031b View commit details
    Browse the repository at this point in the history

  16. tweaks & fixes sierra map 14.06.2024 (SierraBay#2355)

    @MGWhiskers
    MGWhiskers authored Jun 14, 2024
    Configuration menu
    Copy the full SHA
    797e131 View commit details
    Browse the repository at this point in the history

  17. Fix USB runtime (SierraBay#2342)

    @Lexanx
    Lexanx authored Jun 14, 2024
    Configuration menu
    Copy the full SHA
    878213f View commit details
    Browse the repository at this point in the history

  18. Чейнджлог для PR SierraBay#2355 [ci skip]

    @SierraHelper
    SierraHelper committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    2996603 View commit details
    Browse the repository at this point in the history

  19. [MIRROR] Adds the rad shield var to all the maintence rooms, and move… 

    …s the rust areas to /area/engineering/prototype (SierraBay#2279)

Co-authored-by: Merlin1230 <[email protected]>
    @SierraHelper @Merlin1230
    SierraHelper and Merlin1230 authored Jun 14, 2024
    Configuration menu
    Copy the full SHA
    ee6eb66 View commit details
    Browse the repository at this point in the history

  20. [MIRROR] fusion injectors don't stack infinite overlays (SierraBay#2288) 

    Co-authored-by: Spookerton <[email protected]>
    @SierraHelper @Spookerton
    SierraHelper and Spookerton authored Jun 14, 2024
    Configuration menu
    Copy the full SHA
    22fc1d7 View commit details
    Browse the repository at this point in the history

  21. Чейнджлог для PR SierraBay#2279 [ci skip]

    @SierraHelper
    SierraHelper committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    f56238c View commit details
    Browse the repository at this point in the history

  22. Чейнджлог для PR SierraBay#2288 [ci skip]

    @SierraHelper
    SierraHelper committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    82269ca View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2024

  1. Автоматическая компиляция чейнджлогов [ci skip]

    @SierraHelper
    SierraHelper committed Jun 15, 2024
    Configuration menu
    Copy the full SHA
    c1e9ba3 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2024

  1. Возвращаю телесало, чиним пистолет кадета, исправляем ошибку в назван… 

    …ие платы, возвращаем reagents (SierraBay#2360)

Co-authored-by: UEDCommander <[email protected]>
    @Teteshnik1 @UEDCommander
    Teteshnik1 and UEDCommander authored Jun 17, 2024
    Configuration menu
    Copy the full SHA
    5048a0b View commit details
    Browse the repository at this point in the history

  2. Чейнджлог для PR SierraBay#2360 [ci skip]

    @SierraHelper
    SierraHelper committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    ac61596 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2024

  1. Автоматическая компиляция чейнджлогов [ci skip]

    @SierraHelper
    SierraHelper committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    ab4cbcd View commit details
    Browse the repository at this point in the history

  2. [TWEAK] fix telesci GPS and fix recharger (SierraBay#2369)

    @Teteshnik1
    Teteshnik1 authored Jun 18, 2024
    Configuration menu
    Copy the full SHA
    c0179b4 View commit details
    Browse the repository at this point in the history

  3. Чейнджлог для PR SierraBay#2369 [ci skip]

    @SierraHelper
    SierraHelper committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    1cd98e2 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2024

  1. Автоматическая компиляция чейнджлогов [ci skip]

    @SierraHelper
    SierraHelper committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    4f62e3b View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2024

  1. Pojilaya Jaba (SierraBay#2371)

    @Lexanx
    Lexanx authored Jun 21, 2024
    Configuration menu
    Copy the full SHA
    ca6ff51 View commit details
    Browse the repository at this point in the history

  2. Чейнджлог для PR SierraBay#2371 [ci skip]

    @SierraHelper
    SierraHelper committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    fa2719d View commit details
    Browse the repository at this point in the history

  3. [MIRROR] re add pod zombos (SierraBay#2292) 

    Co-authored-by: Spookerton <[email protected]>
Co-authored-by: UEDCommander <[email protected]>
    @SierraHelper @Spookerton @UEDCommander
    3 people authored Jun 21, 2024
    Configuration menu
    Copy the full SHA
    54e2b96 View commit details
    Browse the repository at this point in the history

  4. Чейнджлог для PR SierraBay#2292 [ci skip]

    @SierraHelper
    SierraHelper committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    f04ee1f View commit details
    Browse the repository at this point in the history

  5. [MIRROR] Add the Shikra (SierraBay#2308) 

    Co-authored-by: Ryan180602 <[email protected]>
    @SierraHelper @Ryan180602
    SierraHelper and Ryan180602 authored Jun 21, 2024
    Configuration menu
    Copy the full SHA
    aae4431 View commit details
    Browse the repository at this point in the history

  6. Чейнджлог для PR SierraBay#2308 [ci skip]

    @SierraHelper
    SierraHelper committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    7e42720 View commit details
    Browse the repository at this point in the history

  7. [MIRROR] fake moustache fits in pockets and can change names (SierraB… 

    …ay#2309)

Co-authored-by: Spookerton <[email protected]>
    @SierraHelper @Spookerton
    SierraHelper and Spookerton authored Jun 21, 2024
    Configuration menu
    Copy the full SHA
    c48b0ed View commit details
    Browse the repository at this point in the history

  8. [MIRROR] Add stethoscope sounds for arterial bleeding (SierraBay#2310) 

    Co-authored-by: sdtwbaj <[email protected]>
    @SierraHelper @sdtwbaj
    SierraHelper and sdtwbaj authored Jun 21, 2024
    Configuration menu
    Copy the full SHA
    c25cbaa View commit details
    Browse the repository at this point in the history

  9. Чейнджлог для PR SierraBay#2309 [ci skip]

    @SierraHelper
    SierraHelper committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    ca92ebc View commit details
    Browse the repository at this point in the history

  10. Чейнджлог для PR SierraBay#2310 [ci skip]

    @SierraHelper
    SierraHelper committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    d8f4171 View commit details
    Browse the repository at this point in the history

  11. [MIRROR] Standardized Health - Health Flags (SierraBay#2311) 

    Co-authored-by: SierraKomodo <[email protected]>
    @SierraHelper @SierraKomodo
    SierraHelper and SierraKomodo authored Jun 21, 2024
    Configuration menu
    Copy the full SHA
    d5cfabd View commit details
    Browse the repository at this point in the history

  12. [MIRROR] riot helmets can attach visors, visors don't incorrectly sho… 

    …w in storage (SierraBay#2320)

Co-authored-by: Spookerton <[email protected]>
Co-authored-by: UEDCommander <[email protected]>
    @SierraHelper @Spookerton @UEDCommander
    3 people authored Jun 21, 2024
    Configuration menu
    Copy the full SHA
    c3618e1 View commit details
    Browse the repository at this point in the history

  13. Чейнджлог для PR SierraBay#2320 [ci skip]

    @SierraHelper
    SierraHelper committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    f84e70d View commit details
    Browse the repository at this point in the history

  14. [TWEAK] fix call charger and add bluespace crystal to research (Sierr… 

    …aBay#2375)
    @Teteshnik1
    Teteshnik1 authored Jun 21, 2024
    Configuration menu
    Copy the full SHA
    b4ee01d View commit details
    Browse the repository at this point in the history

  15. Чейнджлог для PR SierraBay#2375 [ci skip]

    @SierraHelper
    SierraHelper committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    aa6158b View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2024

  1. Автоматическая компиляция чейнджлогов [ci skip]

    @SierraHelper
    SierraHelper committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    9888386 View commit details
    Browse the repository at this point in the history

  2. DEV-SIERRA: Mechs by Shegar patch 1.1 (SierraBay#2380)

    @AmShegars
    AmShegars authored Jun 22, 2024
    Configuration menu
    Copy the full SHA
    b443fe7 View commit details
    Browse the repository at this point in the history

  3. Чейнджлог для PR SierraBay#2380 [ci skip]

    @SierraHelper
    SierraHelper committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    23390ba View commit details
    Browse the repository at this point in the history

  4. Обновление телекоммов (SierraBay#2383)

    @FeudeyTF
    FeudeyTF authored Jun 22, 2024
    Configuration menu
    Copy the full SHA
    fb5fcb8 View commit details
    Browse the repository at this point in the history

  5. Чейнджлог для PR SierraBay#2383 [ci skip]

    @SierraHelper
    SierraHelper committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    fb7e77a View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2024

  1. Автоматическая компиляция чейнджлогов [ci skip]

    @SierraHelper
    SierraHelper committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    a751fa2 View commit details
    Browse the repository at this point in the history

  2. Доп правки для патчка 1.1 (SierraBay#2386)

    @AmShegars
    AmShegars authored Jun 23, 2024
    Configuration menu
    Copy the full SHA
    d4eb61b View commit details
    Browse the repository at this point in the history

  3. Чейнджлог для PR SierraBay#2386 [ci skip]

    @SierraHelper
    SierraHelper committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    a7c2318 View commit details
    Browse the repository at this point in the history

  4. Security uniforms: setting order (SierraBay#2304)

    @Unchi-unchi-un-chi-chi
    Unchi-unchi-un-chi-chi authored Jun 23, 2024
    Configuration menu
    Copy the full SHA
    189c325 View commit details
    Browse the repository at this point in the history

  5. Чейнджлог для PR SierraBay#2304 [ci skip]

    @SierraHelper
    SierraHelper committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    6187f20 View commit details
    Browse the repository at this point in the history

  6. Fix ABS and fix sprites charges OFD, fix damage rods (SierraBay#2387)

    @Teteshnik1
    Teteshnik1 authored Jun 23, 2024
    Configuration menu
    Copy the full SHA
    5cdf8f0 View commit details
    Browse the repository at this point in the history

  7. Чейнджлог для PR SierraBay#2387 [ci skip]

    @SierraHelper
    SierraHelper committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    cf29a26 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2024

  1. Автоматическая компиляция чейнджлогов [ci skip]

    @SierraHelper
    SierraHelper committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    db64d0f View commit details
    Browse the repository at this point in the history

  2. QM Bridge access (SierraBay#2393)

    @Gold3729
    Gold3729 authored Jun 24, 2024
    Configuration menu
    Copy the full SHA
    d991536 View commit details
    Browse the repository at this point in the history

  3. Чейнджлог для PR SierraBay#2393 [ci skip]

    @SierraHelper
    SierraHelper committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    c35860b View commit details
    Browse the repository at this point in the history

  4. Fixes docking nav points and some mapping issues (SierraBay#2392)

    @Neonvolt
    Neonvolt authored Jun 24, 2024
    Configuration menu
    Copy the full SHA
    cf3fd29 View commit details
    Browse the repository at this point in the history

  5. Чейнджлог для PR SierraBay#2392 [ci skip]

    @SierraHelper
    SierraHelper committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    439b173 View commit details
    Browse the repository at this point in the history

  6. Vault name fix (SierraBay#2394)

    @BOTEeshee
    BOTEeshee authored Jun 24, 2024
    Configuration menu
    Copy the full SHA
    16c5fae View commit details
    Browse the repository at this point in the history

  7. Чейнджлог для PR SierraBay#2394 [ci skip]

    @SierraHelper
    SierraHelper committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    cc59ca5 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2024

  1. Автоматическая компиляция чейнджлогов [ci skip]

    @SierraHelper
    SierraHelper committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    90f36bd View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2024

  1. Add CCA patch (SierraBay#2401)

    @BOTEeshee
    BOTEeshee authored Jun 26, 2024
    Configuration menu
    Copy the full SHA
    5a950b0 View commit details
    Browse the repository at this point in the history

  2. Чейнджлог для PR SierraBay#2401 [ci skip]

    @SierraHelper
    SierraHelper committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    31e8f74 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'pr/37' into merge-conflict

    @800maximum123
    800maximum123 committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    050febb View commit details
    Browse the repository at this point in the history