Merge branch 'master' into aurorafix

Resources/Locale/ru-RU/corvax/_nf/prototypes/entities/objects/consumable/food/japanfood/ingredients/japaningredients.ftl

@@ -0,0 +1,4 @@
+ent-Doughdangoball = сырой шарик данго
+    .desc = Слепленный шарик из рисового теста.
+ent-rawramennoodles = сухая лапша для рамэна
+    .desc = Даже не думай есть её в таком виде.

Resources/Locale/ru-RU/corvax/_nf/prototypes/entities/objects/consumable/food/japanfood/japanfoods.ftl

@@ -0,0 +1,14 @@
+ent-hanamidango = трёхцветное данго
+    .desc = Тебе нравятся разные цвета, не так ли?
+ent-mitarashidango = митараши данго
+    .desc = Рисовая сладость, манящая своим сладким соевым соусом.
+ent-onigiri = онигири
+    .desc = Лучший рисовый треугольник в галактике.
+ent-spicyporkramennoodles = острый рамэн
+    .desc = Выглядит так горячо... И так аппетитно!
+ent-porkramennoodles = свиной рамэн
+    .desc = А-ах... Вижу вы тоже человек высокой культуры.
+ent-ChocolatePockyPack = коробочка шоколадных покки
+    .desc = Отличное шоколадное печенье для заядлого одиночки или влюбленной парочки. 
+ent-chocopocky = шоколадная палочка покки
+    .desc = Вкус беззаботной молодости.

Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/dangodough.yml

@@ -0,0 +1,12 @@
+- type: entity
+  name: Dough Dango Ball
+  parent: FoodBakingBase
+  id: Doughdangoball
+  description: A ball of dough.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - dough
+  - type: Sprite
+    sprite: Corvax/Objects/Consumable/Food/ingredients.rsi
+    state: doughdangoball

Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/rawramennoodles.yml

@@ -0,0 +1,10 @@
+- type: entity
+  name: Raw Ramen Noodles
+  parent: FoodBakingBase
+  id: rawramennoodles
+  description: A raw ramen.
+  components:
+  - type: FlavorProfile
+  - type: Sprite
+    sprite: Corvax/Objects/Consumable/Food/ingredients.rsi
+    state: rawramennoodles

Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/chocopocky.yml

@@ -0,0 +1,30 @@
+- type: entity
+  name: Chocolate Pocky
+  parent: FoodBakedBase
+  id: chocopocky
+  description: Don't forget to play the game with your date...
+  components:
+  - type: Item
+    storedRotation: -90
+  - type: Food
+  - type: Sprite
+    sprite: Corvax/Objects/Consumable/Food/japanfood.rsi
+    state: chocopocky
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 15
+        reagents:
+          - ReagentId: Nutriment
+            Quantity: 10
+          - ReagentId: Theobromine
+            Quantity: 3
+          - ReagentId: CocoaPowder
+            Quantity: 1
+  - type: Tag
+    tags:
+    - Cigarette
+  - type: Clothing
+    sprite: Corvax\Objects\Consumable\Food\pockypacks.rsi
+    slots: [ mask ]
+    equippedPrefix: unlit

Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/hanamidango.yml

@@ -0,0 +1,19 @@
+- type: entity
+  name: Tricolor Dango
+  parent: FoodBakedBase
+  id: hanamidango
+  description: You like that colors, don't you?
+  components:
+  - type: Item
+    storedRotation: -90
+  - type: Food
+  - type: Sprite
+    sprite: Corvax/Objects/Consumable/Food/japanfood.rsi
+    state: hanamidango
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 20
+        reagents:
+          - ReagentId: Nutriment
+            Quantity: 15

Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/mitarasidango.yml

@@ -0,0 +1,19 @@
+- type: entity
+  name: Mitarashi Dango
+  parent: FoodBakedBase
+  id: mitarashidango
+  description: Rice sweetness that beckons
+  components:
+  - type: Item
+    storedRotation: -90
+  - type: Food
+  - type: Sprite
+    sprite: Corvax/Objects/Consumable/Food/japanfood.rsi
+    state: mitarashidango
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 20
+        reagents:
+          - ReagentId: Nutriment
+            Quantity: 15

Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/onigiri.yml

@@ -0,0 +1,19 @@
+- type: entity
+  name: Onigiri
+  parent: FoodBakedBase
+  id: onigiri
+  description: Best fried geometric shape in the galaxy
+  components:
+  - type: Item
+    storedRotation: -90
+  - type: Food
+  - type: Sprite
+    sprite: Corvax/Objects/Consumable/Food/japanfood.rsi
+    state: onigiri
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 25
+        reagents:
+          - ReagentId: Nutriment
+            Quantity: 20

Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/pockypack/pockypacks.yml

@@ -0,0 +1,65 @@
+- type: entity
+  id: PockyPackBase
+  parent: [ BaseStorageItem, BaseBagOpenClose ]
+  name: Pocky Pack
+  abstract: true
+  components:
+  - type: Sprite
+    layers:
+    - state: closed
+    - state: open
+      map: ["openLayer"]
+      visible: false
+    - state: pok1
+      map: ["pok1"]
+      sprite: Corvax/Objects/Consumable/Food/pokvisualizer.rsi
+      visible: false
+    - state: pok2
+      map: ["pok2"]
+      sprite: Corvax/Objects/Consumable/Food/pokvisualizer.rsi
+      visible: false
+    - state: pok3
+      map: ["pok3"]
+      sprite: Corvax/Objects/Consumable/Food/pokvisualizer.rsi
+      visible: false
+  - type: Tag
+    tags:
+    - CigPack
+    - Trash
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 50
+  - type: SpaceGarbage
+  - type: Item
+    size: Tiny
+    shape: # Yes, this is cursed, but it breaks otherwise, dont question it.
+    - 0,0,0,1
+  - type: Storage
+    grid:
+    - 0,0,4,1
+  - type: StorageFill
+    contents:
+    - id: chocopocky
+      amount: 10
+  - type: ItemCounter
+    count:
+      tags: [Cigarette]
+    composite: true
+    layerStates:
+    - pok1
+    - pok2
+    - pok3
+  - type: Appearance
+  - type: StaticPrice
+    price: 150
+
+- type: entity
+  id: ChocolatePockyPack
+  parent: PockyPackBase
+  name: Chocolate Pocky Pack
+  description:
+  components:
+  - type: Sprite
+    sprite: Corvax/Objects/Consumable/Food/pockypacks.rsi
+  - type: Item
+    sprite: Corvax/Objects/Consumable/Food/pockypacks.rsi

Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/porkramennoodles.yml

@@ -0,0 +1,28 @@
+- type: entity
+  name: Pork Ramen
+  parent: FoodBowlBase
+  id: porkramennoodles
+  description: Ah, I See You're a Man of Culture As Well...
+  components:
+  - type: Item
+  - type: Food
+  - type: Sprite
+    sprite: Corvax/Objects/Consumable/Food/japanfood.rsi
+    state: porkramen
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 30
+        reagents:
+          - ReagentId: Nutriment
+            Quantity: 10
+          - ReagentId: Protein
+            Quantity: 3
+          - ReagentId: Flavorol
+            Quantity: 5
+          - ReagentId: Soysauce
+            Quantity: 2
+  - type: Tag
+    tags:
+    - Meat
+    - Soup

Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/spicyporkramen.yml

@@ -0,0 +1,30 @@
+- type: entity
+  name: Spicy Ramen
+  parent: FoodBowlBase
+  id: spicyporkramennoodles
+  description: So hot and so cute!
+  components:
+  - type: Item
+  - type: Food
+  - type: Sprite
+    sprite: Corvax/Objects/Consumable/Food/japanfood.rsi
+    state: spicyporkramen
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 30
+        reagents:
+          - ReagentId: Nutriment
+            Quantity: 10
+          - ReagentId: Protein
+            Quantity: 3
+          - ReagentId: Flavorol
+            Quantity: 5        
+          - ReagentId: CapsaicinOil
+            Quantity: 2
+          - ReagentId: Soysauce
+            Quantity: 2
+  - type: Tag
+    tags:
+    - Meat
+    - Soup

Resources/Prototypes/Corvax/Mail/mail.yml

@@ -0,0 +1,9 @@
+- type: entity
+  categories: [ HideSpawnMenu ]
+  parent: BaseMail
+  id: MailNFPockyPack
+  suffix: chocopocky
+  components:
+  - type: Mail
+    contents:
+    - id: ChocolatePockyPack

Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/ingredients/food.yml

@@ -0,0 +1,35 @@
+- type: reaction
+  id: CreateDangoDough
+  impact: Low
+  quantized: true
+  conserveEnergy: false
+  reactants:
+    Rice:
+      amount: 5
+    Water:
+      amount: 5
+    Sugar:
+      amount: 5
+  effects:
+    - !type:CreateEntityReactionEffect
+      entity: Doughdangoball
+
+- type: reaction
+  id: CreateRawRamen
+  impact: Low
+  quantized: true
+  conserveEnergy: false
+  reactants:
+    Flour:
+      amount: 10 
+    TableSalt:
+      amount: 5
+    OilOlive:
+      amount: 5
+    Egg:
+      amount: 6
+    Water:
+      amount: 5
+  effects:
+    - !type:CreateEntityReactionEffect
+      entity: rawramennoodles

Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml

@@ -0,0 +1,68 @@
+- type: microwaveMealRecipe
+  id: Recipeporkramen
+  name: pork ramen recipe
+  result: porkramennoodles
+  time: 15
+  solids:
+    FoodMeatCutlet: 3
+    FoodBowlBig: 1
+    FoodGarlic: 1
+    rawramennoodles: 1
+  reagents:
+    Water: 15
+    Egg: 6
+  recipeType: Oven # Frontier	
+
+- type: microwaveMealRecipe
+  id: Recipehanamidango
+  name: dango hanami recipe
+  result: hanamidango
+  time: 10
+  reagents:
+    GreenTea: 5
+    JuiceWatermelon: 5
+  solids:
+    Doughdangoball: 3
+  recipeType: Oven # Frontier	
+
+- type: microwaveMealRecipe
+  id: Recipemitarashidango
+  name: dango mitarashi recipe
+  result: mitarashidango
+  time: 10
+  reagents:
+    Soysauce: 5
+    Sugar: 5
+  solids:
+    Doughdangoball: 3
+  recipeType: Oven # Frontier
+
+- type: microwaveMealRecipe
+  id: Recipeonigiri
+  name: onigiri recipe
+  result: onigiri
+  time: 20
+  reagents:
+    Mayo: 5
+    Rice: 10
+  solids:
+    FoodMeatChicken: 1
+  recipeType: Oven # Frontier
+
+- type: microwaveMealRecipe
+  id: Recipespicyramen
+  name: spicy ramen recipe
+  result: spicyporkramennoodles
+  time: 20
+  solids:
+    FoodMeatCutlet: 3
+    FoodBowlBig: 1
+    FoodGarlic: 1
+    rawramennoodles: 1
+    FoodChiliPepper: 1
+  reagents:
+    Water: 15
+    Egg: 6
+    Hotsauce: 5
+  recipeType: Oven # Frontier
+

Resources/Prototypes/_NF/Mail/mailDeliveries.yml

@@ -16,6 +16,7 @@
     MailNFSodaSpaceUp: 0.2
     MailNFUnusualFood: 0.25
     MailNFUnusualProduce: 0.8
+    MailNFPockyPack: 0.3 #CorvaxFrontier
     # Booze/Smoke Consumables
     MailNFAlcohol: 0.5
     MailSake: 0.05 # MailNFAlcohol has ~10 bottles, should be about a tenth of MailNFAlcohol's weight.