[ПЕРЕНОС] Добавлен страйкбольный лектер

Resources/Locale/ru-RU/ADT/Objects/Weapons/Guns/rifles.ftl

@@ -0,0 +1,3 @@
+ent-ADTWeaponRifleLecterBibis = страйкбольный "Лектер"
+    .desc = Релика штурмовой винтовки "Лектер", сделанная для игры в страйкбол.
+    .suffix = { "Страйкбол" }

Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/cartridges.ftl

@@ -0,0 +1,3 @@
+ent-ADTCartridgeStrikeballBibis = страйкбольный шарик
+    .desc = Маленький пластиковый шарик, используемый для страйкбола. 
+    .suffix = { "Страйкбол" }

Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magazines.ftl

@@ -0,0 +1,3 @@
+ent-ADTMagazineRifleBibis = магазин от страйкбольного автомата
+    .desc = Магазин для страйкбольного автомата, с двумя сотнями маленьких шариков. 
+    .suffix = { "Страйкбол" }

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

@@ -0,0 +1,3 @@
+ent-ADTBulletBibis = страйкбольный шарик
+    .desc = Если ты увидел этот шарик в полете - ты пекуш бубиш шимбамбулеш. И выйди уже из матрицы.
+    .suffix = { "Страйкбол" }

Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/strikball.yml

@@ -0,0 +1,30 @@
+- type: entity
+  id: ADTBaseCartridgeStrikeball
+  name: bibis
+  parent: BaseCartridge
+  abstract: true
+  components:
+  - type: Tag
+    tags:
+      - Cartridge
+      - ADTCartridgeBibis
+  - type: CartridgeAmmo
+    deleteOnSpawn: true
+  - type: Sprite
+    noRot: false
+    sprite: ADT/Objects/Weapons/Guns/Ammunition/Casings/airsoft_bibis.rsi
+    layers:
+    - state: base
+      map: ["enum.AmmoVisualLayers.Base"]
+  - type: Appearance
+  - type: SpentAmmoVisuals
+  - type: StaticPrice
+    price: 1
+
+- type: entity
+  id: ADTCartridgeStrikeballBibis
+  name: bibis
+  parent: ADTBaseCartridgeStrikeball
+  components:
+  - type: CartridgeAmmo
+    proto: ADTBulletBibis

Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Magazines/strikeball.yml

@@ -0,0 +1,48 @@
+# Empty mags
+- type: entity
+  id: ADTBaseMagazineBibis
+  name: "magazine bibis"
+  parent: BaseItem
+  abstract: true
+  components:
+  - type: Tag
+    tags:
+      - ADTMagazineRifleBibis
+  - type: Item
+    size: Small
+  - type: BallisticAmmoProvider
+    mayTransfer: true
+    whitelist:
+      tags:
+        - ADTCartridgeBibis
+    capacity: 200
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: MagazineVisuals
+    magState: mag
+    steps: 2
+    zeroVisible: false
+  - type: Appearance
+
+# Magazines
+- type: entity
+  id: ADTMagazineRifleBibis
+  name: "magazine bibis"
+  parent: ADTBaseMagazineBibis
+  components:
+  - type: BallisticAmmoProvider
+    proto: ADTCartridgeStrikeballBibis
+  - type: Sprite
+    layers:
+    - state: red
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]

Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/BulletBibis.yml

@@ -0,0 +1,16 @@
+- type: entity
+  id: ADTBulletBibis
+  name: bibis ball
+  parent: ADTBaseBulletRubber
+  noSpawn: true
+  components:
+  - type: Projectile
+    damage:
+      types:
+        Blunt: 0.1
+  - type: StaminaDamageOnCollide
+    damage: 5
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
+    layers:
+    - state: depleted-uranium

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

@@ -1,4 +1,3 @@
-
 - type: entity
   id: ADTProjectileIonRifle
   parent: BulletDisabler
@@ -50,3 +49,22 @@
     soundHit:
       collection: WeakHit
     forceSound: true
+
+- type: entity
+  id: ADTBaseBulletRubber
+  name: base bullet rubber
+  parent: BaseBullet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
+    layers:
+    - state: rubber
+  - type: Projectile
+    damage:
+      types:
+        Blunt: 3
+    soundHit:
+      path: /Audio/Weapons/Guns/Hits/snap.ogg
+  - type: StaminaDamageOnCollide
+    damage: 22 # 5 hits to stun sounds reasonable

Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Rifels/rifles.yml

@@ -50,3 +50,50 @@
     slots:
     - Back
     - suitStorage
+
+- type: entity
+  name: Lecter Strikeball
+  parent: BaseWeaponRifle
+  id: ADTWeaponRifleLecterBibis
+  description: A high end military grade assault rifle. Uses .20 rifle ammo.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Rifles/lecter.rsi
+    layers:
+      - state: base
+        map: ["enum.GunVisualLayers.Base"]
+      - state: mag-0
+        map: ["enum.GunVisualLayers.Mag"]
+  - type: Clothing
+    sprite: Objects/Weapons/Guns/Rifles/lecter.rsi
+  - type: Gun
+    fireRate: 10
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/atreides.ogg
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        startingItem: ADTMagazineRifleBibis
+        insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg
+        ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg
+        priority: 2
+        whitelist:
+          tags:
+            - ADTMagazineRifleBibis
+      gun_chamber:
+        name: Chamber
+        startingItem: ADTCartridgeStrikeballBibis
+        priority: 1
+        whitelist:
+          tags:
+            - ADTCartridgeBibis
+  - type: ContainerContainer
+    containers:
+      gun_magazine: !type:ContainerSlot
+      gun_chamber: !type:ContainerSlot
+  - type: MagazineVisuals
+    magState: mag
+    steps: 1
+    zeroVisible: true
+  - type: Appearance

Resources/Prototypes/ADT/tags.yml

@@ -33,3 +33,9 @@
 
 - type: Tag
   id: ADTSteelSheet
+
+- type: Tag
+  id: ADTCartridgeBibis
+
+- type: Tag
+  id: ADTMagazineRifleBibis

Resources/Prototypes/Entities/Clothing/Belt/belts.yml

@@ -475,6 +475,7 @@
         - Sidearm
         - MagazinePistol
         - MagazineMagnum
+        - ADTMagazineRifleBibis # ADT Tweak
         - CombatKnife
         - Truncheon
         - ADTLasgunRevolverCell #ADT Tweak
@@ -486,6 +487,7 @@
         - Handcuff
         - BallisticAmmoProvider
         - CartridgeAmmo
+        - ADTCartridgeBibis # ADT Tweak
         - DoorRemote
         - Whistle
         - HolosignProjector

Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Casings/airsoft_bibis.rsi/meta.json

@@ -0,0 +1,17 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/0b3ab17dbad632ddf738b63900ef8df1926bba47/icons/obj/ammo.dmi, modified by Topy",
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "base-spent"
+        }
+    ]
+}