Merge branch 'command-turtlenecks' of https://github.com/Deenkaide/sp…

…ace-station-14 into command-turtlenecks

Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/uniforms/jumpskirts.ftl

@@ -10,3 +10,11 @@ ent-ClothingUniformJumpskirtPsychologist = юбка-костюм психоло
     .desc = Я не теряю вещи. Я кладу вещи в места, которые потом ускользают от меня.
 ent-ClothingUniformJumpskirtSchool = школьная юбка
     .desc = Стильная и удобная школьная юбка.
+ent-ClothingUniformJumpskirtCapTurtleneck = юбка-водолазка капитана
+	.desc = Это водолазка с юбкой настоящего капитана
+ent-ClothingUniformJumpskirtHoPTurtleneck = юбка-водолазка главы персонала
+	.desc = Это водолазка с юбкой главы персонала
+ent-ClothingUniformJumpskirtHoSBlack = чёрная юбка-костюм главы службы безопасности
+	.desc = Это чёрный костюм с юбкой главы службы безопасности
+ent-ClothingUniformJumpskirtRDClassical = классический костюм с юбкой научного руководителя
+	.desc = Это классический костюм с юбкой научного руководителя

Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/uniforms/jumpsuits.ftl

@@ -6,3 +6,11 @@ ent-ClothingUniformJumpsuitCentcomOfficerBlack = униформа офицера
     .desc = Чёрная униформа Офицера Специальных Операций, ничего такого. Хотя... Если у вас есть время читать это, то уже поздно...
 ent-ClothingUniformJumpsuitCentcomAdmiral = униформа адмирала
     .desc = Униформа, которую носят офицеры в звании адмирала флота Nanotrasen.
+ent-ClothingUniformJumpskirtCapTurtleneck = водолазка капитана
+	.desc = Это водолазка настоящего капитана
+ent-ClothingUniformJumpskirtHoPTurtleneck = водолазка главы персонала
+	.desc = Это водолазка главы персонала
+ent-ClothingUniformJumpskirtHoSBlack = чёрный костюм главы службы безопасности
+	.desc = Это чёрный костюм главы службы безопасности
+ent-ClothingUniformJumpskirtRDClassical = классический костюм научного руководителя
+	.desc = Это классический костюм научного руководителя

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

@@ -79,8 +79,8 @@
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpskirtHoPTurtleneck
-  name: head's of personal turtleneck
-  description: Turtleneck of papers god.
+  name: head of personal's turtleneck
+  description: It's Head of Personal's turtleneck.
   components:
     - type: Sprite
       sprite: Corvax/Clothing/Uniforms/Jumpskirt/hop_turtleneck.rsi
@@ -90,8 +90,8 @@
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpskirtHoSBlack
-  name: head's of security black skirt
-  description: Main villain's skirt.
+  name: head of security's black skirt
+  description: It's Head of Security's black skirt.
   components:
     - type: Sprite
       sprite: Corvax/Clothing/Uniforms/Jumpskirt/hos_black.rsi
@@ -100,11 +100,11 @@
 
 - type: entity
   parent: ClothingUniformBase
-  id: ClothingUniformJumpskirtRDFormal
-  name: research director's formal skirt
-  description: Evil genius skirt.
+  id: ClothingUniformJumpskirtRDСlassical
+  name: research director's classical skirt
+  description: It's Research Director's classical skirt.
   components:
     - type: Sprite
-      sprite: Corvax/Clothing/Uniforms/Jumpskirt/rd_formal.rsi
+      sprite: Corvax/Clothing/Uniforms/Jumpskirt/rd_classical.rsi
     - type: Clothing
-      sprite: Corvax/Clothing/Uniforms/Jumpskirt/rd_formal.rsi
+      sprite: Corvax/Clothing/Uniforms/Jumpskirt/rd_classical.rsi

Resources/Prototypes/Corvax/Entities/Clothing/Uniforms/jumpsuits.yml

@@ -56,8 +56,8 @@
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitHoPTurtleneck
-  name: head's of personal turtleneck
-  description: Turtleneck of papers god.
+  name: head of personal's turtleneck
+  description: It's Head of Personal's turtleneck.
   components:
     - type: Sprite
       sprite: Corvax/Clothing/Uniforms/Jumpsuit/hop_turtleneck.rsi
@@ -67,8 +67,8 @@
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitHoSBlack
-  name: head's of security black suit
-  description: Main villain's suit.
+  name: head of security's black suit
+  description: It's Head of Security's black suit.
   components:
     - type: Sprite
       sprite: Corvax/Clothing/Uniforms/Jumpsuit/hos_black.rsi
@@ -77,11 +77,11 @@
 
 - type: entity
   parent: ClothingUniformBase
-  id: ClothingUniformJumpsuitRDFormal
-  name: research director's formal suit
-  description: Evil genius suit.
+  id: ClothingUniformJumpsuitRDСlassical
+  name: research director's classical suit
+  description: It's Research Director's сlassical suit.
   components:
     - type: Sprite
-      sprite: Corvax/Clothing/Uniforms/Jumpsuit/rd_formal.rsi
+      sprite: Corvax/Clothing/Uniforms/Jumpsuit/rd_сlassical.rsi
     - type: Clothing
-      sprite: Corvax/Clothing/Uniforms/Jumpsuit/rd_formal.rsi
+      sprite: Corvax/Clothing/Uniforms/Jumpsuit/rd_сlassical.rsi

Resources/Prototypes/Corvax/Recipes/Lathes/clothing.yml

@@ -20,3 +20,59 @@
   materials:
     Cloth: 100
     Durathread: 50
+
+- type: latheRecipe
+  id: ClothingUniformJumpsuitCapTurtleneck
+  result: ClothingUniformJumpsuitCapTurtleneck
+  completetime: 4
+  materials:
+    Cloth: 300
+
+- type: latheRecipe
+  id: ClothingUniformJumpskirtCapTurtleneck
+  result: ClothingUniformJumpskirtCapTurtleneck
+  completetime: 4
+  materials:
+    Cloth: 300
+
+- type: latheRecipe
+  id: ClothingUniformJumpsuitHoSBlack
+  result: ClothingUniformJumpsuitHoSBlack
+  completetime: 4
+  materials:
+    Cloth: 300
+
+- type: latheRecipe
+  id: ClothingUniformJumpskirtHoSBlack
+  result: ClothingUniformJumpskirtHoSBlack
+  completetime: 4
+  materials:
+    Cloth: 300
+
+- type: latheRecipe
+  id: ClothingUniformJumpsuitHoPTurtleneck
+  result: ClothingUniformJumpsuitHoPTurtleneck
+  completetime: 4
+  materials:
+    Cloth: 300
+
+- type: latheRecipe
+  id: ClothingUniformJumpskirtHoPTurtleneck
+  result: ClothingUniformJumpskirtHoPTurtleneck
+  completetime: 4
+  materials:
+    Cloth: 300
+
+- type: latheRecipe
+  id: ClothingUniformJumpsuitRDСlassical
+  result: ClothingUniformJumpsuitRDСlassical
+  completetime: 4
+  materials:
+    Cloth: 300
+
+- type: latheRecipe
+  id: ClothingUniformJumpskirtRDСlassical
+  result: ClothingUniformJumpskirtRDСlassical
+  completetime: 4
+  materials:
+    Cloth: 300

Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/rd_classical.rsi/meta.json

@@ -0,0 +1,30 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "resprited from https://github.com/space-syndicate/space-station-14/commit/ea49d33ef6875a9cac4a328dc24d39771d61debd by Deenkaide (github)",
+  "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/Corvax/Clothing/Uniforms/Jumpsuit/rd_classical.rsi/meta.json

@@ -0,0 +1,34 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "resprited from https://github.com/space-syndicate/space-station-14/commit/ea49d33ef6875a9cac4a328dc24d39771d61debd by Deenkaide (github)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "equipped-INNERCLOTHING-reptilian",
+      "directions": 4
+    },
+	{
+      "name": "equipped-INNERCLOTHING-monkey",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}