From 94d63ed98d17d72421749e12129b745c93d378db Mon Sep 17 00:00:00 2001
From: Filo <filokini@bk.ru>
Date: Mon, 2 Dec 2024 19:00:42 +0500
Subject: [PATCH] otkat

---
 .../ru-RU/ADT/prototypes/Catalog/Fills/Crates/armory.ftl | 2 --
 Resources/Prototypes/ADT/Catalog/Cargo/cargo_armory.yml  | 9 ---------
 Resources/Prototypes/ADT/Catalog/Fills/Crates/armory.yml | 8 --------
 Resources/Prototypes/Catalog/Fills/Lockers/security.yml  | 2 ++
 .../Objects/Weapons/Guns/Battery/battery_guns.yml        | 6 +++---
 .../Objects/Weapons/Guns/Projectiles/projectiles.yml     | 4 ++--
 6 files changed, 7 insertions(+), 24 deletions(-)
 delete mode 100644 Resources/Locale/ru-RU/ADT/prototypes/Catalog/Fills/Crates/armory.ftl
 delete mode 100644 Resources/Prototypes/ADT/Catalog/Cargo/cargo_armory.yml
 delete mode 100644 Resources/Prototypes/ADT/Catalog/Fills/Crates/armory.yml

diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Catalog/Fills/Crates/armory.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Catalog/Fills/Crates/armory.ftl
deleted file mode 100644
index c61519869bd..00000000000
--- a/Resources/Locale/ru-RU/ADT/prototypes/Catalog/Fills/Crates/armory.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-ent-ADTCrateArmoryEnergyShotgun = ящик энерго-дробовиков
-    .desc = Если вам по душе технологии. Содержит два продвинутых энерго-дробовика.
diff --git a/Resources/Prototypes/ADT/Catalog/Cargo/cargo_armory.yml b/Resources/Prototypes/ADT/Catalog/Cargo/cargo_armory.yml
deleted file mode 100644
index c96ffc9dcc8..00000000000
--- a/Resources/Prototypes/ADT/Catalog/Cargo/cargo_armory.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-- type: cargoProduct
-  id: ADTArmoryEnergyShotguns
-  icon:
-    sprite: Objects/Weapons/Guns/Battery/energy_shotgun.rsi
-    state: icon
-  product: ADTCrateArmoryEnergyShotgun
-  cost: 12000
-  category: cargoproduct-category-name-armory # Визарды, сделайте пожалуйста паренты для категорий.
-  group: market
diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Crates/armory.yml b/Resources/Prototypes/ADT/Catalog/Fills/Crates/armory.yml
deleted file mode 100644
index e3809ff308f..00000000000
--- a/Resources/Prototypes/ADT/Catalog/Fills/Crates/armory.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-- type: entity
-  id: ADTCrateArmoryEnergyShotgun
-  parent: CrateArmoryShotgun
-  components:
-  - type: StorageFill
-    contents:
-      - id: WeaponEnergyShotgun
-        amount: 2
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
index 8af59da65d2..c8d9b850b24 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -24,6 +24,7 @@
       - id: ClothingOuterCoatWardenAlt # Corvax-SecFashion
       - id: ClothingBackpackWarden # Corvax-SecFashion
       # ADT-Tweak-Start
+      - id: WeaponEnergyShotgun # Дробовик для смотрителя
       - id: ADTClothingNeckBodyCamera #ADT bodycam
       - id: ADTBookSRPsec
       - id: ADTBookPCDsec
@@ -60,6 +61,7 @@
       - id: BookSpaceLaw
       - id: ClothingBackpackWarden # Corvax-SecFashion
       # ADT-Tweak-Start
+      - id: WeaponEnergyShotgun # Дробовик для смотрителя
       - id: ADTClothingNeckBodyCamera #ADT bodycam
       - id: ADTBookSRPsec
       - id: ADTBookPCDsec
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
index d2a89fbe1d6..ad5c1b82e83 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -747,12 +747,12 @@
       fireCost: 100
     - proto: BulletLaserHeavySpread
       fireCost: 100
-#    - proto: BulletDisablerSmgSpread # ADT nerf
-#      fireCost: 100 # ADT nerf
+    - proto: BulletDisablerSmgSpread # ADT nerf
+      fireCost: 100 # ADT nerf
   - type: Item
     size: Large
     shape:
-    - 0,0,3,3 # ADT tweak before 0 0 3 1
+    - 0,0,3,1
     sprite: Objects/Weapons/Guns/Battery/inhands_64x.rsi
     heldPrefix: energy
 # ADT tweak start
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
index edb419bf364..ccca1079be2 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -1030,7 +1030,7 @@
     impactEffect: BulletImpactEffectOrangeDisabler
     damage:
       types:
-        Heat: 10 # ADT nerf from 13
+        Heat: 13
 
 - type: entity
   name: wide laser barrage
@@ -1052,7 +1052,7 @@
   - type: Projectile
     damage:
       types:
-        Heat: 11 # ADT nerf from 15
+        Heat: 15
 
 - type: entity
   name: narrow laser barrage