Merge remote-tracking branch 'WD-core/master' into upstream-core

Resources/Locale/ru-RU/_white/fluff/korzinka_.ftl

@@ -0,0 +1,5 @@
+marking-Korzinka__dogears = Собачьи уши
+marking-Korzinka__dogears-dogears = Основной
+
+marking-Korzinka__dogtail = Собачий хвост
+marking-Korzinka__dogtail-dogtail = Основной

Resources/Prototypes/_White/Fluff/fluff.yml

@@ -1235,3 +1235,34 @@
   sprites:
   - sprite: White/Fluff/Feda_Plevajecki/shark.rsi
     state: shark
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitAOI
+  name: Униформа АоИ
+  suffix: fluff
+  description: Форма соответствует стандартам современных военных подразделений, предназначенных для боевых действий в засушливых и пустынных условиях.
+  components:
+  - type: Sprite
+    sprite: White/Fluff/Feda_Plevajecki/sho_form.rsi
+  - type: Clothing
+    sprite: White/Fluff/Feda_Plevajecki/sho_form.rsi
+
+# Korzinka_
+- type: marking
+  id: Korzinka__dogears
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  sponsorOnly: true
+  sprites:
+  - sprite: White/Fluff/Korzinka_/dogears.rsi
+    state: dogears
+
+- type: marking
+  id: Korzinka__dogtail
+  bodyPart: Tail
+  markingCategory: Tail
+  sponsorOnly: true
+  sprites:
+  - sprite: White/Fluff/Korzinka_/dogtail.rsi
+    state: dogtail

Resources/Prototypes/_White/Fluff/sponsor.yml

@@ -469,3 +469,9 @@
   id: IMercuryITie
   entity: ClothingNeckTieIMercuryI
   sponsorOnly: true
+
+# Feda_Plevajecki
+- type: sponsorLoadout
+  id: Feda_PlevajeckiJumpsuit
+  entity: ClothingUniformJumpsuitAOI
+  sponsorOnly: true

Resources/Textures/White/Fluff/Feda_Plevajecki/sho_form.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by Delikoo",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/White/Fluff/Korzinka_/dogears.rsi/meta.json

@@ -0,0 +1,40 @@
+{
+  "version": 1,
+  "copyright": "Provided by SHO",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "dogears",
+      "directions": 4,
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    }
+  ]
+}

Resources/Textures/White/Fluff/Korzinka_/dogtail.rsi/meta.json

@@ -0,0 +1,40 @@
+{
+  "version": 1,
+  "copyright": "Provided by SHO",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "dogtail",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    }
+  ]
+}