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

New Pizza Cutters #6697

Merged
merged 24 commits into from
Aug 21, 2024
Merged

New Pizza Cutters #6697

merged 24 commits into from
Aug 21, 2024

Commits on Dec 10, 2023

  1. Two new pizza cutter variants.

    @Mensla
    Mensla committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    61050c3 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'newpizzacutter' of https://github.com/Mensla/cmss13 int… 

    …o newpizzacutter
    @Mensla
    Mensla committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    4ea44ae View commit details
    Browse the repository at this point in the history

  3. Two new pizza cutters.

    @Mensla
    Mensla committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    8249ebe View commit details
    Browse the repository at this point in the history

  4. Two new pizza cutter variants.

    @Mensla
    Mensla committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    68c0572 View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2023

  1. Created subtypes for pizza cutters

    @Mensla
    Mensla committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    ab29996 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into newpizzacutter

    @Mensla
    Mensla committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    198aa64 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2023

  1. Replaced holy relic pizza cutter with regular one

    @Mensla
    Mensla committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    bdb4416 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2024

  1. Merge branch 'master' into newpizzacutter

    Your Name committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    5e9e223 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into newpizzacutter

    @Mensla
    Mensla committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    59ceac9 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into newpizzacutter

    @Mensla
    Mensla committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    4df1a71 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2024

  1. Merge branch 'cmss13-devs:master' into newpizzacutter

    @Mensla
    Mensla committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    7aca07d View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2024

  1. Merge remote-tracking branch 'upstream/master' into newpizzacutter

    Your Name committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    e750045 View commit details
    Browse the repository at this point in the history

  2. Update 30.pizzatime.dmm

    @Mensla
    Mensla committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    373a45e View commit details
    Browse the repository at this point in the history

  3. Updates path to new pizza cutter

    Your Name committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    876f981 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2024

  1. Merge branch 'cmss13-devs:master' into newpizzacutter

    @Mensla
    Mensla committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    e5f4355 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2024

  1. Merge branch 'cmss13-devs:master' into newpizzacutter

    @Mensla
    Mensla committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    6736ff7 View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2024

  1. Merge remote-tracking branch 'upstream/master' into newpizzacutter

    Your Name committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    53a3e17 View commit details
    Browse the repository at this point in the history

  2. Fixed missing sprites

    Your Name committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    ca04248 View commit details
    Browse the repository at this point in the history

  3. Update code/game/objects/items/tools/kitchen_tools.dm 

    Co-authored-by: Drathek <[email protected]>
    @Mensla @Drulikar
    Mensla and Drulikar committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    7226bfc View commit details
    Browse the repository at this point in the history

  4. Cleaned up code

    Your Name committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    555ca4d View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2024

  1. Merge remote-tracking branch 'upstream/master' into newpizzacutter

    Your Name committed Aug 10, 2024
    Configuration menu
    Copy the full SHA
    bfd06d1 View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2024

  1. Fixed sprite issues

    Your Name committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    e819e14 View commit details
    Browse the repository at this point in the history

  2. Moved holyrelic pizza cutter to kitchen tools

    Your Name committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    f8be5ab View commit details
    Browse the repository at this point in the history

  3. Renamed icon state

    Your Name committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    bbbf378 View commit details
    Browse the repository at this point in the history