Merge branch 'master' into upstream0708

Resources/Locale/ru-RU/ADT/Job/job-description.ftl

@@ -1,3 +1,5 @@
 job-description-ADTPathologist = Осматривайте тела мёртвого экипажа, выявляйте причины их смерти и не забывайте клонировать трупы.
 
 job-description-roboticist = Собирайте боргов, мехов, обслуживайте синтетиков и поражайте (либо пугайте) экипаж своими новейшими разработками.
+
+job-description-magistrat = Самый грозный и богатый на станции.

Resources/Locale/ru-RU/ADT/Job/job-names.ftl

@@ -3,3 +3,6 @@ JobADTPathologist = Патологоанатом
 
 job-name-roboticist = робототехник
 JobRoboticist = робототехник
+
+job-name-magistrat = Магистрат
+JobMagistrat = Магистрат

Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/coats.ftl

@@ -1,4 +1,6 @@
 ent-ADTClothingOuterCoatLabPathologist = халат патологоанатома
     .desc = { ent-ClothingOuterCoatLab.desc }
 ent-ADTClothingOuterApronPathologist = фартук патологоанатома
-    .desc = Фартук для работы с трупами.
+    .desc = Фартук для работы с трупами.
+ent-ADTClothingKadet = шинель для Кадетов СБ
+    .desc = шинель, сшитая для новобранцев службы безопасности. Она очень похожа на шинели младших чинов РИА

Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/identification_cards.ftl

@@ -1,2 +1,8 @@
 ent-MagistratIDCard = ID Магистрата
     .desc = Серебрянная карта с значком Юриста.
+
+ent-ADTPathologistIDCard = ID карта патологоанатома
+    .desc = { ent-IDCardStandard.desc }
+
+ent-ADTRoboticistIDCard = ID карта робототехника
+    .desc = { ent-IDCardStandard.desc }

Resources/Prototypes/ADT/Catalog/Fills/weaponcase.yml → Resources/Prototypes/ADT/Catalog/Fills/Items/weaponcase.yml

@@ -1,24 +1,3 @@
-- type: entity
-  id: WeaponCaseNT
-  name: weapon case
-  description: Case with weapons.
-  parent: [ BaseStorageItem, BaseBagOpenClose ]
-  components:
-  - type: Sprite
-    sprite: ADT/Objects/Storage/weaponcase.rsi
-    layers:
-    - state: closed
-    - state: open
-      map: ["openLayer"]
-  - type: Appearance
-  - type: Item
-    sprite: ADT/Objects/Storage/weaponcase.rsi
-    size: Huge
-  - type: Storage
-    grid:
-    - 0,0,8,3
-    maxItemSize: Huge
-
 - type: entity
   id: WeaponCaseNTM90
   name: weapon Case

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

@@ -5,6 +5,6 @@
   description: white-diplomat-suit-desc
   components:
   - type: Sprite
-    sprite: ADT/Clothing/Uniforms/Jumpsuits/white-diplomat-suit.rsi
+    sprite: ADT/Clothing/Uniforms/Jumpsuit/white-diplomat-suit.rsi
   - type: Clothing
-    sprite: ADT/Clothing/Uniforms/Jumpsuits/white-diplomat-suit.rsi
+    sprite: ADT/Clothing/Uniforms/Jumpsuit/white-diplomat-suit.rsi

Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/Drask.yml

@@ -17,7 +17,7 @@
           !type:SimpleColoring
           color: "#171717"
   sprites:
-    - sprite: ADT/Mobs/Species/Drask/custom.rsi
+    - sprite: ADT/Mobs/Customization/Drask/custom.rsi
       state: r_arm
 
 - type: marking
@@ -39,5 +39,5 @@
           !type:SimpleColoring
           color: "#171717"
   sprites:
-    - sprite: ADT/Mobs/Species/Drask/custom.rsi
+    - sprite: ADT/Mobs/Customization/Drask/custom.rsi
       state: l_arm

Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/demon.yml

@@ -4,7 +4,7 @@
   markingCategory: Tail
   speciesRestriction: [DemonSpecies]
   sprites:
-  - sprite: ADT/Mobs/Species/Demon/custom.rsi
+  - sprite: ADT/Mobs/Customization/Demon/custom.rsi
     state: demon_tail
 
 - type: marking
@@ -13,7 +13,7 @@
   markingCategory: Tail
   speciesRestriction: [DemonSpecies]
   sprites:
-  - sprite: ADT/Mobs/Species/Demon/custom.rsi
+  - sprite: ADT/Mobs/Customization/Demon/custom.rsi
     state: long
 
 - type: marking
@@ -22,7 +22,7 @@
   markingCategory: Tail
   speciesRestriction: [DemonSpecies]
   sprites:
-  - sprite: ADT/Mobs/Species/Demon/custom.rsi
+  - sprite: ADT/Mobs/Customization/Demon/custom.rsi
     state: up
 
 - type: marking
@@ -31,7 +31,7 @@
   markingCategory: HeadSide
   speciesRestriction: [DemonSpecies]
   sprites:
-  - sprite: ADT/Mobs/Species/Demon/custom.rsi
+  - sprite: ADT/Mobs/Customization/Demon/custom.rsi
     state: cow_ears
 
 - type: marking
@@ -40,7 +40,7 @@
   markingCategory: HeadSide
   speciesRestriction: [DemonSpecies]
   sprites:
-  - sprite: ADT/Mobs/Species/Demon/custom.rsi
+  - sprite: ADT/Mobs/Customization/Demon/custom.rsi
     state: demon_ears
 
 - type: marking
@@ -49,7 +49,7 @@
   markingCategory: HeadTop
   speciesRestriction: [DemonSpecies]
   sprites:
-  - sprite: ADT/Mobs/Species/Demon/custom.rsi
+  - sprite: ADT/Mobs/Customization/Demon/custom.rsi
     state: cow_horns
 
 - type: marking
@@ -58,7 +58,7 @@
   markingCategory: HeadTop
   speciesRestriction: [DemonSpecies]
   sprites:
-  - sprite: ADT/Mobs/Species/Demon/custom.rsi
+  - sprite: ADT/Mobs/Customization/Demon/custom.rsi
     state: deer_antlers_horns
 
 - type: marking
@@ -67,7 +67,7 @@
   markingCategory: HeadTop
   speciesRestriction: [DemonSpecies]
   sprites:
-  - sprite: ADT/Mobs/Species/Demon/custom.rsi
+  - sprite: ADT/Mobs/Customization/Demon/custom.rsi
     state: small_horns
 
 - type: marking
@@ -76,7 +76,7 @@
   markingCategory: Chest
   speciesRestriction: [DemonSpecies]
   sprites:
-  - sprite: ADT/Mobs/Species/Demon/custom.rsi
+  - sprite: ADT/Mobs/Customization/Demon/custom.rsi
     state: cow_spots
 
 - type: marking
@@ -85,7 +85,7 @@
   markingCategory: Chest
   speciesRestriction: [DemonSpecies]
   sprites:
-  - sprite: ADT/Mobs/Species/Demon/custom.rsi
+  - sprite: ADT/Mobs/Customization/Demon/custom.rsi
     state: guards_stripes
 
 - type: marking
@@ -94,7 +94,7 @@
   markingCategory: Chest
   speciesRestriction: [DemonSpecies]
   sprites:
-  - sprite: ADT/Mobs/Species/Demon/custom.rsi
+  - sprite: ADT/Mobs/Customization/Demon/custom.rsi
     state: lines_emperos
 
 - type: marking
@@ -103,7 +103,7 @@
   markingCategory: Chest
   speciesRestriction: [DemonSpecies]
   sprites:
-  - sprite: ADT/Mobs/Species/Demon/custom.rsi
+  - sprite: ADT/Mobs/Customization/Demon/custom.rsi
     state: queen_lines
 
 - type: marking
@@ -112,7 +112,7 @@
   markingCategory: Chest
   speciesRestriction: [DemonSpecies]
   sprites:
-  - sprite: ADT/Mobs/Species/Demon/custom.rsi
+  - sprite: ADT/Mobs/Customization/Demon/custom.rsi
     state: tree_lines
 
 - type: marking
@@ -121,13 +121,13 @@
   markingCategory: Chest
   speciesRestriction: [DemonSpecies]
   sprites:
-  - sprite: ADT/Mobs/Species/Demon/custom.rsi
+  - sprite: ADT/Mobs/Customization/Demon/custom.rsi
     state: trinity_spots
 
 - type: marking
   id: DemonGoatee
   bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
-  - sprite: ADT/Mobs/Species/Demon/custom.rsi
+  - sprite: ADT/Mobs/Customization/Demon/custom.rsi
     state: goatee

Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/antenna.yml → Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/ipc_antenna.yml

@@ -6,7 +6,7 @@
   bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: ADT/Mobs/Customization/ipc_antenna.rsi
+    - sprite: ADT/Mobs/Customization/Ipc/ipc_antenna.rsi
       state: ipc_antenna_tv
 
 - type: marking
@@ -15,7 +15,7 @@
   bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: ADT/Mobs/Customization/ipc_antenna.rsi
+    - sprite: ADT/Mobs/Customization/Ipc/ipc_antenna.rsi
       state: ipc_antenna_tesla
 
 # - type: marking
@@ -24,7 +24,7 @@
 #   bodyPart: Hair
 #   markingCategory: Hair
 #   sprites:
-#     - sprite: ADT/Mobs/Customization/ipc_antenna.rsi
+#     - sprite: ADT/Mobs/Customization/Ipc/ipc_antenna.rsi
 #       state: ipc_antenna_lightb
 
 # - type: marking
@@ -33,7 +33,7 @@
 #   bodyPart: Hair
 #   markingCategory: Hair
 #   sprites:
-#     - sprite: ADT/Mobs/Customization/ipc_antenna.rsi
+#     - sprite: ADT/Mobs/Customization/Ipc/ipc_antenna.rsi
 #       state: ipc_antenna_light
 
 - type: marking
@@ -42,7 +42,7 @@
   bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: ADT/Mobs/Customization/ipc_antenna.rsi
+    - sprite: ADT/Mobs/Customization/Ipc/ipc_antenna.rsi
       state: ipc_antenna_cyberhead
 
 # - type: marking
@@ -51,7 +51,7 @@
 #   bodyPart: Hair
 #   markingCategory: Hair
 #   sprites:
-#     - sprite: ADT/Mobs/Customization/ipc_antenna.rsi
+#     - sprite: ADT/Mobs/Customization/Ipc/ipc_antenna.rsi
 #       state: ipc_antenna_sidelights
 
 - type: marking
@@ -60,7 +60,7 @@
   bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: ADT/Mobs/Customization/ipc_antenna.rsi
+    - sprite: ADT/Mobs/Customization/Ipc/ipc_antenna.rsi
       state: ipc_antenna_antlers
 
 - type: marking
@@ -69,7 +69,7 @@
   bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: ADT/Mobs/Customization/ipc_antenna.rsi
+    - sprite: ADT/Mobs/Customization/Ipc/ipc_antenna.rsi
       state: ipc_antenna_droneeyes
 
 - type: marking
@@ -78,7 +78,7 @@
   bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: ADT/Mobs/Customization/ipc_antenna.rsi
+    - sprite: ADT/Mobs/Customization/Ipc/ipc_antenna.rsi
       state: ipc_antenna_crowned
 
 - type: marking
@@ -87,5 +87,5 @@
   bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: ADT/Mobs/Customization/ipc_antenna.rsi
+    - sprite: ADT/Mobs/Customization/Ipc/ipc_antenna.rsi
       state: ipc_antenna_towers