[ЗАКАЗ] Вещи компании MG&D (#956)

## Описание PR Добавил ивентерские вещи по заказу https://discord.com/channels/901772674865455115/1324078696671481938 --------- Co-authored-by: Schrödinger <[email protected]>
AdventureTimeSS14 · Jan 6, 2025 · eb68f3a · eb68f3a
1 parent 236dca8
commit eb68f3a
Show file tree

Hide file tree

Showing 30 changed files with 269 additions and 2 deletions.
diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Eyes/glasses.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Eyes/glasses.ftl
@@ -24,3 +24,7 @@ ent-ADTServantOfEvilGlasses = сварочные очки прислужника
 
 ent-ClothingEyesNightVision = прибор ночного видения
     .desc = Прибор, позволяющий лучше видеть в темноте или при плохой освещенности. Обратной стороной является возможность стать ослепленным при воздействии яркой вспышки света.
+
+ent-ADTClothingEyesNightVisionMGD = ПНВ компании MG&D
+    .desc = Стандартный прибор ночного видения, используемый сотрудниками компании MG&D
+    .suffix = { "MG&D" }
diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Eyes/huds.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Eyes/huds.ftl
@@ -0,0 +1,3 @@
+ent-ADTClothingEyesHudMGD = визор компании MG&D
+    .desc = Визор, предназначенный для сотрудников Службы Безопасности компании "MG&D".
+    .suffix = { "MG&D" }
diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Head/helmets.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Head/helmets.ftl
@@ -8,4 +8,8 @@ ent-ADTClothingHeadHelmetTSF = шлем армии ТСФ
 
 ent-ADTClothingHeadUSSPjuggernautHelmetArmored = бронешлем "ТШ-6"
     .desc = Тяжелый защитный с Шестого уровнем защиты "Вулкан" предназначен для использования в комплекте боевого снаряжения с целью круговой защиты головы человека шестого класса от пуль стрелкового оружия. Прошел реальные боевые испытания в "Лямбде-14" и "Шерхане" и до сих пор остается на вооружении органов КГБ СССП и армейского спецназа.
-    .suffix = { "" }
+    .suffix = { "" }
+
+ent-ADTClothingHeadHelmetMGDGuard = шлем "ТКШ - Б29"
+    .desc = Крепкий шлем, обеспечивающий умеренную защиту головы от разных типов повреждений.
+    .suffix = { "MG&D" }
diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl
@@ -376,3 +376,13 @@ ent-ADTClothingUniformSwimsuitWinth = купальник ведьмочки
 
 ent-ADTClothingUniformJumpsuitCamisoleQM = укороченный камзол квартирмейстера
     .desc = Камзол, который одновременно хорош как для работы так и для отдыха.
+
+ent-ADTClothingUniformJumpsuitMGDAgent = деловой костюм компании MG&D
+    .desc = Состоит из очень мягкой ткани. На себе имеет также имеет белую шубу с черным воротником.
+    .suffix = { "MG&D" }
+ent-ADTClothingUniformJumpsuitMGDParticipant = костюм участника голодных игр
+    .desc =  Состоит из белых и черных тканей. Костюм облегается на тело что дает свободу для передвижений.
+    .suffix = { "MG&D" }
+ent-ADTClothingUniformJumpsuitMGDGuard = бронированный костюм компании MG&D
+    .desc = Состоит из прочного бронежилета "Тактика" а также защиты для коленей и локтей, состоящих из кевлара.
+    .suffix = { "MG&D" }
diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Decorations/banners.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Decorations/banners.ftl
@@ -1,3 +1,6 @@
 ent-ADTBannerTSF = знамя ТСФ
     .desc = Это знамя с логотипом ТСФ.
     .suffix = { "ТСФ" }
+ent-ADTBannerMGD = знамя MG&D
+    .desc = Флаг корпорации MG&D - Marshall Gohnson & Dark
+    .suffix = { "MG&D" }
diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/ADT/Entities/Clothing/Eyes/glasses.yml
@@ -123,3 +123,23 @@
         icon:
           True: { state: icon }
           False: { state: icon }
+
+- type: entity
+  parent: [ClothingEyesBase]
+  id: ADTClothingEyesNightVisionMGD
+  name: night vision
+  description: jungar poka
+  components:
+  - type: Sprite
+    sprite: ADT/Clothing/Eyes/Glasses/mgd_pnvhud.rsi
+  - type: Clothing
+    sprite: ADT/Clothing/Eyes/Glasses/mgd_pnvhud.rsi
+  - type: NightVisionItem # RMC Night vision
+  - type: ItemToggle  # RMC Night vision
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.NightVisionItemVisuals.Active:
+        icon:
+          True: { state: icon }
+          False: { state: icon }
diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/ADT/Entities/Clothing/Eyes/hud.yml
@@ -10,3 +10,17 @@
     sprite: ADT/Clothing/Eyes/HUD/phantom_hud.rsi
   - type: ShowHauntedIcons
 
+- type: entity
+  parent: ClothingEyesBase
+  id: ADTClothingEyesHudMGD
+  name: mgd hud
+  description: owl attacking
+  components:
+  - type: Sprite
+    sprite: ADT/Clothing/Eyes/HUD/mgd_hud.rsi
+  - type: Clothing
+    sprite: ADT/Clothing/Eyes/HUD/mgd_hud.rsi
+  - type: ShowJobIcons
+  - type: ShowCriminalRecordIcons
+  - type: FlashImmunity
+
diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/helmets.yml
@@ -57,6 +57,24 @@
     damageCoefficient: 0.70
   - type: GroupExamine
 
+- type: entity
+  parent: ClothingHeadBase
+  id: ADTClothingHeadHelmetMGDGuard
+  name: MG&D guard helmet
+  description: MG&D guard helmet
+  components:
+  - type: Sprite
+    sprite: ADT/Clothing/Head/Helmets/mgd_helmet.rsi
+  - type: Clothing
+    sprite: ADT/Clothing/Head/Helmets/mgd_helmet.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.9
+        Slash: 0.9
+        Piercing: 0.9
+        Heat: 0.9
+
 - type: entity
   parent: ClothingHeadBase
   id: ADTClothingHeadHelmetMiner
@@ -77,4 +95,4 @@
         Heat: 0.9
   - type: Tag
     tags:
-    - HidesHair
+    - HidesHair
diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml
@@ -1230,6 +1230,8 @@
   - type: Clothing
     sprite: ADT/Clothing/Uniforms/Jumpsuit/winth_swimsuit.rsi
 
+# конец swimsuit
+
 - type: entity
   parent: ClothingUniformBase
   id: ADTClothingUniformJumpsuitCamisoleQM
@@ -1240,3 +1242,52 @@
     sprite: ADT/Clothing/Uniforms/Jumpsuit/qm_camisole.rsi
   - type: Clothing
     sprite: ADT/Clothing/Uniforms/Jumpsuit/qm_camisole.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ADTClothingUniformJumpsuitMGDAgent
+  name: MG&D agent
+  description: MG&D agent
+  components:
+  - type: Sprite
+    sprite: ADT/Clothing/Uniforms/Jumpsuit/mgd_agent.rsi
+  - type: Clothing
+    sprite: ADT/Clothing/Uniforms/Jumpsuit/mgd_agent.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ADTClothingUniformJumpsuitMGDParticipant
+  name: MG&D participant
+  description: MG&D participant
+  components:
+  - type: Sprite
+    sprite: ADT/Clothing/Uniforms/Jumpsuit/mgd_participant.rsi
+  - type: Clothing
+    sprite: ADT/Clothing/Uniforms/Jumpsuit/mgd_participant.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.95
+        Slash: 0.9
+        Piercing: 0.9
+        Heat: 0.95
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ADTClothingUniformJumpsuitMGDGuard
+  name: MG&D guard
+  description: MG&D guard
+  components:
+  - type: Sprite
+    sprite: ADT/Clothing/Uniforms/Jumpsuit/mgd_guard.rsi
+  - type: Clothing
+    sprite: ADT/Clothing/Uniforms/Jumpsuit/mgd_guard.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.7
+        Slash: 0.7
+        Piercing: 0.6
+        Heat: 0.7
+  - type: ExplosionResistance
+    damageCoefficient: 0.75
diff --git a/Resources/Prototypes/ADT/Entities/Structures/Decorations/banners.yml b/Resources/Prototypes/ADT/Entities/Structures/Decorations/banners.yml
@@ -7,3 +7,14 @@
   - type: Sprite
     sprite: ADT/Structures/Decoration/banners.rsi
     state: humanflag
+
+- type: entity
+  id: ADTBannerMGD
+  parent: BannerBase
+  name: MG&D banner
+  description: MG&D banner.
+  components:
+  - type: Sprite
+    sprite: ADT/Structures/Decoration/banners48x48.rsi
+    state: mgdflag
+    scale: 0.75, 0.75
diff --git a/Resources/Textures/ADT/Clothing/Eyes/Glasses/mgd_pnvhud.rsi/equipped-EYES.png b/Resources/Textures/ADT/Clothing/Eyes/Glasses/mgd_pnvhud.rsi/equipped-EYES.png
diff --git a/Resources/Textures/ADT/Clothing/Eyes/Glasses/mgd_pnvhud.rsi/icon.png b/Resources/Textures/ADT/Clothing/Eyes/Glasses/mgd_pnvhud.rsi/icon.png
diff --git a/Resources/Textures/ADT/Clothing/Eyes/Glasses/mgd_pnvhud.rsi/meta.json b/Resources/Textures/ADT/Clothing/Eyes/Glasses/mgd_pnvhud.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by discord:peacemakerrus",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": 
+  [
+    {
+      "name": "equipped-EYES",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    }
+  ]
+}
diff --git a/Resources/Textures/ADT/Clothing/Eyes/HUD/mgd_hud.rsi/equipped-EYES.png b/Resources/Textures/ADT/Clothing/Eyes/HUD/mgd_hud.rsi/equipped-EYES.png
diff --git a/Resources/Textures/ADT/Clothing/Eyes/HUD/mgd_hud.rsi/icon.png b/Resources/Textures/ADT/Clothing/Eyes/HUD/mgd_hud.rsi/icon.png
diff --git a/Resources/Textures/ADT/Clothing/Eyes/HUD/mgd_hud.rsi/meta.json b/Resources/Textures/ADT/Clothing/Eyes/HUD/mgd_hud.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by discord:peacemakerrus",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": 
+  [
+    {
+      "name": "equipped-EYES",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    }
+  ]
+}
diff --git a/Resources/Textures/ADT/Clothing/Head/Helmets/mgd_helmet.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Helmets/mgd_helmet.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/ADT/Clothing/Head/Helmets/mgd_helmet.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Helmets/mgd_helmet.rsi/icon.png
diff --git a/Resources/Textures/ADT/Clothing/Head/Helmets/mgd_helmet.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Helmets/mgd_helmet.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by discord:peacemakerrus",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states":
+  [
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    }
+  ]
+}
diff --git a/...extures/ADT/Clothing/Uniforms/Jumpsuit/mgd_agent.rsi/equipped-INNERCLOTHING.png b/...extures/ADT/Clothing/Uniforms/Jumpsuit/mgd_agent.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/mgd_agent.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/mgd_agent.rsi/icon.png
diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/mgd_agent.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/mgd_agent.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by discord:peacemakerrus",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": 
+  [
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    }
+  ]
+}
diff --git a/...extures/ADT/Clothing/Uniforms/Jumpsuit/mgd_guard.rsi/equipped-INNERCLOTHING.png b/...extures/ADT/Clothing/Uniforms/Jumpsuit/mgd_guard.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/mgd_guard.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/mgd_guard.rsi/icon.png
diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/mgd_guard.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/mgd_guard.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by discord:peacemakerrus",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": 
+  [
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    }
+  ]
+}
diff --git a/...s/ADT/Clothing/Uniforms/Jumpsuit/mgd_participant.rsi/equipped-INNERCLOTHING.png b/...s/ADT/Clothing/Uniforms/Jumpsuit/mgd_participant.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/mgd_participant.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/mgd_participant.rsi/icon.png
diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/mgd_participant.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/mgd_participant.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by discord:peacemakerrus",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": 
+  [
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    }
+  ]
+}
diff --git a/Resources/Textures/ADT/Structures/Decoration/banners48x48.rsi/meta.json b/Resources/Textures/ADT/Structures/Decoration/banners48x48.rsi/meta.json
@@ -0,0 +1,15 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "ADT team",
+
+    "size": {
+        "x": 48,
+        "y": 48
+    },
+    "states": [
+        {
+            "name": "mgdflag"
+        }
+    ]
+}
diff --git a/Resources/Textures/ADT/Structures/Decoration/banners48x48.rsi/mgdflag.png b/Resources/Textures/ADT/Structures/Decoration/banners48x48.rsi/mgdflag.png