Фикс наших ошибок в распределении (#356)

Убрал лишние папки с Entities и/или перемести в правильные
папки(устранение дубликатов)
Исправил ошибку в написании Turtleneck.
Перенес действия от прыжковых ботинок в прыжковые ботинки(на подобии с
магнитными, визарды черти как распределять action)
Немного рассортировал фантома
Переименование некоторых файлов в правильные названия
Текстуры канистр в папке ADT
Папка Catalog перенесена из Locate/ADT в prototypes 
no cl no fun

Resources/Prototypes/ADT/Catalog/Fills/Backpacks/duffelbag.yml

@@ -11,7 +11,7 @@
       - id: ADTClothingOuterCoatBrigmedicWB
       - id: ClothingUniformJumpsuitBrigmedic
       - id: ClothingUniformJumpskirtBrigmedic
-      - id: ADTClothingUniformBrigmedicTurtleneck
-      - id: ADTClothingUniformSkirtBrigmedicTurtleneck
+      - id: ADTClothingUniformBrigmedicJumpsuitTurtleneck
+      - id: ADTClothingUniformSkirtBrigmedicJumpskirtTurtleneck
       - id: ClothingHeadHelmetSecurityMedic # Corvax-Resprite
 

Resources/Prototypes/ADT/Catalog/Fills/Lockers/centcomm.yml

@@ -17,7 +17,7 @@
     - id: ADTClothingNeckCloakBlueshield
     - id: ADTClothingOuterWinterBlueshield
     - id: ClothingShoesBootsJack
-    - id: ADTClothingUniformJumpskirtBlueshieldTurtleneck
+    - id: ADTClothingUniformJumpskirtBlueshieldJumpskirtTurtleneck
     - id: ADTClothingUniformJumpsuitBlueshieldTurtleneck
 
 - type: entity
@@ -37,5 +37,5 @@
     - id: ADTClothingNeckCloakBlueshield
     - id: ADTClothingOuterWinterBlueshield
     - id: ClothingShoesBootsJack
-    - id: ADTClothingUniformJumpskirtBlueshieldTurtleneck
+    - id: ADTClothingUniformJumpskirtBlueshieldJumpskirtTurtleneck
     - id: ADTClothingUniformJumpsuitBlueshieldTurtleneck

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

@@ -35,7 +35,7 @@
 # Водолазки. От prazat911, конечно же.
 - type: entity
   parent: ClothingUniformBase
-  id: ADTClothingUniformTurtleneckAquamarine
+  id: ADTClothingUniformJumpsuitTurtleneckAquamarine
   name: aquamarine turtleneck
   description: Too bright!
   components:
@@ -48,7 +48,7 @@
 
 - type: entity
   parent: ClothingUniformBase
-  id: ADTClothingUniformTurtleneckWhite
+  id: ADTClothingUniformJumpsuitTurtleneckWhite
   name: white turtleneck
   description: Warm and comfy.
   components:
@@ -61,7 +61,7 @@
 
 - type: entity
   parent: ClothingUniformBase
-  id: ADTClothingUniformTurtleneckAzure
+  id: ADTClothingUniformJumpsuitTurtleneckAzure
   name: azure turtleneck
   description: Brighter shade of blue.
   components:
@@ -74,7 +74,7 @@
 
 - type: entity
   parent: ClothingUniformBase
-  id: ADTClothingUniformTurtleneckYellow
+  id: ADTClothingUniformJumpsuitTurtleneckYellow
   name: yellow turtleneck
   description: Filled with happines.
   components:
@@ -87,7 +87,7 @@
 
 - type: entity
   parent: ClothingUniformBase
-  id: ADTClothingUniformTurtleneckGreen
+  id: ADTClothingUniformJumpsuitTurtleneckGreen
   name: green turtleneck
   description: Cheaper analog of CentComm turtleneck.
   components:
@@ -100,7 +100,7 @@
 
 - type: entity
   parent: ClothingUniformBase
-  id: ADTClothingUniformTurtleneckBrown
+  id: ADTClothingUniformJumpsuitTurtleneckBrown
   name: brown turtleneck
   description: -Ya know why i wear red? It hides blood well! -But that's brown color...
   components:
@@ -113,7 +113,7 @@
 
 - type: entity
   parent: ClothingUniformBase
-  id: ADTClothingUniformTurtleneckRed
+  id: ADTClothingUniformJumpsuitTurtleneckRed
   name: red turtleneck
   description: Hides blood of clowns well!
   components:
@@ -126,7 +126,7 @@
 
 - type: entity
   parent: ClothingUniformBase
-  id: ADTClothingUniformTurtleneckOrange
+  id: ADTClothingUniformJumpsuitTurtleneckOrange
   name: orange turtleneck
   description: I don't want to talk about it.
   components:
@@ -139,7 +139,7 @@
 
 - type: entity
   parent: ClothingUniformBase
-  id: ADTClothingUniformTurtleneckPink
+  id: ADTClothingUniformJumpsuitTurtleneckPink
   name: pink turtleneck
   description: Who would wear this?
   components:
@@ -152,7 +152,7 @@
 
 - type: entity
   parent: ClothingUniformBase
-  id: ADTClothingUniformTurtleneckGrey
+  id: ADTClothingUniformJumpsuitTurtleneckGrey
   name: grey turtleneck
   description: Grey style?
   components:
@@ -165,7 +165,7 @@
 
 - type: entity
   parent: ClothingUniformBase
-  id: ADTClothingUniformTurtleneckBlue
+  id: ADTClothingUniformJumpsuitTurtleneckBlue
   name: blue turtleneck
   description: Darker shade of azure.
   components:
@@ -178,7 +178,7 @@
 
 - type: entity
   parent: ClothingUniformBase
-  id: ADTClothingUniformTurtleneckPurple
+  id: ADTClothingUniformJumpsuitTurtleneckPurple
   name: purple turtleneck
   description: Feel yourself like a real scientist.
   components:
@@ -191,7 +191,7 @@
 
 - type: entity
   parent: ClothingUniformBase
-  id: ADTClothingUniformTurtleneckBlack
+  id: ADTClothingUniformJumpsuitTurtleneckBlack
   name: black turtleneck
   description: Favourite clothes of bookworms.
   components:
@@ -204,40 +204,40 @@
 
 - type: entity
   parent: ClothingUniformBase
-  id: ADTClothingUniformTurleneckBlackSleeveless
+  id: ADTClothingUniformJumpsuitTurtleneckBlackSleeveless
   name: ancient jumpsuit
   description: A terribly ragged and frayed grey jumpsuit. It looks like it hasn't been washed in over a decade.
   components:
   - type: Sprite
-    sprite: ADT/Clothing/Uniforms/Jumpsuit/turleneck_blacksleeveless.rsi
+    sprite: ADT/Clothing/Uniforms/Jumpsuit/turtleneck_blacksleeveless.rsi
   - type: Clothing
-    sprite: ADT/Clothing/Uniforms/Jumpsuit/turleneck_blacksleeveless.rsi
+    sprite: ADT/Clothing/Uniforms/Jumpsuit/turtleneck_blacksleeveless.rsi
   - type: StaticPrice
     price: 15
 
 - type: entity
   parent: ClothingUniformBase
-  id: ADTClothingUniformTurleneckWhiteSleeveless
+  id: ADTClothingUniformJumpsuitTurtleneckWhiteSleeveless
   name: ancient jumpsuit
   description: A terribly ragged and frayed grey jumpsuit. It looks like it hasn't been washed in over a decade.
   components:
   - type: Sprite
-    sprite: ADT/Clothing/Uniforms/Jumpsuit/turleneck_whitesleeveless.rsi
+    sprite: ADT/Clothing/Uniforms/Jumpsuit/turtleneck_whitesleeveless.rsi
   - type: Clothing
-    sprite: ADT/Clothing/Uniforms/Jumpsuit/turleneck_whitesleeveless.rsi
+    sprite: ADT/Clothing/Uniforms/Jumpsuit/turtleneck_whitesleeveless.rsi
   - type: StaticPrice
     price: 15
 
 - type: entity
   parent: ClothingUniformBase
-  id: ADTClothingUniformTurleneckWhiteBlackSleeveless
+  id: ADTClothingUniformJumpsuitTurtleneckWhiteBlackSleeveless
   name: ancient jumpsuit
   description: A terribly ragged and frayed grey jumpsuit. It looks like it hasn't been washed in over a decade.
   components:
   - type: Sprite
-    sprite: ADT/Clothing/Uniforms/Jumpsuit/turleneck_whiteblacksleeveless.rsi
+    sprite: ADT/Clothing/Uniforms/Jumpsuit/turtleneck_whiteblacksleeveless.rsi
   - type: Clothing
-    sprite: ADT/Clothing/Uniforms/Jumpsuit/turleneck_whiteblacksleeveless.rsi
+    sprite: ADT/Clothing/Uniforms/Jumpsuit/turtleneck_whiteblacksleeveless.rsi
   - type: StaticPrice
     price: 15
 
@@ -564,7 +564,7 @@
 #Brigmed
 - type: entity
   parent: ClothingUniformBase
-  id: ADTClothingUniformBrigmedicTurtleneck
+  id: ADTClothingUniformBrigmedicJumpsuitTurtleneck
   name: brigmedic turtleneck
   description: Comfortable and warm turtleneck. Especially for the guardian angel.
   components:

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

@@ -12,7 +12,7 @@
 
 - type: entity
   parent: ClothingUniformBase
-  id: ADTClothingUniformJumpskirtBlueshieldTurtleneck
+  id: ADTClothingUniformJumpskirtBlueshieldJumpskirtTurtleneck
   name: blueshield's turtleneck skirt
   description: blueshield's turtleneck
   components:
@@ -24,7 +24,7 @@
 #Водолазки от prazat911.
 - type: entity
   parent: ClothingUniformBase
-  id: ADTClothingUniformTurtleneckAquamarineWomen
+  id: ADTClothingUniformJumpskirtTurtleneckAquamarine
   name: aquamarine turtleneck with skirt
   description: Too bright!
   components:
@@ -37,7 +37,7 @@
 
 - type: entity
   parent: ClothingUniformBase
-  id: ADTClothingUniformTurtleneckWhiteWomen
+  id: ADTClothingUniformJumpskirtTurtleneckWhite
   name: white turtleneck with skirt
   description: Warm and comfy.
   components:
@@ -50,7 +50,7 @@
 
 - type: entity
   parent: ClothingUniformBase
-  id: ADTClothingUniformTurtleneckAzureWomen
+  id: ADTClothingUniformJumpskirtTurtleneckAzure
   name: azure turtleneck with skirt
   description: Brighter shade of blue.
   components:
@@ -63,7 +63,7 @@
 
 - type: entity
   parent: ClothingUniformBase
-  id: ADTClothingUniformTurtleneckYellowWomen
+  id: ADTClothingUniformJumpskirtTurtleneckYellow
   name: yellow turtleneck with skirt
   description: Filled with happines.
   components:
@@ -76,7 +76,7 @@
 
 - type: entity
   parent: ClothingUniformBase
-  id: ADTClothingUniformTurtleneckGreenWomen
+  id: ADTClothingUniformJumpskirtTurtleneckGreen
   name: green turtleneck with skirt
   description: Cheaper analog of CentComm turtleneck.
   components:
@@ -89,7 +89,7 @@
 
 - type: entity
   parent: ClothingUniformBase
-  id: ADTClothingUniformTurtleneckBrownWomen
+  id: ADTClothingUniformJumpskirtTurtleneckBrown
   name: brown turtleneck with skirt
   description: -Ya know why i wear red? It hides blood well! -But that's brown color...
   components:
@@ -102,7 +102,7 @@
 
 - type: entity
   parent: ClothingUniformBase
-  id: ADTClothingUniformTurtleneckRedWomen
+  id: ADTClothingUniformJumpskirtTurtleneckRed
   name: red turtleneck with skirt
   description: Hides blood of clowns well!
   components:
@@ -115,7 +115,7 @@
 
 - type: entity
   parent: ClothingUniformBase
-  id: ADTClothingUniformTurtleneckOrangeWomen
+  id: ADTClothingUniformJumpskirtTurtleneckOrange
   name: orange turtleneck with skirt
   description: I don't want to talk about it.
   components:
@@ -128,7 +128,7 @@
 
 - type: entity
   parent: ClothingUniformBase
-  id: ADTClothingUniformTurtleneckPinkWomen
+  id: ADTClothingUniformJumpskirtTurtleneckPink
   name: pink turtleneck with skirt
   description: Who would wear this?
   components:
@@ -141,7 +141,7 @@
 
 - type: entity
   parent: ClothingUniformBase
-  id: ADTClothingUniformTurtleneckGreyWomen
+  id: ADTClothingUniformJumpskirtTurtleneckGrey
   name: grey turtleneck with skirt
   description: Grey style?
   components:
@@ -154,7 +154,7 @@
 
 - type: entity
   parent: ClothingUniformBase
-  id: ADTClothingUniformTurtleneckBlueWomen
+  id: ADTClothingUniformJumpskirtTurtleneckBlue
   name: blue turtleneck with skirt
   description: Darker shade of azure.
   components:
@@ -167,7 +167,7 @@
 
 - type: entity
   parent: ClothingUniformBase
-  id: ADTClothingUniformTurtleneckPurpleWomen
+  id: ADTClothingUniformJumpskirtTurtleneckPurple
   name: purple turtleneck with skirt
   description: Feel yourself like a real scientist.
   components:
@@ -180,7 +180,7 @@
 
 - type: entity
   parent: ClothingUniformBase
-  id: ADTClothingUniformTurtleneckBlackWomen
+  id: ADTClothingUniformJumpskirtTurtleneckBlack
   name: black turtleneck with skirt
   description: Favourite clothes of bookworms.
   components:
@@ -193,27 +193,27 @@
 
 - type: entity
   parent: ClothingUniformBase
-  id: ADTClothingUniformTurleneckBlackWomenSleeveless
+  id: ADTClothingUniformJumpskirtTurtleneckBlackSleeveless
   name: ancient jumpsuit
   description: A terribly ragged and frayed grey jumpsuit. It looks like it hasn't been washed in over a decade.
   components:
   - type: Sprite
-    sprite: ADT/Clothing/Uniforms/Jumpskirt/turleneck_black_womensleeveless.rsi
+    sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_black_womensleeveless.rsi
   - type: Clothing
-    sprite: ADT/Clothing/Uniforms/Jumpskirt/turleneck_black_womensleeveless.rsi
+    sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_black_womensleeveless.rsi
   - type: StaticPrice
     price: 15
 
 - type: entity
   parent: ClothingUniformBase
-  id: ADTClothingUniformTurleneckWhiteWomenSleeveless
+  id: ADTClothingUniformJumpskirtTurtleneckWhiteSleeveless
   name: ancient jumpsuit
   description: A terribly ragged and frayed grey jumpsuit. It looks like it hasn't been washed in over a decade.
   components:
   - type: Sprite
-    sprite: ADT/Clothing/Uniforms/Jumpskirt/turleneck_white_womensleeveless.rsi
+    sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_white_womensleeveless.rsi
   - type: Clothing
-    sprite: ADT/Clothing/Uniforms/Jumpskirt/turleneck_white_womensleeveless.rsi
+    sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_white_womensleeveless.rsi
   - type: StaticPrice
     price: 15
 
@@ -241,7 +241,7 @@
 
 - type: entity
   parent: ClothingUniformBase
-  id: ADTClothingUniformSkirtBrigmedicTurtleneck
+  id: ADTClothingUniformSkirtBrigmedicJumpskirtTurtleneck
   name: brigmedic turtleneck
   description: Comfortable and warm turtleneck. Especially for the guardian angel.
   components: