juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into ed-21-06-2024-upstream-sync

Browse Source 
# Conflicts:
#	Resources/Prototypes/Maps/europa.yml
#	Resources/Prototypes/Maps/train.yml
This commit is contained in:
Ed
2024-06-21 18:30:31 +03:00
parent e2f97ece50 f041f58a6d
commit 3a910a7f7f
443 changed files with 8337 additions and 2540 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Resources/Prototypes/Recipes/Lathes/misc.yml
View File

@@ -214,3 +214,10 @@
materials:
Steel: 400
Glass: 200
- type: latheRecipe
id: ClothingHeadHatCone
result: ClothingHeadHatCone
completetime: 3
materials:
Plastic: 200