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

Rodents can be Faxecuted (executed via Fax machine) #21461

Merged
merged 34 commits into from
Apr 27, 2024
Merged

Rodents can be Faxecuted (executed via Fax machine) #21461

merged 34 commits into from
Apr 27, 2024

Commits on Nov 5, 2023

  1. Rodents can be Faxecuted (executed via Fax machine)

    @brainfood1183
    brainfood1183 committed Nov 5, 2023
    Configuration menu
    Copy the full SHA
    6c8a802 View commit details
    Browse the repository at this point in the history

  2. use brute instead of new group.

    @brainfood1183
    brainfood1183 committed Nov 5, 2023
    Configuration menu
    Copy the full SHA
    3a7b958 View commit details
    Browse the repository at this point in the history

  3. fax visuals now use tags for mouse and hamster instead of comps

    @brainfood1183
    brainfood1183 committed Nov 5, 2023
    Configuration menu
    Copy the full SHA
    b61d15a View commit details
    Browse the repository at this point in the history

  4. fix for ubuntu, damn ubuntu bane of my life

    @brainfood1183
    brainfood1183 committed Nov 5, 2023
    Configuration menu
    Copy the full SHA
    4fc4077 View commit details
    Browse the repository at this point in the history

Commits on Dec 25, 2023

  1. Merge branch 'master' into hamletdeaths

    @brainfood1183
    brainfood1183 authored Dec 25, 2023
    Configuration menu
    Copy the full SHA
    03cc90e View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2024

  1. Merge branch 'space-wizards:master' into hamletdeaths

    @brainfood1183
    brainfood1183 authored Jan 5, 2024
    Configuration menu
    Copy the full SHA
    7210ee7 View commit details
    Browse the repository at this point in the history

  2. cant copy hamlet, can now faxecute mothroaches.

    @brainfood1183
    brainfood1183 committed Jan 5, 2024
    Configuration menu
    Copy the full SHA
    3a5a578 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2024

  1. fix

    @brainfood1183
    brainfood1183 committed Jan 6, 2024
    Configuration menu
    Copy the full SHA
    123d6d8 View commit details
    Browse the repository at this point in the history

  2. fix

    @brainfood1183
    brainfood1183 committed Jan 6, 2024
    Configuration menu
    Copy the full SHA
    a3275fb View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2024

  1. Merge branch 'space-wizards:master' into hamletdeaths

    @brainfood1183
    brainfood1183 authored Jan 20, 2024
    Configuration menu
    Copy the full SHA
    95f0a2d View commit details
    Browse the repository at this point in the history

  2. fixes

    @brainfood1183
    brainfood1183 committed Jan 20, 2024
    Configuration menu
    Copy the full SHA
    3b97ef8 View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2024

  1. removed ifs now using switch, removed hastag now using string.

    @brainfood1183
    brainfood1183 committed Jan 27, 2024
    Configuration menu
    Copy the full SHA
    b9b738e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'space-wizards:master' into hamletdeaths

    @brainfood1183
    brainfood1183 authored Jan 27, 2024
    Configuration menu
    Copy the full SHA
    eb8e800 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2024

  1. Merge branch 'master' into hamletdeaths

    @brainfood1183
    brainfood1183 authored Feb 2, 2024
    Configuration menu
    Copy the full SHA
    9ae02f2 View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2024

  1. Merge branch 'space-wizards:master' into hamletdeaths

    @brainfood1183
    brainfood1183 authored Feb 4, 2024
    Configuration menu
    Copy the full SHA
    acfa26e View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2024

  1. Merge branch 'space-wizards:master' into hamletdeaths

    @brainfood1183
    brainfood1183 authored Feb 12, 2024
    Configuration menu
    Copy the full SHA
    2f8482e View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2024

  1. Merge branch 'space-wizards:master' into hamletdeaths

    @brainfood1183
    brainfood1183 authored Feb 14, 2024
    Configuration menu
    Copy the full SHA
    7959024 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2024

  1. Merge branch 'space-wizards:master' into hamletdeaths

    @brainfood1183
    brainfood1183 authored Feb 19, 2024
    Configuration menu
    Copy the full SHA
    91b8565 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2024

  1. fixes and no more switch

    @brainfood1183
    brainfood1183 committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    aa29e68 View commit details
    Browse the repository at this point in the history

  2. cleanup

    @brainfood1183
    brainfood1183 committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    280cb81 View commit details
    Browse the repository at this point in the history

  3. more cleanup

    @brainfood1183
    brainfood1183 committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    841db52 View commit details
    Browse the repository at this point in the history

  4. fix

    @brainfood1183
    brainfood1183 committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    62a8aef View commit details
    Browse the repository at this point in the history

  5. cleanup

    @brainfood1183
    brainfood1183 committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    02706ab View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2024

  1. moved damage out of faxmachine and into own system and component.

    @brainfood1183
    brainfood1183 committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    89f8a87 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2024

  1. Merge branch 'space-wizards:master' into hamletdeaths

    @brainfood1183
    brainfood1183 authored Feb 25, 2024
    Configuration menu
    Copy the full SHA
    22420e4 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2024

  1. Merge branch 'master' into hamletdeaths

    @brainfood1183
    brainfood1183 authored Mar 13, 2024
    Configuration menu
    Copy the full SHA
    b18f536 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2024

  1. Merge branch 'space-wizards:master' into hamletdeaths

    @brainfood1183
    brainfood1183 authored Apr 2, 2024
    Configuration menu
    Copy the full SHA
    9bdee7b View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2024

  1. Merge branch 'space-wizards:master' into hamletdeaths

    @brainfood1183
    brainfood1183 authored Apr 17, 2024
    Configuration menu
    Copy the full SHA
    8a4f8ba View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2024

  1. changes

    @brainfood1183
    brainfood1183 committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    e6a52c0 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2024

  1. fixes and done i think.

    @brainfood1183
    brainfood1183 committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    ddeba87 View commit details
    Browse the repository at this point in the history

  2. tidy

    @brainfood1183
    brainfood1183 committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    16d8bd3 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2024

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

    @metalgearsloth
    metalgearsloth committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    f91379f View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2024

  1. Fixes

    @metalgearsloth
    metalgearsloth committed Apr 27, 2024
    Configuration menu
    Copy the full SHA
    378f743 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' into hamletdeaths 

    # Conflicts:
#	Content.Server/Fax/FaxSystem.cs
    @metalgearsloth
    metalgearsloth committed Apr 27, 2024
    Configuration menu
    Copy the full SHA
    c3be0c1 View commit details
    Browse the repository at this point in the history