From c4992c584404bdd76e1552b47b7d5ae05a78939a Mon Sep 17 00:00:00 2001
From: VideoKompany <135313844+VlaDOS1408@users.noreply.github.com>
Date: Thu, 19 Sep 2024 16:52:12 +0400
Subject: [PATCH] Add RGlass recipe for autolathe. Change remote controller
 category.

---
 .../Entities/Structures/Machines/lathe.yml    | 14 +++++-----
 .../Prototypes/Recipes/Lathes/devices.yml     |  2 +-
 Resources/Prototypes/Recipes/Lathes/sheet.yml | 26 +++++++++++++++----
 3 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index a905bc73dabacd..c7829f670bbb66 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -140,7 +140,7 @@
       - Pickaxe
       - ModularReceiver
       - AppraisalTool
-      - SheetRGlass
+      - SheetRGlass1Lathe
       - Beaker
       - Syringe
       - HandLabeler
@@ -1246,9 +1246,9 @@
       runningState: building
       defaultProductionAmount: 10
       staticRecipes:
-        - SheetSteel
+        - SheetSteel1
         - SheetGlass1
-        - SheetRGlass
+        - SheetRGlass1
         - SheetPlasma1
         - SheetPGlass1
         - SheetRPGlass1
@@ -1256,7 +1256,7 @@
         - IngotGold1
         - IngotSilver1
         - MaterialBananium1
-        - MaterialDiamond
+        - MaterialDiamond1
 
 - type: entity
   parent: OreProcessor
@@ -1272,9 +1272,9 @@
     materialUseMultiplier: 0.75
     timeMultiplier: 0.5
     staticRecipes:
-      - SheetSteel
+      - SheetSteel1
       - SheetGlass1
-      - SheetRGlass
+      - SheetRGlass1
       - SheetPlasma1
       - SheetPGlass1
       - SheetRPGlass1
@@ -1285,7 +1285,7 @@
       - IngotGold1
       - IngotSilver1
       - MaterialBananium1
-      - MaterialDiamond
+      - MaterialDiamond1
 
 - type: entity
   parent: BaseLathe
diff --git a/Resources/Prototypes/Recipes/Lathes/devices.yml b/Resources/Prototypes/Recipes/Lathes/devices.yml
index 6a786f2b2445e3..f3c0a3c17c53f4 100644
--- a/Resources/Prototypes/Recipes/Lathes/devices.yml
+++ b/Resources/Prototypes/Recipes/Lathes/devices.yml
@@ -70,7 +70,7 @@
 - type: latheRecipe
   id: Signaller
   result: RemoteSignaller
-  category: Parts
+  category: Tools
   completetime: 2
   materials:
     Steel: 100
diff --git a/Resources/Prototypes/Recipes/Lathes/sheet.yml b/Resources/Prototypes/Recipes/Lathes/sheet.yml
index 5772aa032fb843..6f4e67505ae305 100644
--- a/Resources/Prototypes/Recipes/Lathes/sheet.yml
+++ b/Resources/Prototypes/Recipes/Lathes/sheet.yml
@@ -1,5 +1,5 @@
 - type: latheRecipe
-  id: SheetSteel
+  id: SheetSteel1
   result: SheetSteel1
   completetime: 0
   materials:
@@ -29,12 +29,12 @@
     RawQuartz: 3000
 
 - type: latheRecipe
-  id: SheetRGlass
+  id: SheetRGlass1
   result: SheetRGlass1
   completetime: 0
   materials:
     RawQuartz: 100
-    RawIron: 50
+    RawIron: 40
     Coal: 15
 
 - type: latheRecipe
@@ -43,9 +43,25 @@
   completetime: 2
   materials:
     RawQuartz: 3000
-    RawIron: 1500
+    RawIron: 1200
     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
@@ -179,7 +195,7 @@
     RawBananium: 3000
 
 - type: latheRecipe
-  id: MaterialDiamond
+  id: MaterialDiamond1
   result: MaterialDiamond1
   completetime: 0
   materials: