AdventureTimeSS14 · Schrodinger71 · Sep 6, 2024 · Sep 4, 2024 · Sep 4, 2024 · Dec 5, 2023
diff --git a/Content.Shared/ADT/NoShowFov/NoShowFovComponent.cs b/Content.Shared/ADT/NoShowFov/NoShowFovComponent.cs
@@ -0,0 +1,9 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.ADT.NoShowFov;
+
+/// <summary>
+///     Applies a fog of war effect to a unit when this component is equipped to the eyes, head, or mask slot.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class NoShowFovComponent : Component { }
diff --git a/Content.Shared/ADT/NoShowFov/NoShowFovSystem.cs b/Content.Shared/ADT/NoShowFov/NoShowFovSystem.cs
@@ -0,0 +1,36 @@
+using Content.Shared.Inventory.Events;
+using Content.Shared.ADT.NoShowFov;
+
+namespace Content.Client.ADT.NoShowFov;
+
+public sealed class NoShowFovSystem : EntitySystem
+{
+    [Dependency] private readonly SharedEyeSystem _eye = default!;
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<NoShowFovComponent, GotEquippedEvent>(OnEquipped);
+        SubscribeLocalEvent<NoShowFovComponent, GotUnequippedEvent>(OnUnequipped);
+    }
+
+    private void OnEquipped(EntityUid uid, NoShowFovComponent component, ref GotEquippedEvent args)
+    {
+        ToggleFov(args.Equipee, false);
+    }
+
+    private void OnUnequipped(EntityUid uid, NoShowFovComponent component, ref GotUnequippedEvent args)
+    {
+        ToggleFov(args.Equipee, true);
+    }
+
+    private void ToggleFov(EntityUid entity, bool drawFov)
+    {
+        if (TryComp<EyeComponent>(entity, out var _))
+        {
+            _eye.SetDrawFov(entity, drawFov);
+        }
+    }
+}
+
+
diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Head/hats.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Head/hats.ftl
@@ -21,3 +21,7 @@ ent-ADTClothingHeadCapIlisium = фуражка
 ent-ADTClothingHeadHatsInvestigatorCap = фуражка следователя Службы Безопасности
     .desc = Слава NanoTrasen!
     .suffix = { "" }
+
+ent-ADTClothingHeadHatsBeretArmy = армейский берет
+    .desc = Потрёпанный на службе военный берет. Имеет золотую нашивку сбоку.
+    .suffix = { "Новая Мекка" }
diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Mask/mask.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Mask/mask.ftl
@@ -5,13 +5,12 @@
 ###ent-ADTClothingMaskBorodaDedMoroz = Борода и усы Дед Мороза
 ###    .desc = Борода Деда Мороза с усами люкс качества, позволит создать вам полный образ Деда Мороза или Санта Клауса. Дети не узнают папу, соседа, или актера.
 ###    .suffix = { "Новый Год" }
-###    
-###ent-ADTChronosMask = визор "Жертва Хроноса"
-###    .desc = Продвинутый визор, сделанный на заказ неким учёным. На боковой стороне визора видна роспись: Х.К.
 ###
 ent-ADTClothingMaskGasCE = противогаз старшего инженера
     .desc = Это элитный противогаз Старшего Инженера, которому может позавидовать даже Центральное Командование. Защищает от сварки.
-
 ent-ADTClothingMaskGasIlisium = дыхательная маска
     .suffix = Иллизиум
-    .desc = Плотно прилегающая тактическая маска, которую можно подсоединить к системе подачи воздуха.
+    .desc = Плотно прилегающая тактическая маска, которую можно подсоединить к системе подачи воздуха.
+ent-ADTChronosMask = визор "Жертва Хроноса"
+    .desc = Продвинутый визор, сделанный на заказ неким учёным. На боковой стороне визора видна роспись: Х.К.
+    .suffix = { "Новая Мекка" }
diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Neck/cloaks.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Neck/cloaks.ftl
@@ -7,4 +7,8 @@ ent-ADTClothingNeckDarkGreyCloak = темно-серый плащ
 
 ent-ADTClothingNeckGothicCloak = готический плащ
     .desc = Для классических вампиров, ценящих старый стиль.
-    .suffix = { "" }
+    .suffix = { "" }
+
+ent-ADTClothingNeckNewMekkaCloak = накидка Новой Мекки
+    .desc = Зеленая накидка, очень удобная в носке. Скреплена застёжкой на шее.
+    .suffix = { "Новая Мекка" }
diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Shoes/boots.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Shoes/boots.ftl
@@ -1,3 +1,6 @@
 ent-ADTClothingSandals = сандали
     .desc = Пара простых сандалей. НИ. В КОЕМ. СЛУЧАЕ. НЕ СОВМЕЩАТЬ. С НОСКАМИ
-    .suffix = { "" }
+    .suffix = { "" }
+ent-ADTClothingFootNewMekkaBoots = сапоги Новой Мекки
+    .desc = Явно потрёпанные сапоги, в которых прошли уж точно не одну милю.
+    .suffix = { "Новая Мекка" }
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
@@ -195,3 +195,7 @@ ent-ADTClothingUniformIlisium = костюм Иллизиума
 ent-ADTClothingUniformInvestigatorSuit = форма следователя Службы Безопасности
     .desc = Одежда для того, кто намерен докопаться до сути всех тайн.
     .suffix = { "" }
+
+ent-ADTClothingUniformNewMekka = униформа Новой Мекки
+    .desc = Эта униформа имеет очень долгую и кровавую историю...
+    .suffix = { "Новая Мекка" }
diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml
@@ -114,3 +114,15 @@
     sprite: ADT/Clothing/Head/Hats/investigator_cap.rsi
   - type: Clothing
     sprite: ADT/Clothing/Head/Hats/investigator_cap.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ADTClothingHeadHatsBeretArmy
+  name: army beret
+  description: army beret
+  suffix: New Mekka
+  components:
+  - type: Sprite
+    sprite: ADT/Clothing/Head/Hats/armyberet.rsi
+  - type: Clothing
+    sprite: ADT/Clothing/Head/Hats/armyberet.rsi
diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Masks/mask.yml b/Resources/Prototypes/ADT/Entities/Clothing/Masks/mask.yml
@@ -197,21 +197,22 @@
 #       - state: equipped-MASK
 #   - type: BreathMask
 
-# - type: entity
-#   parent: ClothingMaskBase
-#   id: ADTChronosMask
-#   name: chronos victim mask
-#   description: chronos victim mask
-#   components:
-#   - type: Sprite
-#     sprite: ADT/Clothing/Mask/chronosvisor.rsi
-#   - type: Clothing
-#     sprite: ADT/Clothing/Mask/chronosvisor.rsi
-#   - type: BreathMask
-#   - type: ShowSecurityIcons
-#   - type: FlashImmunity
-#   - type: EyeProtection
-#     protectionTime: 5
+- type: entity
+  parent: ClothingMaskBase
+  id: ADTChronosMask
+  name: chronos victim mask
+  description: chronos victim mask
+  suffix: New Mekka
+  components:
+  - type: Sprite
+    sprite: ADT/Clothing/Mask/chronosvisor.rsi
+  - type: Clothing
+    sprite: ADT/Clothing/Mask/chronosvisor.rsi
+  - type: BreathMask
+  - type: NoShowFov # Отключает Fov при надевании
+  - type: FlashImmunity
+  - type: EyeProtection
+    protectionTime: 5
 
 # #противогаз СССП
 

diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Neck/Cloaks.yml b/Resources/Prototypes/ADT/Entities/Clothing/Neck/Cloaks.yml
@@ -28,4 +28,14 @@
   - type: Sprite
     sprite: ADT/Clothing/Neck/Cloaks/gothic_cloak.rsi #спрайты от floppo4ka
   - type: StaticPrice
-    price: 5
+    price: 5
+
+- type: entity
+  parent: ClothingNeckBase
+  id: ADTClothingNeckNewMekkaCloak
+  name: New Mekka cloak
+  description: Protect from cold evening on a nukie planet.
+  suffix: New Mekka
+  components:
+  - type: Sprite
+    sprite: ADT/Clothing/Neck/Cloaks/newmekkacloak.rsi
diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Neck/fill.txt b/Resources/Prototypes/ADT/Entities/Clothing/Neck/fill.txt
diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Neck/misc.yml b/Resources/Prototypes/ADT/Entities/Clothing/Neck/misc.yml
@@ -5,12 +5,12 @@
   description: A chain made of gold.
   components:
     - type: Sprite
-      sprite: ADT/Clothing/Neck/Misc/gold_chain.rsi 
+      sprite: ADT/Clothing/Neck/Misc/gold_chain.rsi
     - type: Clothing
       sprite: ADT/Clothing/Neck/Misc/gold_chain.rsi #спрайты от prazat911
     - type: StaticPrice
       price: 500
-     
+
 - type: entity
   parent: ClothingNeckBase
   id: ADTSpaceSecToken

diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Shoes/Boots.yml b/Resources/Prototypes/ADT/Entities/Clothing/Shoes/Boots.yml
@@ -0,0 +1,11 @@
+- type: entity
+  parent: ClothingShoesBaseButcherable
+  id: ADTClothingFootNewMekkaBoots
+  name: New Mekka boots
+  description: Comfortable for bullies!
+  suffix: New Mekka
+  components:
+  - type: Sprite
+    sprite: ADT/Clothing/Shoes/Boots/newmekka.rsi
+  - type: Clothing
+    sprite: ADT/Clothing/Shoes/Boots/newmekka.rsi  #спрайты от prazat911
diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Shoes/misc.yml b/Resources/Prototypes/ADT/Entities/Clothing/Shoes/misc.yml
@@ -36,7 +36,7 @@
     sprite: ADT/Clothing/Shoes/Boots/black_boots.rsi  #спрайты от dion_clawed
   - type: StaticPrice
     price: 240
-    
+
 - type: entity
   parent: ClothingShoesBaseButcherable
   id: ADTClothingSandals

diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml
@@ -246,6 +246,7 @@
   id: ADTClothingUniformNewMekka
   name: New Mekka jumpsuit
   description: New Mekka jumpsuit
+  suffix: New Mekka
   components:
   - type: Sprite
     sprite: ADT/Clothing/Uniforms/Jumpsuit/newmekkauniform.rsi

diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/armyberet.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hats/armyberet.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/armyberet.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Hats/armyberet.rsi/icon.png
diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/armyberet.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Hats/armyberet.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Adventure Time MRP, discord: prazat911",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-HELMET",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/ADT/Clothing/Mask/chronosvisor.rsi/equipped-MASK.png b/Resources/Textures/ADT/Clothing/Mask/chronosvisor.rsi/equipped-MASK.png
diff --git a/Resources/Textures/ADT/Clothing/Mask/chronosvisor.rsi/icon.png b/Resources/Textures/ADT/Clothing/Mask/chronosvisor.rsi/icon.png
diff --git a/Resources/Textures/ADT/Clothing/Mask/chronosvisor.rsi/meta.json b/Resources/Textures/ADT/Clothing/Mask/chronosvisor.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Created by discord:prazat911",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-MASK",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/ADT/Clothing/Neck/Cloaks/newmekkacloak.rsi/equipped-NECK.png b/Resources/Textures/ADT/Clothing/Neck/Cloaks/newmekkacloak.rsi/equipped-NECK.png
diff --git a/Resources/Textures/ADT/Clothing/Neck/Cloaks/newmekkacloak.rsi/icon.png b/Resources/Textures/ADT/Clothing/Neck/Cloaks/newmekkacloak.rsi/icon.png
diff --git a/Resources/Textures/ADT/Clothing/Neck/Cloaks/newmekkacloak.rsi/meta.json b/Resources/Textures/ADT/Clothing/Neck/Cloaks/newmekkacloak.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Adventure Time MRP, discord: prazat911",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-NECK",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/ADT/Clothing/Shoes/Boots/newmekka.rsi/equipped-FEET.png b/Resources/Textures/ADT/Clothing/Shoes/Boots/newmekka.rsi/equipped-FEET.png
diff --git a/Resources/Textures/ADT/Clothing/Shoes/Boots/newmekka.rsi/icon.png b/Resources/Textures/ADT/Clothing/Shoes/Boots/newmekka.rsi/icon.png
diff --git a/Resources/Textures/ADT/Clothing/Shoes/Boots/newmekka.rsi/meta.json b/Resources/Textures/ADT/Clothing/Shoes/Boots/newmekka.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Adventure Time MRP, discord: prazat911",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "equipped-FEET",
+            "directions": 4
+        },
+        {
+            "name": "icon"
+        }
+    ]
+}