[ПЕРЕНОС]Мультифазовый пистолет ГСБ (#802)

Со старой сборки перенесён мультифазовый пистолет ГСБ и починил выдачу
цели на мобильный дефиб.
Так как дробовик гсб убран из хай рисков, он стал доступен для покупки в
карго.
:cl: Filo
- add: Была добавлена возможность закупа энерго дробовиков в карго, за
счет ослабления их мощности.
- add: ГСБ получил высокоценный мультифазовый пистолет с тремя режимами
стрельбы, энерго дробовик же потерял в ценности.
- fix: Синдикат прознал про мобильный дефибриллятор ГВ и начал раздавать
цели на его кражу.

Resources/Locale/ru-RU/ADT/prototypes/Catalog/Fills/Crates/armory.ftl

@@ -0,0 +1,2 @@
+ent-ADTCrateArmoryEnergyShotgun = ящик энерго-дробовиков
+    .desc = Если вам по душе технологии. Содержит два продвинутых энерго-дробовика.

Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Battery/battery_gun.ftl

@@ -0,0 +1,3 @@
+ent-ADTWeaponPistolX01 = X-01 М.Э.П.
+    .desc = Мультифазовый энергетический пистолет. Это дорогая, современная версия антикварного лазерного пистолета. У этого оружия есть несколько уникальных режимов огня, но нет возможности самостоятельно перезаряжаться с течением времени.
+    .suffix = { "Пистолет, Мультифазовый" }

Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.ftl

@@ -0,0 +1,3 @@
+ent-ADTBulletIon = Ионный заряд
+ent-ADTBulletLaser = Лазерный заряд
+ent-ADTBulletDisabler = Оглушающий заряд

Resources/Locale/ru-RU/ADT/prototypes/Objectives/steal-target-groups.ftl

@@ -2,3 +2,4 @@ steal-target-groups-clothing-mask-gas-ce = противогаз старшего
 steal-target-groups-adt-mobile-defibrillator = мобильный дефибриллятор
 steal-target-groups-command-id = ID карта члена командования
 steal-target-groups-smile-extract = экстракт Смайла
+steal-target-groups-adt-pistol-x01 = X-01 М.Э.П.

Resources/Prototypes/ADT/Catalog/Cargo/cargo_armory.yml

@@ -0,0 +1,9 @@
+- 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

Resources/Prototypes/ADT/Catalog/Fills/Crates/armory.yml

@@ -0,0 +1,8 @@
+- type: entity
+  id: ADTCrateArmoryEnergyShotgun
+  parent: CrateArmoryShotgun
+  components:
+  - type: StorageFill
+    contents:
+      - id: WeaponEnergyShotgun
+        amount: 2

Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Battery/battery_gun.yml

@@ -158,3 +158,57 @@
       proto: ADTBulletCutterAdv
       fireCost: 75
     - type: Appearance
+
+- type: entity
+  name: X-01 multiphas laser pistol
+  parent: BaseWeaponBatterySmall
+  id: ADTWeaponPistolX01
+  description: new version of antique gun witout selfrcharge
+  components:
+  - type: Sprite
+    sprite: ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-unshaded-4
+      visible: false
+      map: ["enum.GunVisualLayers.MagUnshaded"]
+      shader: unshaded
+  - type: Appearance
+  - type: MagazineVisuals
+    magState: mag
+    steps: 5
+    zeroVisible: false
+  - type: Clothing
+    sprite: ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi
+  - type: Gun
+    fireRate: 3
+    selectedMode: FullAuto
+    availableModes:
+    - SemiAuto
+    - FullAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg
+  - type: ProjectileBatteryAmmoProvider
+    proto: ADTBulletDisabler
+    fireCost: 50
+  - type: BatteryWeaponFireModes
+    fireModes:
+    - proto: ADTBulletDisabler
+      fireCost: 50
+    - proto: ADTBulletLaser
+      fireCost: 50
+    - proto: ADTBulletIon
+      fireCost: 150
+  - type: Battery
+    maxCharge: 1500
+    startingCharge: 1500
+  - type: Tag
+    tags:
+    - HighRiskItem
+  - type: StealTarget
+    stealGroup: ADTWeaponPistolX01
+  - type: StaticPrice
+    price: 7500
+  - type: Item
+    size: Normal

Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/impact.yml

@@ -0,0 +1,37 @@
+- type: entity
+  id: ADTBulletImpactEffectLaser
+  name: Laser boltik
+  categories: [ HideSpawnMenu ]
+  components:
+    - type: TimedDespawn
+      lifetime: 0.2
+    - type: Sprite
+      drawdepth: Effects
+      layers:
+        - shader: unshaded
+          map: ["enum.EffectLayers.Unshaded"]
+          sprite: ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi
+          state: impact_laser_red
+    - type: EffectVisuals
+    - type: Tag
+      tags:
+        - HideContextMenu
+
+- type: entity
+  id: ADTBulletImpactEffectIon
+  categories: [ HideSpawnMenu ]
+  name: Kinetic bolt
+  components:
+    - type: TimedDespawn
+      lifetime: 0.2
+    - type: Sprite
+      drawdepth: Effects
+      layers:
+        - shader: unshaded
+          map: ["enum.EffectLayers.Unshaded"]
+          sprite: ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi
+          state: impact_laser_yellow
+    - type: EffectVisuals
+    - type: Tag
+      tags:
+        - HideContextMenu

Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml

@@ -112,3 +112,101 @@
         Heat: 20
   - type: TimedDespawn
     lifetime: 0.25
+
+- type: entity
+  name: Laser bolt
+  id: ADTBulletLaser
+  parent: BaseBullet
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Reflective
+    reflective:
+    - Energy
+  - type: FlyBySound
+    sound:
+      collection: EnergyMiss
+      params:
+        volume: 5
+  - type: Fixtures
+    fixtures:
+      projectile:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.15,-0.3,0.15,0.3"
+        hard: false
+        mask:
+        - Opaque
+  - type: Sprite
+    sprite: ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi
+    layers:
+    - state: omnilaser
+      shader: unshaded
+  - type: Physics
+  - type: Ammo
+  - type: Projectile
+    impactEffect: ADTBulletImpactEffectLaser
+    damage:
+      types:
+        Heat: 12
+    soundHit:
+      collection: WeakHit
+    forceSound: true
+
+- type: entity
+  name: ion bolt
+  id: ADTBulletIon
+  parent: BaseBullet
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Reflective
+    reflective:
+    - Energy
+  - type: FlyBySound
+    sound:
+      collection: EnergyMiss
+      params:
+        volume: 5
+  - type: Fixtures
+    fixtures:
+      projectile:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.15,-0.3,0.15,0.3"
+        hard: false
+        mask:
+        - Opaque
+  - type: Sprite
+    sprite: ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi
+    layers:
+    - state: omnilaser_yellow
+      shader: unshaded
+  - type: Physics
+  - type: Ammo
+  - type: Projectile
+    impactEffect: ADTBulletImpactEffectIon
+    damage:
+      types:
+        Shock: 1
+    soundHit:
+      collection: WeakHit
+    forceSound: true
+  - type: EmpOnCollide
+    energyConsumption: 10000
+    disableDuration: 20
+
+- type: entity
+  name: stanner bolt
+  id: ADTBulletDisabler
+  parent: BulletDisabler
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: StaminaDamageOnCollide
+    damage: 17
+  - type: Projectile
+    impactEffect: BulletImpactEffectDisabler
+    damage:
+      types:
+        Heat: 4
+    soundHit:
+      collection: WeakHit
+    forceSound: true

Resources/Prototypes/ADT/Objectives/stealTargetGroups.yml

@@ -13,6 +13,13 @@
     sprite: ADT/Objects/Specific/Medical/mobile_defib.rsi
     state: icon
 
+- type: stealTargetGroup
+  id: ADTWeaponPistolX01
+  name: steal-target-groups-adt-pistol-x01
+  sprite:
+    sprite: ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi
+    state: icon
+
 - type: stealTargetGroup
   id: ADTClothingMaskGasCE
   name: steal-target-groups-clothing-mask-gas-ce

Resources/Prototypes/ADT/Objectives/traitor.yml

@@ -1,9 +1,23 @@
 - type: entity
   categories: [ HideSpawnMenu ]
   parent: BaseTraitorStealObjective
-  id: ADTCMODefibrillatorStealObjective
+  id: ADTMobileDefibrillatorStealObjective
   components:
   - type: NotJobRequirement
     job: ChiefMedicalOfficer
   - type: StealCondition
     stealGroup: ADTMobileDefibrillator
+    owner: job-name-cmo
+
+- type: entity
+  categories: [ HideSpawnMenu ]
+  parent: BaseTraitorStealObjective
+  id: ADTX01StealObjective
+  components:
+  - type: Objective
+    difficulty: 3
+  - type: NotJobRequirement
+    job: HeadOfSecurity
+  - type: StealCondition
+    stealGroup: ADTWeaponPistolX01
+    owner: job-name-hos

Resources/Prototypes/Catalog/Fills/Lockers/heads.yml

@@ -365,7 +365,8 @@
   id: LockerFillHeadOfSecurityNoHardsuit
   table: !type:AllSelector
     children:
-    - id: WeaponEnergyShotgun
+    - id: ADTWeaponPistolX01 # ADT tweak Мультифаза для гсб
+#    - id: WeaponEnergyShotgun ADT tweak Дробовик для смотрителя
     - id: BookSpaceLaw
     - id: BoxEncryptionKeySecurity
     - id: CigarGoldCase

Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

@@ -747,17 +747,19 @@
       fireCost: 100
     - proto: BulletLaserHeavySpread
       fireCost: 100
-    - proto: BulletDisablerSmgSpread
-      fireCost: 100
+#    - proto: BulletDisablerSmgSpread # ADT nerf
+#      fireCost: 100 # ADT nerf
   - type: Item
     size: Large
     shape:
-    - 0,0,3,1
+    - 0,0,3,3 # ADT tweak before 0 0 3 1
     sprite: Objects/Weapons/Guns/Battery/inhands_64x.rsi
     heldPrefix: energy
-  - type: Tag
-    tags:
-    - HighRiskItem
+# ADT tweak start
+#  - type: Tag
+#    tags:
+#    - HighRiskItem
+# ADT tweak end
   - type: StealTarget
     stealGroup: WeaponEnergyShotgun
   - type: GunRequiresWield #remove when inaccuracy on spreads is fixed

Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml

@@ -1030,7 +1030,7 @@
     impactEffect: BulletImpactEffectOrangeDisabler
     damage:
       types:
-        Heat: 13
+        Heat: 10 # ADT nerf from 13
 
 - type: entity
   name: wide laser barrage
@@ -1052,7 +1052,7 @@
   - type: Projectile
     damage:
       types:
-        Heat: 15
+        Heat: 11 # ADT nerf from 15
 
 - type: entity
   name: narrow laser barrage

Resources/Prototypes/Objectives/objectiveGroups.yml

@@ -22,7 +22,9 @@
     CaptainGunStealObjective: 0.5
     CaptainJetpackStealObjective: 0.5
     HandTeleporterStealObjective: 0.5
-    EnergyShotgunStealObjective: 0.5
+#    EnergyShotgunStealObjective: 0.5 # ADT objective
+    ADTMobileDefibrillatorStealObjective: 1 # ADT Objective
+    ADTX01StealObjective: 0.5 # ADT Objective
 
 - type: weightedRandom
   id: TraitorObjectiveGroupKill

Resources/Prototypes/Objectives/traitor.yml

@@ -192,7 +192,7 @@
   - type: StealCondition
     stealGroup: HandTeleporter
 
-## hos
+## hos # adt warden
 
 - type: entity
   categories: [ HideSpawnMenu ]
@@ -203,10 +203,10 @@
     # HoS will have this on them a lot of the time so..
     difficulty: 3
   - type: NotJobRequirement
-    job: HeadOfSecurity
+    job: Warden # ADT tweak
   - type: StealCondition
     stealGroup: WeaponEnergyShotgun
-    owner: job-name-hos
+    owner: job-name-warden # ADT tweak
 
 ## ce