AdventureTimeSS14 · Inconnu1337 · Sep 3, 2024 · Sep 4, 2024 · Sep 4, 2024 · Sep 4, 2024
diff --git a/Resources/Locale/ru-RU/ADT/personalization.ftl b/Resources/Locale/ru-RU/ADT/personalization.ftl
@@ -322,3 +322,7 @@ ent-ADTClothingHandsPushnoYGloves = Беспалые кожаные перчат
 ent-ADTClothingUniformPushnoYJumpsuit = Аккуратный костюм Курото
     .desc = Приятно выглаженная рубашка с аквамариновой жилеткой и серыми брюками, что может быть лучше?
     .suffix = Именное, PushnoY.
+
+ent-ADTClothingOuterCoatMaki = Пальто Хонкоматери
+    .desc = Пальто дарованное самой Хонкоматерью одному из её лучших клоунов несущих веру Хонка. Оно такое же вычурное, как и сами клоуны, а жёлтые элементы выполнены из чистого бананиума. От пальто исходит лёгкий запах кремового пирога.
+    .suffix = Именное, Maki_gg.
diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/meals.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/meals.ftl
@@ -0,0 +1,2 @@
+ent-ADTFoodMealKhachapuri = хачапури
+    .desc = Большая лепешка, которую дополняет рассольный сыр и свежее яйцо.
diff --git a/Resources/Locale/ru-RU/ADT/research/technologies.ftl b/Resources/Locale/ru-RU/ADT/research/technologies.ftl
@@ -1 +1,2 @@
 research-technology-compact-technologies = Технологии сжатия материи
+research-technology-airsoft-guns = Страйкбольные приводы
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/meals.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/meals.ftl
@@ -51,4 +51,4 @@ ent-FoodMealEnchiladas = энчилада
 ent-FoodSaladWatermelonFruitBowl = фруктовый арбузный боул
     .desc = Единственный салат, в котором можно съесть миску.
 ent-FoodMealCornInButter = кукуруза в сливочном масле
-    .desc = Маслянистенько.
+    .desc = Маслянистенько.
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/meals.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/meals.yml
@@ -0,0 +1,49 @@
+# When adding new food also add to random spawner located in Resources\Prototypes\Entities\Markers\Spawners\Random\Food_Drinks\food_meal.yml
+# A bunch of different meals. This stuff doesn't come off their plates because
+# it's assembled on them. Or they just don't have plates.
+
+# Base
+
+- type: entity
+  parent: FoodInjectableBase
+  id: ADTFoodMealBase
+  abstract: true
+  description: A delicious meal, cooked with love.
+  components:
+  - type: Item
+    storedRotation: -90
+  - type: Food
+  - type: Sprite
+    sprite: ADT/Objects/Consumable/Food/meals.rsi
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 26
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 20
+
+# Tastes like egg, cheese.
+- type: entity
+  name: Khachapuri
+  parent: ADTFoodMealBase
+  id: ADTFoodMealKhachapuri
+  description: A large flatbread that complements pickled cheese, fresh egg.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - egg
+      - salty
+      - milk
+      - cheesy
+  - type: Sprite
+    state: khachapuri
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 13
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 10
+        - ReagentId: TableSalt
+          Quantity: 3
diff --git a/Resources/Prototypes/ADT/Entities/Personalization/Clothing/personalization_clothing.yml b/Resources/Prototypes/ADT/Entities/Personalization/Clothing/personalization_clothing.yml
@@ -452,3 +452,16 @@
     sprite: ADT/Personalization/pushnoY_jumpsuit.rsi
   - type: Clothing
     sprite: ADT/Personalization/pushnoY_jumpsuit.rsi
+
+#Maki_gg
+- type: entity
+  parent: ClothingOuterStorageBase
+  id: ADTClothingOuterCoatMaki
+  name: Maki coat
+  description: Maki coat.
+  suffix: Personal
+  components:
+  - type: Sprite
+    sprite: ADT/Personalization/maki_coat.rsi
+  - type: Clothing
+    sprite: ADT/Personalization/maki_coat.rsi
diff --git a/Resources/Prototypes/ADT/Recipes/Cooking/fill.txt b/Resources/Prototypes/ADT/Recipes/Cooking/fill.txt
diff --git a/Resources/Prototypes/ADT/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/ADT/Recipes/Cooking/meal_recipes.yml
@@ -0,0 +1,12 @@
+- type: microwaveMealRecipe
+  id: ADTFoodKhachapuriRecipe
+  name: Khachapuri recipe
+  result: ADTFoodMealKhachapuri
+  time: 15
+  reagents: 
+    Egg: 12
+    TableSalt: 5
+    Milk: 5
+  solids: 
+    FoodCheeseSlice: 1
+    FoodBreadPlainSlice: 1
diff --git a/Resources/Prototypes/ADT/Research/arsenal.yml b/Resources/Prototypes/ADT/Research/arsenal.yml
@@ -0,0 +1,13 @@
+- type: technology
+  id: ADTAirsoftGuns
+  name: research-technology-airsoft-guns
+  icon:
+    sprite: Objects/Weapons/Guns/Rifles/lecter.rsi
+    state: icon 
+  discipline: Arsenal 
+  tier: 1 
+  cost: 5000
+  recipeUnlocks:
+  - ADTWeaponRifleLecterBibis
+  - ADTMagazineRifleBibis 
+  - ADTCartridgeStrikeballBibis
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -897,6 +897,11 @@
       - WeaponLaserCannon
       - WeaponLaserCarbine
       - WeaponXrayCannon
+      # ADT Airsoft start
+      - ADTWeaponRifleLecterBibis
+      - ADTMagazineRifleBibis
+      - ADTCartridgeStrikeballBibis
+      # ADT Airsoft End
   - type: MaterialStorage
     whitelist:
       tags:

diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -705,7 +705,7 @@
     Water: 10
   solids:
     FoodBowlBig: 1
-
+    
 - type: microwaveMealRecipe
   id: RecipeRicePudding
   name: rice pudding recipe

diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml
@@ -710,3 +710,28 @@
      Plastic: 1000
      Plasma: 500
      Glass: 500
+
+- type: latheRecipe
+  id: ADTWeaponRifleLecterBibis
+  result: ADTWeaponRifleLecterBibis
+  category: Weapons
+  completetime: 15
+  materials:
+    Steel: 500
+    Plastic: 1500
+
+- type: latheRecipe
+  id: ADTMagazineRifleBibis
+  result: ADTMagazineRifleBibis
+  category: Ammo
+  completetime: 5 
+  materials: 
+    Plastic: 150
+
+- type: latheRecipe
+  id: ADTCartridgeStrikeballBibis
+  result: ADTCartridgeStrikeballBibis
+  category: Ammo
+  completetime: 2
+  materials:
+    Plastic: 50
diff --git a/Resources/ServerInfo/ADT/NewRecipes.xml b/Resources/ServerInfo/ADT/NewRecipes.xml
@@ -235,6 +235,17 @@
  - Печень вульпы
  - Маленькая тарелка
 
+## Хачапури
+ Хачапури готовится так: на 15 секунд в микроволновку помещается -
+ - Один ломтик сыра
+ - Один ломтик хлеба
+ - Два яйца
+ - Молоко 5u
+ - Соль 5u
+<Box>
+  <GuideEntityEmbed Entity="ADTFoodMealKhachapuri"/>
+</Box>
+
 ## Маффины
 Заметив условия пониженного уровня сахара в крови некоторых членов экипажа, Центральное Командование позволило испекание некоторых новых кондитерских изделий на станциях.
 

diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/meals.rsi/khachapuri.png b/Resources/Textures/ADT/Objects/Consumable/Food/meals.rsi/khachapuri.png
diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/meals.rsi/meta.json b/Resources/Textures/ADT/Objects/Consumable/Food/meals.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Created by Adventure Times MRP",
+    "states": [
+        {
+            "name": "khachapuri"
+        }
+    ]
+}
diff --git a/Resources/Textures/ADT/Personalization/maki_coat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/ADT/Personalization/maki_coat.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/ADT/Personalization/maki_coat.rsi/icon.png b/Resources/Textures/ADT/Personalization/maki_coat.rsi/icon.png
diff --git a/Resources/Textures/ADT/Personalization/maki_coat.rsi/meta.json b/Resources/Textures/ADT/Personalization/maki_coat.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "ADTequipped_coat, ADTCoat_Icon is drawn by mascotvalera (Discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+      {
+        "name": "icon"
+      },
+      {
+        "name": "equipped-OUTERCLOTHING",
+		"directions": 4
+      }
+  ]
+}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ent-ADTFoodMealKhachapuri = хачапури
		.desc = Большая лепешка, которую дополняет рассольный сыр и свежее яйцо.
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		research-technology-compact-technologies = Технологии сжатия материи
		research-technology-airsoft-guns = Страйкбольные приводы