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

Хотфикс бригмедика #349

Draft
wants to merge 42 commits into
base: master
Choose a base branch
from
Draft

Хотфикс бригмедика #349

wants to merge 42 commits into from
+161 −35

Commits on Aug 13, 2024

  1. brigmedic

    @AnderFan
    AnderFan committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    bb67c02 View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2024

  1. merge_fix_i_think

    @AnderFan
    AnderFan committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    ccbe99a View commit details
    Browse the repository at this point in the history

  2. t

    @AnderFan
    AnderFan committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    ffe6917 View commit details
    Browse the repository at this point in the history

  3. a

    @AnderFan
    AnderFan committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    f96eef6 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into brigmedic

    @AnderFan
    AnderFan committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    6fc178d View commit details
    Browse the repository at this point in the history

  5. delete hats.ftl

    @AnderFan
    AnderFan committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    1a2a2bd View commit details
    Browse the repository at this point in the history

  6. test0

    @AnderFan
    AnderFan committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    279993a View commit details
    Browse the repository at this point in the history

  7. Delete Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Head/h… 

    …ats.ftl
    @AnderFan
    AnderFan committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    9588c40 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' of https://github.com/AnderFan/ADT_ss14_Fan int… 

    …o brigmedic

sdi
    @AnderFan
    AnderFan committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    f2fec34 View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2024

  1. fix01

    @AnderFan
    AnderFan committed Aug 16, 2024
    Configuration menu
    Copy the full SHA
    8d973a7 View commit details
    Browse the repository at this point in the history

  2. fix02

    @AnderFan
    AnderFan committed Aug 16, 2024
    Configuration menu
    Copy the full SHA
    f90779d View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/AnderFan/ADT_ss14_Fan int… 

    …o brigmedic

rest
    @AnderFan
    AnderFan committed Aug 16, 2024
    Configuration menu
    Copy the full SHA
    82644eb View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of https://github.com/AnderFan/ADT_ss14_Fan int… 

    …o brigmedic

kogda ushe
    @AnderFan
    AnderFan committed Aug 16, 2024
    Configuration menu
    Copy the full SHA
    1d7845d View commit details
    Browse the repository at this point in the history

  5. fix03

    @AnderFan
    AnderFan committed Aug 16, 2024
    Configuration menu
    Copy the full SHA
    7f3dfd3 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2024

  1. Merge branch 'master' into brigmedic

    @AnderFan
    AnderFan committed Aug 17, 2024
    Configuration menu
    Copy the full SHA
    b8629e9 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into brigmedic

    @Darkiich
    Darkiich committed Aug 17, 2024
    Configuration menu
    Copy the full SHA
    581b7ea View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into brigmedic

    @Darkiich
    Darkiich committed Aug 17, 2024
    Configuration menu
    Copy the full SHA
    ea4aa1e View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2024

  1. add medipen, expanded Survival Box

    @AnderFan
    AnderFan committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    e5dc3f4 View commit details
    Browse the repository at this point in the history

  2. merge_fixed

    @AnderFan
    AnderFan committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    caa2fd6 View commit details
    Browse the repository at this point in the history

  3. merge_fixed0

    @AnderFan
    AnderFan committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    1e2b129 View commit details
    Browse the repository at this point in the history

  4. fix04

    @AnderFan
    AnderFan committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    d04169c View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2024

  1. reiewer_bomber

    @AnderFan
    AnderFan committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    53531bb View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into brigmedic

    @AnderFan
    AnderFan committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    8cd8e98 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/AnderFan/ADT_ss14_Fan int… 

    …o brigmedic

press_f
    @AnderFan
    AnderFan committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    4f0a6c3 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'brigmedic' of https://github.com/AnderFan/ADT_ss14_Fan … 

    …into brigmedic

ee.
    @AnderFan
    AnderFan committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    550d78b View commit details
    Browse the repository at this point in the history

  5. Update play_time_trackers.yml

    @AnderFan
    AnderFan committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    3f108b8 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2024

  1. SlushuADT!

    @AnderFan
    AnderFan committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    2d51380 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/AnderFan/ADT_ss14_Fan int… 

    …o brigmedic

eeee.
    @AnderFan
    AnderFan committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    0d81e58 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'brigmedic' of https://github.com/AnderFan/ADT_ss14_Fan … 

    …into brigmedic

the commit.
    @AnderFan
    AnderFan committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    46b9069 View commit details
    Browse the repository at this point in the history

  4. fixs and add chanchelog

    @AnderFan
    AnderFan committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    8257ce6 View commit details
    Browse the repository at this point in the history

  5. chanchelog fix

    @AnderFan
    AnderFan committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    c3e4391 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into brigmedic

    @AnderFan
    AnderFan committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    3eb2c9f View commit details
    Browse the repository at this point in the history

  7. Update ChangelogADT.yml

    @AnderFan
    AnderFan committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    ed1331d View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2024

  1. hotfix

    @AnderFan
    AnderFan committed Aug 25, 2024
    Configuration menu
    Copy the full SHA
    33373f1 View commit details
    Browse the repository at this point in the history

  2. mergefix

    @AnderFan
    AnderFan committed Aug 25, 2024
    Configuration menu
    Copy the full SHA
    e2982b8 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'brigmedic' of https://github.com/AnderFan/ADT_ss14_Fan … 

    …into brigmedic

krign
`.
    @AnderFan
    AnderFan committed Aug 25, 2024
    Configuration menu
    Copy the full SHA
    b762a1d View commit details
    Browse the repository at this point in the history

  4. fix_cash backpack and log

    @AnderFan
    AnderFan committed Aug 25, 2024
    Configuration menu
    Copy the full SHA
    228a40a View commit details
    Browse the repository at this point in the history

  5. Update cargo_security.yml

    @AnderFan
    AnderFan committed Aug 25, 2024
    Configuration menu
    Copy the full SHA
    9d95412 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2024

  1. fix

    @AnderFan
    AnderFan committed Aug 30, 2024
    Configuration menu
    Copy the full SHA
    6f27410 View commit details
    Browse the repository at this point in the history

  2. loadout_update

    @AnderFan
    AnderFan committed Aug 30, 2024
    Configuration menu
    Copy the full SHA
    b252cd0 View commit details
    Browse the repository at this point in the history

  3. merge

    @AnderFan
    AnderFan committed Aug 30, 2024
    Configuration menu
    Copy the full SHA
    91578bf View commit details
    Browse the repository at this point in the history

  4. merge0

    @AnderFan
    AnderFan committed Aug 30, 2024
    Configuration menu
    Copy the full SHA
    9e037ee View commit details
    Browse the repository at this point in the history