AdventureTimeSS14 · PyotrIgn · Oct 15, 2023 · Oct 15, 2023
diff --git a/Resources/Locale/ru-RU/ADT/Catalog/store/uplink.ftl b/Resources/Locale/ru-RU/ADT/Catalog/store/uplink.ftl
@@ -22,3 +22,12 @@ uplink-syndiecloak-desc = антагонизируй со стилем!
 
 uplink-nukeopscloak-name = плащ Ядерных Оперативников
 uplink-nukeopscloak-desc = защитит тебя от холода на базе
+
+uplink-ADTHandDefibrillator-name = Переносной дефибрилятор синдиката
+uplink-ADTHandDefibrillator-desc = Облегченная версия обычного дефибрилятора, более эффективен в лечении но имеет больше сильный разряд. Можно надеть на шею.
+
+uplink-ssmokegrenade-name = Дымовая граната синдиката
+uplink-ssmokegrenade-desc = Расплыет на определенную область непроглядный дым. Является улучшенной версией обычной гранаты.
+
+uplink-ssmokegrenade-bundle-name = Набор дымовых граната
+uplink-ssmokegrenade-bundle-desc = Набор из 6 дымовых граната синдиката. Идеально подходят для вечеринки
diff --git a/Resources/Locale/ru-RU/ADT/Objects/specific/medstuff.ftl b/Resources/Locale/ru-RU/ADT/Objects/specific/medstuff.ftl
@@ -5,3 +5,7 @@ ent-ADTZookeperHandheldHealthAnalyzer = Анализатор здоровья З
 ent-ADTCombatHypo = боевой гипоспрей
     .desc = Модель гипоспрея, разработанная NT для использования в боевых ситуациях - с повышенным объемом в ущерб скорости применения. 
     .suffix = { "" }
+
+ent-ADTHandDefibrillator = боевой переносной Дефибрилятор
+    .desc = Облегченная версия дефибрилятора, возращает в жизни лучше и быстрее, хоть разряд опаснее. Можно надеть на шею
+    .suffix = { "" }
diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
@@ -102,3 +102,14 @@
     contents:
       - id: ADTExtMagazineRifle
         amount: 3
+
+- type: entity
+  parent: ClothingBackpackDuffelSyndicateAmmoBundle
+  id: ADTClothingBackpackDuffelSsmokeGrenade
+  name: Набор дымовых гранат синдиката
+  description: Набор из 6 штук дымовых гранат синдиката 
+  components:
+  - type: StorageFill
+    contents:
+      - id: ADTSSmokeGrenade
+        amount: 6
diff --git a/Resources/Prototypes/ADT/Catalog/uplink.yml b/Resources/Prototypes/ADT/Catalog/uplink.yml
@@ -203,3 +203,47 @@
     whitelist:
       tags:
       - NukeOpsUplink
+
+- type: listing
+  id: UplinkADTHandDefibrillator
+  name: uplink-ADTHandDefibrillator-name
+  description: uplink-ADTHandDefibrillator-desc
+  productEntity: ADTHandDefibrillator
+  cost:
+    Telecrystal: 25
+  categories:
+  - UplinkMisc
+  conditions:
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - NukeOpsUplink
+
+- type: listing
+  id: ADTUplinkSyndieSSmokegrenade
+  name: uplink-ssmokegrenade-name
+  description: uplink-ssmokegrenade-desc
+  productEntity: ADTSSmokeGrenade
+  cost:
+    Telecrystal: 4
+  categories:
+  - UplinkExplosives
+
+- type: listing
+  id: ADTUplinkSmokeBundle
+  name: uplink-SmokeGrenadeBundle-name
+  description: uplink-SmokeGrenadeBundle-desc
+  productEntity: ADTClothingBackpackDuffelSsmokeGrenade
+  cost:
+    Telecrystal: 18
+  categories:
+  - UplinkBundles
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - NukeOpsUplink
+    - !type:BuyerWhitelistCondition
+      blacklist:
+        components:
+          - SurplusBundle
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/defib.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/defib.yml
@@ -0,0 +1,25 @@
+- type: entity
+  id: ADTHandDefibrillator
+  name: 
+  description: 
+  parent: [ BaseDefibrillator, PowerCellSlotMediumItem ]
+  components:
+  - type: Item
+    size: 20
+  - type: Clothing
+    quickEquip: false
+    slots:
+    - neck
+  - type: Sprite
+    sprite: ADT/Objects/Specific/Medical/defibsyndi.rsi
+  - type: Defibrillator
+    zapHeal:
+      types:
+        Asphyxiation: -50
+    writheDuration: 5
+    zapDamage: 15
+    zapDelay: 2
+    doAfterDuration: 1
+  - type: MultiHandedItem
+  - type: PowerCellDraw
+    useRate: 200
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -498,3 +498,5 @@
       - id: SpeedLoaderMagnumRubber
       - id: SpeedLoaderMagnumRubber
       - id: SpeedLoaderMagnum
+      - id: ADTSmokeGrenade
+      - id: ADTSmokeGrenade
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
@@ -268,3 +268,5 @@
       - id: SpeedLoaderMagnumRubber
       - id: SpeedLoaderMagnumRubber
       - id: SpeedLoaderMagnum
+      - id: ADTSmokeGrenade
+      - id: ADTSmokeGrenade
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
@@ -285,3 +285,5 @@
       - id: SpeedLoaderMagnumRubber
       - id: SpeedLoaderMagnumRubber
       - id: SpeedLoaderMagnum
+      - id: ADTSmokeGrenade
+      - id: ADTSmokeGrenade
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
@@ -299,6 +299,7 @@
       - id: WeaponPistolViper
       - id: PinpointerNuclear
       - id: MicroBombImplanter
+      - id: ADTSmokeGrenade
 
 
 - type: entity

diff --git a/Resources/Prototypes/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
@@ -128,11 +128,12 @@
   - type: StorageFill
     contents:
       - id: ExGrenade
-        amount: 4
+        amount: 3
       - id: SyndieMiniBomb
         amount: 2
       - id: EmpGrenade
         amount: 2
+      - id: ADTSmokeGrenade
 
 - type: entity
   id: ClothingBeltMilitaryWebbingMedFilled

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -533,6 +533,7 @@
     idleState: icon
     runningState: icon
     staticRecipes:
+      - ADTSmokeGrenades
       - ClothingEyesHudSecurity
       - Flash
       - Handcuffs

diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml
@@ -472,3 +472,13 @@
     Steel: 500
     Glass: 100
     Plastic: 200
+
+#ADT
+- type: latheRecipe
+  id: ADTSmokeGrenades
+  result: ADTSmokeGrenade
+  completetime: 2
+  materials:
+    Steel: 200
+    Plastic: 100
+    Gold: 10
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/defibsyndi.rsi/icon.png b/Resources/Textures/ADT/Objects/Specific/Medical/defibsyndi.rsi/icon.png
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/defibsyndi.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Specific/Medical/defibsyndi.rsi/inhand-left.png
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/defibsyndi.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Specific/Medical/defibsyndi.rsi/inhand-right.png
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/defibsyndi.rsi/meta.json b/Resources/Textures/ADT/Objects/Specific/Medical/defibsyndi.rsi/meta.json
@@ -0,0 +1,28 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "Created by EmoGarbage404 (github) for Space Staiton 14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "ready"
+    },
+    {
+      "name": "screen"
+    }
+  ]
+}
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/defibsyndi.rsi/ready.png b/Resources/Textures/ADT/Objects/Specific/Medical/defibsyndi.rsi/ready.png
diff --git a/Resources/Textures/ADT/Objects/Specific/Medical/defibsyndi.rsi/screen.png b/Resources/Textures/ADT/Objects/Specific/Medical/defibsyndi.rsi/screen.png