Откат дробовика (#867)

Откат добавления дробовика в карго и добавление его смотрителю Ссылка #802 🆑 Filo - tweak: Дробовик отобрал у отдела снабжения свой дробовик.
AdventureTimeSS14 · Dec 2, 2024 · c2aca21 · c2aca21
2 parents 1f66725 + 94d63ed
commit c2aca21
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 24 deletions.
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
diff --git a/Resources/Prototypes/ADT/Catalog/Cargo/cargo_armory.yml b/Resources/Prototypes/ADT/Catalog/Cargo/cargo_armory.yml
diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Crates/armory.yml b/Resources/Prototypes/ADT/Catalog/Fills/Crates/armory.yml
diff --git 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
@@ -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
@@ -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