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

Split Emag in half #1426

Merged
merged 19 commits into from
Jul 9, 2024
Merged

Split Emag in half #1426

merged 19 commits into from
Jul 9, 2024

Commits on Jun 22, 2024

  1. make changes

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

  2. fix yaml linter bug

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

  3. locales

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

  4. consolidations

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

  5. fix DeltaV comment appearing in uplink

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

  6. e

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

  7. Update emag.yml 

    Signed-off-by: WarMechanic <[email protected]>
    @WarMechanic
    WarMechanic authored Jun 22, 2024
    Configuration menu
    Copy the full SHA
    01331b0 View commit details
    Browse the repository at this point in the history

  8. emag invalid target locale

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

  9. Merge branch 'splitemag' of https://github.com/WarMechanic/Delta-v in… 

    …to splitemag
    @WarMechanic
    WarMechanic committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    4712243 View commit details
    Browse the repository at this point in the history

  10. change id 'airlockaccessoverride' to 'doorjack'

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

  11. name consolidations + doorjack sprite

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

Commits on Jun 29, 2024

  1. Update Resources/Locale/en-US/deltav/store/uplink-catalog.ftl 

    Co-authored-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: WarMechanic <[email protected]>
    @WarMechanic @DEATHB4DEFEAT
    WarMechanic and DEATHB4DEFEAT authored Jun 29, 2024
    Configuration menu
    Copy the full SHA
    b1ee87c View commit details
    Browse the repository at this point in the history

  2. Update Resources/Locale/en-US/store/uplink-catalog.ftl 

    Co-authored-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: WarMechanic <[email protected]>
    @WarMechanic @DEATHB4DEFEAT
    WarMechanic and DEATHB4DEFEAT authored Jun 29, 2024
    Configuration menu
    Copy the full SHA
    a896977 View commit details
    Browse the repository at this point in the history

  3. Update Resources/Locale/en-US/emag/emag.ftl 

    Co-authored-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: WarMechanic <[email protected]>
    @WarMechanic @DEATHB4DEFEAT
    WarMechanic and DEATHB4DEFEAT authored Jun 29, 2024
    Configuration menu
    Copy the full SHA
    d92a55c View commit details
    Browse the repository at this point in the history

  4. Update Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml 

    Co-authored-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: WarMechanic <[email protected]>
    @WarMechanic @DEATHB4DEFEAT
    WarMechanic and DEATHB4DEFEAT authored Jun 29, 2024
    Configuration menu
    Copy the full SHA
    57178d5 View commit details
    Browse the repository at this point in the history

  5. Update Resources/Prototypes/DeltaV/Entities/Objects/Tools/emag.yml 

    Co-authored-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: WarMechanic <[email protected]>
    @WarMechanic @DEATHB4DEFEAT
    WarMechanic and DEATHB4DEFEAT authored Jun 29, 2024
    Configuration menu
    Copy the full SHA
    e7f0f8a View commit details
    Browse the repository at this point in the history

  6. deltanedas

    @WarMechanic
    WarMechanic committed Jun 29, 2024
    Configuration menu
    Copy the full SHA
    5ddcd5f View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' into splitemag

    @WarMechanic
    WarMechanic authored Jun 29, 2024
    Configuration menu
    Copy the full SHA
    f4d304d View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2024

  1. Merge branch 'master' into splitemag

    @WarMechanic
    WarMechanic authored Jul 5, 2024
    Configuration menu
    Copy the full SHA
    47c9025 View commit details
    Browse the repository at this point in the history