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

Add RGlass recipe for autolathe. Change remote controller category. #32305

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Resources/Prototypes/Entities/Structures/Machines/lathe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
- Pickaxe
- ModularReceiver
- AppraisalTool
- SheetRGlass
- SheetRGlass1Lathe
- Beaker
- Syringe
- HandLabeler
Expand Down Expand Up @@ -1246,17 +1246,17 @@
runningState: building
defaultProductionAmount: 10
staticRecipes:
- SheetSteel
- SheetSteel1
- SheetGlass1
- SheetRGlass
- SheetRGlass1
- SheetPlasma1
- SheetPGlass1
- SheetRPGlass1
- SheetUranium1
- IngotGold1
- IngotSilver1
- MaterialBananium1
- MaterialDiamond
- MaterialDiamond1

- type: entity
parent: OreProcessor
Expand All @@ -1272,9 +1272,9 @@
materialUseMultiplier: 0.75
timeMultiplier: 0.5
staticRecipes:
- SheetSteel
- SheetSteel1
- SheetGlass1
- SheetRGlass
- SheetRGlass1
- SheetPlasma1
- SheetPGlass1
- SheetRPGlass1
Expand All @@ -1285,7 +1285,7 @@
- IngotGold1
- IngotSilver1
- MaterialBananium1
- MaterialDiamond
- MaterialDiamond1

- type: entity
parent: BaseLathe
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Recipes/Lathes/devices.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
- type: latheRecipe
id: Signaller
result: RemoteSignaller
category: Parts
category: Tools
completetime: 2
materials:
Steel: 100
Expand Down
26 changes: 21 additions & 5 deletions Resources/Prototypes/Recipes/Lathes/sheet.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
- type: latheRecipe
id: SheetSteel
id: SheetSteel1
result: SheetSteel1
completetime: 0
materials:
Expand Down Expand Up @@ -29,12 +29,12 @@
RawQuartz: 3000

- type: latheRecipe
id: SheetRGlass
id: SheetRGlass1
result: SheetRGlass1
completetime: 0
materials:
RawQuartz: 100
RawIron: 50
RawIron: 40
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are you changing these? Now the price is different than the hand-crafted one.

Coal: 15

- type: latheRecipe
Expand All @@ -43,9 +43,25 @@
completetime: 2
materials:
RawQuartz: 3000
RawIron: 1500
RawIron: 1200
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here

Coal: 500

- type: latheRecipe
id: SheetRGlass1Lathe
result: SheetRGlass1
completetime: 2
materials:
Glass: 100
Steel: 50

- type: latheRecipe
id: SheetRGlass30Lathe
result: SheetRGlass
completetime: 10
materials:
Glass: 3000
Steel: 1500

- type: latheRecipe
id: SheetPGlass1
result: SheetPGlass1
Expand Down Expand Up @@ -179,7 +195,7 @@
RawBananium: 3000

- type: latheRecipe
id: MaterialDiamond
id: MaterialDiamond1
result: MaterialDiamond1
completetime: 0
materials:
Expand Down
Loading