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.

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

Autolathe recipes #2836

Merged
merged 3 commits into from
Dec 27, 2020
Merged

Autolathe recipes #2836

merged 3 commits into from
Dec 27, 2020

Conversation

TaralGit
Copy link
Contributor

Hopefully this will work. This push has every new recipe I introduced.

P.S. Sorry for spamming push requests.

@metalgearsloth
Copy link
Contributor

Can we close the other one? Not sure what was wrong with the first one.

@SweptWasTaken
Copy link
Contributor

These all look solid to me, just need #2852 to be merged and it'll be g2g. Once this get merged i'll probably make a PR tying some of these recipes to the research tree.

(Also we need some more damn materials, that gauze isn't gonna be very helpful since it's made out of GLASS.)

@metalgearsloth metalgearsloth merged commit 75b35bc into space-wizards:master Dec 27, 2020
collinlunn pushed a commit to collinlunn/space-station-14 that referenced this pull request Jan 6, 2021
* the new recipes I added.

* More recipes for the autolathe. Includes the baton, the pickaxe, the cleaver and a few more.

* autolathe recipes.
Kirus59 pushed a commit to Kirus59/space-station-14 that referenced this pull request Dec 29, 2024
Co-authored-by: lapatison <lapatisonsocial@gmail.com>
Co-authored-by: NotSoDamn <75203942+NotSoDana@users.noreply.github.com>
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: cfif126 <94059374+cfif126@users.noreply.github.com>
stalengd pushed a commit to SerbiaStrong-220/space-station-14 that referenced this pull request Dec 30, 2024
Co-authored-by: NotSoDamn <75203942+NotSoDana@users.noreply.github.com>
Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com>

* fix locale (space-wizards#2688)

* Fix morgue.ftl locale (space-wizards#2707)

* Translate Upstream space-wizards#2718 (space-wizards#2719)

Co-authored-by: NotSoDamn <75203942+NotSoDana@users.noreply.github.com>
Co-authored-by: mhamster <81412348+mhamsterr@users.noreply.github.com>
Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com>

* fix arrivals gender locale (space-wizards#2723)

* fix law locale (space-wizards#2734)

* Фикс законов боргов. (space-wizards#2754)

* replace zzz (space-wizards#2758)

* Translate Upstream space-wizards#2785 (space-wizards#2797)

Co-authored-by: lapatison <lapatisonsocial@gmail.com>
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: cfif126 <94059374+cfif126@users.noreply.github.com>

* translate borer names (space-wizards#2835)

* Перевод Upstream space-wizards#2830  (space-wizards#2836)

Co-authored-by: lapatison <lapatisonsocial@gmail.com>
Co-authored-by: NotSoDamn <75203942+NotSoDana@users.noreply.github.com>
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: cfif126 <94059374+cfif126@users.noreply.github.com>

* Translate Upstream space-wizards#2748 (space-wizards#2837)

Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com>

* duplicates fix

* duplicates fix 2

* duplicates fix 3

* gender fix

* change timers desc

* delete corvax locale

* delete corvax comment

* SS220 antimov law

* Lost soul tweaks

* change comments

---------

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: NotSoDamn <75203942+NotSoDana@users.noreply.github.com>
Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com>
Co-authored-by: mhamster <81412348+mhamsterr@users.noreply.github.com>
Co-authored-by: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com>
Co-authored-by: lapatison <lapatisonsocial@gmail.com>
Co-authored-by: cfif126 <94059374+cfif126@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants