Доработка кулинарии

Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/containers/bowl.ftl

@@ -2,5 +2,5 @@ ent-FoodBowlBig = bowl
     .desc = A simple bowl, used for soups and salads.
 ent-FoodBowlBigTrash = broken bowl
     .desc = A simple bowl, broken and useless.
-ent-FoodBowlFancy = bowl
+ent-FoodBowlFancy = salads bowl
     .desc = A fancy bowl, used for SPECIAL soups and salads.

Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/containers/bowl.ftl

@@ -2,5 +2,5 @@ ent-FoodBowlBig = миска
     .desc = Простая миска, используемая для супов и салатов.
 ent-FoodBowlBigTrash = разбитая миска
     .desc = Простая миска, разбитая и бесполезная.
-ent-FoodBowlFancy = миска
+ent-FoodBowlFancy = салатница
     .desc = Изысканная миска, используемая для СПЕЦИАЛЬНЫХ супов и салатов.

Resources/Maps/N14/SunnyvaleSurfaceCorvax.yml

@@ -838907,6 +838907,9 @@ entities:
           - 53134
           - 53135
           - 53128
+          - 163232
+          - 163233
+          - 163234
         paper_label: !type:ContainerSlot
           showEnts: False
           occludes: True
@@ -940830,6 +940833,33 @@ entities:
       linearDamping: 0
       canCollide: False
     - type: InsideEntityStorage
+  - uid: 163232
+    components:
+    - type: Transform
+      parent: 53117
+    - type: Physics
+      angularDamping: 0
+      linearDamping: 0
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 163233
+    components:
+    - type: Transform
+      parent: 53117
+    - type: Physics
+      angularDamping: 0
+      linearDamping: 0
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 163234
+    components:
+    - type: Transform
+      parent: 53117
+    - type: Physics
+      angularDamping: 0
+      linearDamping: 0
+      canCollide: False
+    - type: InsideEntityStorage
   - uid: 126237
     components:
     - type: Transform
@@ -976719,6 +976749,76 @@ entities:
     - type: Transform
       pos: -56.28642,-12.074536
       parent: 1
+  - uid: 744
+    components:
+    - type: Transform
+      parent: 730
+    - type: Physics
+      angularDamping: 0
+      linearDamping: 0
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 50945
+    components:
+    - type: Transform
+      parent: 50937
+    - type: Physics
+      angularDamping: 0
+      linearDamping: 0
+      canCollide: False
+  - uid: 53134
+    components:
+    - type: Transform
+      parent: 53117
+    - type: Physics
+      angularDamping: 0
+      linearDamping: 0
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 53135
+    components:
+    - type: Transform
+      parent: 53117
+    - type: Physics
+      angularDamping: 0
+      linearDamping: 0
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 106678
+    components:
+    - type: Transform
+      parent: 106673
+    - type: Physics
+      angularDamping: 0
+      linearDamping: 0
+      canCollide: False
+  - uid: 110328
+    components:
+    - type: Transform
+      parent: 110324
+    - type: Physics
+      angularDamping: 0
+      linearDamping: 0
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 110329
+    components:
+    - type: Transform
+      parent: 110324
+    - type: Physics
+      angularDamping: 0
+      linearDamping: 0
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 110350
+    components:
+    - type: Transform
+      parent: 110348
+    - type: Physics
+      angularDamping: 0
+      linearDamping: 0
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: N14ReagentContainerFlourSmall
   entities:
   - uid: 106676
@@ -976737,6 +976837,14 @@ entities:
       angularDamping: 0
       linearDamping: 0
       canCollide: False
+  - uid: 50932
+    components:
+    - type: Transform
+      parent: 50925
+    - type: Physics
+      angularDamping: 0
+      linearDamping: 0
+      canCollide: False
 - proto: N14RedBarrel
   entities:
   - uid: 130550
@@ -1153032,7 +1153140,7 @@ entities:
     - type: Transform
       pos: 202.5,174.5
       parent: 1
-- proto: ReagentContainerCornmeal
+- proto: N14ReagentContainerCornmeal
   entities:
   - uid: 743
     components:
@@ -1153061,89 +1153169,7 @@ entities:
       linearDamping: 0
       canCollide: False
     - type: InsideEntityStorage
-- proto: ReagentContainerFlour
-  entities:
-  - uid: 744
-    components:
-    - type: Transform
-      parent: 730
-    - type: Physics
-      angularDamping: 0
-      linearDamping: 0
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 50945
-    components:
-    - type: Transform
-      parent: 50937
-    - type: Physics
-      angularDamping: 0
-      linearDamping: 0
-      canCollide: False
-  - uid: 53134
-    components:
-    - type: Transform
-      parent: 53117
-    - type: Physics
-      angularDamping: 0
-      linearDamping: 0
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 53135
-    components:
-    - type: Transform
-      parent: 53117
-    - type: Physics
-      angularDamping: 0
-      linearDamping: 0
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 106678
-    components:
-    - type: Transform
-      parent: 106673
-    - type: Physics
-      angularDamping: 0
-      linearDamping: 0
-      canCollide: False
-  - uid: 110328
-    components:
-    - type: Transform
-      parent: 110324
-    - type: Physics
-      angularDamping: 0
-      linearDamping: 0
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 110329
-    components:
-    - type: Transform
-      parent: 110324
-    - type: Physics
-      angularDamping: 0
-      linearDamping: 0
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 110350
-    components:
-    - type: Transform
-      parent: 110348
-    - type: Physics
-      angularDamping: 0
-      linearDamping: 0
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: ReagentContainerFlourSmall
-  entities:
-  - uid: 50932
-    components:
-    - type: Transform
-      parent: 50925
-    - type: Physics
-      angularDamping: 0
-      linearDamping: 0
-      canCollide: False
-- proto: ReagentContainerRice
+- proto: N14ReagentContainerRice
   entities:
   - uid: 745
     components:
@@ -1153188,7 +1153214,7 @@ entities:
       linearDamping: 0
       canCollide: False
     - type: InsideEntityStorage
-- proto: ReagentContainerSugar
+- proto: N14ReagentContainerSugar
   entities:
   - uid: 746
     components:

Resources/Maps/N14/SunnyvaleUnderground.yml

@@ -260327,7 +260327,7 @@ entities:
     - type: Transform
       pos: -137.5,-78.5
       parent: 2
-- proto: ReagentContainerCornmeal
+- proto: N14ReagentContainerCornmeal
   entities:
   - uid: 2430
     components:
@@ -260337,7 +260337,7 @@ entities:
       angularDamping: 0
       linearDamping: 0
       canCollide: False
-- proto: ReagentContainerFlour
+- proto: N14ReagentContainerFlour
   entities:
   - uid: 2431
     components:
@@ -260357,7 +260357,7 @@ entities:
       angularDamping: 0
       linearDamping: 0
       canCollide: False
-- proto: ReagentContainerRice
+- proto: N14ReagentContainerRice
   entities:
   - uid: 2433
     components:
@@ -260367,7 +260367,7 @@ entities:
       angularDamping: 0
       linearDamping: 0
       canCollide: False
-- proto: ReagentContainerSugar
+- proto: N14ReagentContainerSugar
   entities:
   - uid: 2434
     components:

Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/craftingbenches.yml

@@ -340,6 +340,7 @@
       # Kitchen
       - N14ButchersCleaver
       - N14KitchenKnife
+      - N14RollingPin
       - N14DrinkMug
       - N14DrinkMugMetal
       - N14DrinkGlass
@@ -352,6 +353,8 @@
       - N14FoodPlateTin
       - N14FoodKebabSkewer
       - N14JunkCookpot
+      - N14FoodBowlBig
+      - N14FoodBowlFancy
       - N14JunkCoffeepot
       - PlantBag
       # Janitorial

Resources/Prototypes/_Nuclear14/Recipes/Lathes/cooking.yml

@@ -88,14 +88,6 @@
   materials:
     Plastic: 50
 
-- type: latheRecipe
-  id: N14FoodBowlBig
-  result: FoodBowlBig
-  completetime: 0.8
-  category: N14Kitchen
-  materials:
-    Glass: 100
-
 - type: latheRecipe
   id: N14FoodPlateTin
   result: FoodPlateTin
@@ -134,4 +126,28 @@
   category: N14Kitchen
   completetime: 5
   materials:
-    Cloth: 300
+    Cloth: 300
+
+- type: latheRecipe
+  id: N14RollingPin
+  result: N14RollingPin
+  completetime: 1
+  category: N14Kitchen
+  materials:
+    Wood: 100
+
+- type: latheRecipe
+  id: N14FoodBowlBig
+  result: FoodBowlBig
+  completetime: 0.5
+  category: N14Kitchen
+  materials:
+    Wood: 50
+
+- type: latheRecipe
+  id: N14FoodBowlFancy
+  result: FoodBowlFancy
+  completetime: 0.5
+  category: N14Kitchen
+  materials:
+    Steel: 50