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

[MDB Ignore] Rkz's Newfood: Part 1 of 4 #3148

Merged
merged 12 commits into from
Jul 30, 2024
Merged

[MDB Ignore] Rkz's Newfood: Part 1 of 4 #3148

merged 12 commits into from
Jul 30, 2024

Commits on Jun 24, 2024

  1. signals and conversion

    @Tsar-Salat
    Tsar-Salat committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    b94931d View commit details
    Browse the repository at this point in the history

  2. maps n fixes

    @Tsar-Salat
    Tsar-Salat committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    233fd19 View commit details
    Browse the repository at this point in the history

  3. fix duplication bug

    @Tsar-Salat
    Tsar-Salat committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    29a3dbe View commit details
    Browse the repository at this point in the history

  4. kick it

    @Tsar-Salat
    Tsar-Salat committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    6a23bf4 View commit details
    Browse the repository at this point in the history

  5. kick it again

    @Tsar-Salat
    Tsar-Salat committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    da2cd47 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2024

  1. Merge remote-tracking branch 'Upstream/master' into newfood-rkz

    @Tsar-Salat
    Tsar-Salat committed Jul 13, 2024
    Configuration menu
    Copy the full SHA
    5426a4b View commit details
    Browse the repository at this point in the history

  2. Update code/__DEFINES/food.dm 

    Signed-off-by: thgvr <81882910+thgvr@users.noreply.github.com>
    @thgvr
    thgvr authored Jul 13, 2024
    Configuration menu
    Copy the full SHA
    8aafad2 View commit details
    Browse the repository at this point in the history

  3. Update code/datums/components/food/edible.dm 

    Signed-off-by: thgvr <81882910+thgvr@users.noreply.github.com>
    @thgvr
    thgvr authored Jul 13, 2024
    Configuration menu
    Copy the full SHA
    ea7c8c4 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2024

  1. Merge remote-tracking branch 'Upstream/master' into newfood-rkz

    @Tsar-Salat
    Tsar-Salat committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    ef274d3 View commit details
    Browse the repository at this point in the history

  2. fix conflict

    @Tsar-Salat
    Tsar-Salat committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    46dfecc View commit details
    Browse the repository at this point in the history

  3. clothing signals

    @Tsar-Salat
    Tsar-Salat committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    325a88d View commit details
    Browse the repository at this point in the history

  4. moreee conflicts

    @Tsar-Salat
    Tsar-Salat committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    b9604f7 View commit details
    Browse the repository at this point in the history