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

Feat: Departament-Specific Lathes #342

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Feat: Departament-Specific Lathes #342

wants to merge 3 commits into from
+331 −8

Commits on Nov 10, 2024

  1. The return of the techfabs

    @Mnemotechnician
    Mnemotechnician committed Nov 10, 2024
    Configuration menu
    Copy the full SHA
    1e42299 View commit details
    Browse the repository at this point in the history

  2. Eugh

    @Mnemotechnician
    Mnemotechnician committed Nov 10, 2024
    Configuration menu
    Copy the full SHA
    f9a0d25 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'floofstation/master' into floof/feat/de… 

    …pt-lathes

# Conflicts:
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
    @Mnemotechnician
    Mnemotechnician committed Nov 10, 2024
    Configuration menu
    Copy the full SHA
    73d6090 View commit details
    Browse the repository at this point in the history