Добавление супа из опилок, костюма горничной, изменение продвинутой а…

…птечки и добавление перевода

Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Shoes/jumpboots.ftl

@@ -1,2 +1,4 @@
 ent-ADTClothingJumpBoots = прыжковые ботинки
-ent-ADTClothingJumpBootsSynd = кроваво-красные прыжковые ботинки
+    .desc = Выглядят тяжелыми... Пока вы ими не воспользуетесь.
+ent-ADTClothingJumpBootsSynd = кроваво-красные прыжковые ботинки
+    .desc = Выглядят тяжелыми... Пока вы ими не воспользуетесь.

Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl

@@ -199,3 +199,6 @@ ent-ADTClothingUniformInvestigatorSuit = форма следователя Сл
 ent-ADTClothingUniformNewMekka = униформа Новой Мекки
     .desc = Эта униформа имеет очень долгую и кровавую историю...
     .suffix = { "Новая Мекка" }
+
+ent-ADTClothingUniformJumpskirtJanimaid = костюм горничной
+    .desc = Обновленный костюм горничной от НТ.

Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/soup.ftl

@@ -0,0 +1,2 @@
+ent-ADTFoodSoupSawdust = суп с опилками
+    .desc = Ешьте, ведь потом вам нужно будет топить генератор...

Resources/Prototypes/ADT/Entities/Clothing/Uniforms/jumpskirts.yml

@@ -42,7 +42,7 @@
   description: Warm and comfy.
   components:
   - type: Sprite
-    sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_white_women.rsi 
+    sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_white_women.rsi
   - type: Clothing
     sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_white_women.rsi
   - type: StaticPrice
@@ -55,7 +55,7 @@
   description: Brighter shade of blue.
   components:
   - type: Sprite
-    sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_azure_women.rsi 
+    sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_azure_women.rsi
   - type: Clothing
     sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_azure_women.rsi
   - type: StaticPrice
@@ -68,7 +68,7 @@
   description: Filled with happines.
   components:
   - type: Sprite
-    sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_yellow_women.rsi 
+    sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_yellow_women.rsi
   - type: Clothing
     sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_yellow_women.rsi
   - type: StaticPrice
@@ -81,7 +81,7 @@
   description: Cheaper analog of CentComm turtleneck.
   components:
   - type: Sprite
-    sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_green_women.rsi 
+    sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_green_women.rsi
   - type: Clothing
     sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_green_women.rsi
   - type: StaticPrice
@@ -94,7 +94,7 @@
   description: -Ya know why i wear red? It hides blood well! -But that's brown color...
   components:
   - type: Sprite
-    sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_brown_women.rsi 
+    sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_brown_women.rsi
   - type: Clothing
     sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_brown_women.rsi
   - type: StaticPrice
@@ -107,7 +107,7 @@
   description: Hides blood of clowns well!
   components:
   - type: Sprite
-    sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_red_women.rsi 
+    sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_red_women.rsi
   - type: Clothing
     sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_red_women.rsi
   - type: StaticPrice
@@ -120,7 +120,7 @@
   description: I don't want to talk about it.
   components:
   - type: Sprite
-    sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_orange_women.rsi 
+    sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_orange_women.rsi
   - type: Clothing
     sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_orange_women.rsi
   - type: StaticPrice
@@ -133,7 +133,7 @@
   description: Who would wear this?
   components:
   - type: Sprite
-    sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_pink_women.rsi 
+    sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_pink_women.rsi
   - type: Clothing
     sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_pink_women.rsi
   - type: StaticPrice
@@ -146,7 +146,7 @@
   description: Grey style?
   components:
   - type: Sprite
-    sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_grey_women.rsi 
+    sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_grey_women.rsi
   - type: Clothing
     sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_grey_women.rsi
   - type: StaticPrice
@@ -159,7 +159,7 @@
   description: Darker shade of azure.
   components:
   - type: Sprite
-    sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_blue_women.rsi 
+    sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_blue_women.rsi
   - type: Clothing
     sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_blue_women.rsi
   - type: StaticPrice
@@ -172,7 +172,7 @@
   description: Feel yourself like a real scientist.
   components:
   - type: Sprite
-    sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_purple_women.rsi 
+    sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_purple_women.rsi
   - type: Clothing
     sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_purple_women.rsi
   - type: StaticPrice
@@ -185,7 +185,7 @@
   description: Favourite clothes of bookworms.
   components:
   - type: Sprite
-    sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_black_women.rsi 
+    sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_black_women.rsi
   - type: Clothing
     sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_black_women.rsi
   - type: StaticPrice
@@ -249,3 +249,15 @@
     sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_brigmed.rsi
   - type: Clothing
     sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_brigmed.rsi
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ADTClothingUniformJumpskirtJanimaid
+  name: janitorial maid uniform
+  description: For professionals, not the posers.
+  suffix: ADT
+  components:
+  - type: Sprite
+    sprite: ADT/Clothing/Uniforms/Jumpskirt/janimaid.rsi
+  - type: Clothing
+    sprite: ADT/Clothing/Uniforms/Jumpskirt/janimaid.rsi

Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/soup.yml

@@ -0,0 +1,87 @@
+- type: entity
+  parent: FoodBase
+  id: ADTFoodBowlBase
+  abstract: true
+  components:
+  - type: Item
+    storedRotation: -90
+  - type: Food
+    trash:
+    - FoodBowlBig
+    utensil: Spoon
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 20
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 20
+  - type: Sprite
+    sprite: ADT/Objects/Consumable/Food/bowl.rsi
+  - type: DamageOnLand
+    damage:
+      types:
+        Blunt: 5
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Blunt: 5
+  - type: Spillable
+    solution: food
+  # soup weapon!
+  - type: MeleeWeapon
+    soundNoDamage:
+      path: "/Audio/Effects/Fluids/splat.ogg"
+    damage:
+      types:
+        Blunt: 0
+  - type: Damageable
+    damageContainer: Inorganic
+  - type: Tag
+    tags:
+    - Soup
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 5
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: GlassBreak
+          params:
+            volume: -8
+      - !type:SpillBehavior { }
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          FoodBowlBigTrash:
+            min: 1
+            max: 1
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+
+- type: entity
+  name: sawdust soup
+  parent: ADTFoodBowlBase
+  id: ADTFoodSoupSawdust
+  description: Where did the soup come from in my sawdust?
+  components:
+  - type: FlavorProfile
+    flavors:
+      - ADTSawdust
+  - type: Sprite
+    layers:
+    - state: bowl
+    - state: soupsawdust
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 21
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 3
+        - ReagentId: Vitamin
+          Quantity: 3
+        - ReagentId: Water
+          Quantity: 15
+

Resources/Prototypes/ADT/Recipes/Cooking/meal_recipes.yml

@@ -3,10 +3,22 @@
   name: Khachapuri recipe
   result: ADTFoodMealKhachapuri
   time: 15
-  reagents: 
+  reagents:
     Egg: 12
     TableSalt: 5
     Milk: 5
-  solids: 
+  solids:
     FoodCheeseSlice: 1
-    FoodBreadPlainSlice: 1
+    FoodBreadPlainSlice: 1
+
+- type: microwaveMealRecipe
+  id: ADTFoodSawdustSoupRecipe
+  name: sawdust soup recipe
+  result: ADTFoodSoupSawdust
+  time: 15
+  reagents:
+    Water: 10
+    TableSalt: 10
+  solids:
+    FoodBowlBig: 1
+    MaterialWoodPlank1: 1

Resources/Prototypes/Catalog/Fills/Crates/service.yml

@@ -84,7 +84,7 @@
     - id: ClothingMaskClown
     - id: ClothingMaskMime
     - id: ClothingShoesClown
-    - id: ClothingUniformJumpskirtJanimaid
+    # - id: ClothingUniformJumpskirtJanimaid ADT Tweak
     - id: ClothingNeckCloakVoid
     - id: RevolverCapGun
     - id: BarberScissors
@@ -93,6 +93,7 @@
     - id: ClownRecorder
     - id: ClothingBeltSuspendersRed
     - id: ClothingBeltSuspendersBlack
+    - id: ADTClothingUniformJumpskirtJanimaid #ADT Tweak
 
 - type: entity
   id: CrateServiceCustomSmokable

Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml

@@ -81,10 +81,13 @@
   components:
   - type: StorageFill
     contents:
+      - id: BurnAutoInjector
+      - id: BruteAutoInjector
+      - id: RadAutoInjector
+      - id: AntiPoisonMedipen
       - id: MedicatedSuture
       - id: RegenerativeMesh
       - id: Bloodpack
-        amount: 2
 
 - type: entity
   id: MedkitCombatFilled

Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_meal.yml

@@ -69,6 +69,7 @@
       - FoodSoupOnion
       - FoodSoupBisque
       - FoodSoupBungo
+      - ADTFoodSoupSawdust #ADT tweak
       - FoodMealCornInButter
       - FoodSoupStew
     chance: 0.8

Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml

@@ -72,6 +72,11 @@
   parent: Medkit
   id: MedkitAdvanced
   components:
+    #ADT Tweak
+  - type: Storage
+    grid:
+    - 0,0,4,1
+    #ADT Tweak
   - type: Sprite
     state: advkit
   - type: Item

Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/janimaid.rsi/meta.json

@@ -0,0 +1,30 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made for digimortal's Adventure Time(Discord)",
+    "size": {
+      "x": 32,
+      "y": 32
+    },
+    "states": [
+      {
+        "name": "icon"
+      },
+      {
+        "name": "equipped-INNERCLOTHING",
+        "directions": 4
+      },
+      {
+        "name": "equipped-INNERCLOTHING-monkey",
+        "directions": 4
+      },
+      {
+        "name": "inhand-left",
+        "directions": 4
+      },
+      {
+        "name": "inhand-right",
+        "directions": 4
+      }
+    ]
+  }

Resources/Textures/ADT/Objects/Consumable/Food/bowl.rsi/meta.json

@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Created by discord: Mascot_valeraCreated for Adventure Time. bowl Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa. escargot from tgstation at https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+
+        {
+            "name": "bowl"
+        },
+        {
+            "name": "soupsawdust"
+        }
+    ]
+}

Resources/Textures/ADT/Objects/Consumable/Food/meals.rsi/meta.json

@@ -1,14 +1,14 @@
 {
     "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Created by Adventure Time",
     "size": {
         "x": 32,
         "y": 32
     },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Created by Adventure Times MRP",
     "states": [
         {
             "name": "khachapuri"
         }
     ]
-}
+}