Обновление кс23

Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/weapons/guns/ammunition/cartridges/ks23.ftl

@@ -1,4 +1,4 @@
 ent-ShellKS23Flashbang = ружейный патрон (.90 светошумовой)
 ent-ShellKS23Smoke = ружейный патрон (.90 газовый)
 ent-ShellKS23Beanbag = ружейный патрон (.90 травматический)
-ent-ShellKS23Base = ружейный патрон (.90 картечь)
+ent-ShellKS23Base = ружейный патрон (.90 летальный)

Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/weapons/guns/ammunition/projectiles/shotguns/ks23.ftl

@@ -1,4 +1,4 @@
 ent-PelletKS23Flashbang = светошумовой (.90)
 ent-PelletKS23Smoke = газовый (.90)
-ent-PelletKS23Base = картечь (.90)
+ent-PelletKS23Base = летальный (.90)
 ent-PelletKS23Beanbag = травматический (.90)

Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/shotgun.ftl

@@ -18,3 +18,11 @@ ent-BoxShotgunPractice = раздатчик ружейных патронов (
     .desc = Полная коробка учебных ружейных патронов.
 ent-BoxShellTranquilizer = раздатчик ружейных патронов (транквилизаторы)
     .desc = Полная коробка ружейных патронов-транквилизаторов.
+ent-BoxLethalshotKS23 = раздатчик патронов для KS23 (летальные)
+    .desc = Полная коробка летальных патронов для дробовика KS23.
+ent-BoxFlashbangKS23 = раздатчик патронов для KS23 (светошумовые)
+    .desc = Полная коробка светошумовых патронов для дробовика KS23.
+ent-BoxSmokeKS23 = раздатчик патронов для KS23 (газовые)
+    .desc = Полная коробка газовых патронов для дробовика KS23.
+ent-BoxBeanbagKS23 = раздатчик патронов для KS23 (травматические)
+    .desc = Полная коробка травматических патронов для дробовика KS23.

Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml

@@ -0,0 +1,75 @@
+- type: entity
+  parent: BaseAmmoProvider
+  id: AmmoProviderKS23Shell
+  abstract: true
+  components:
+    - type: BallisticAmmoProvider
+      mayTransfer: true
+      whitelist:
+        tags:
+        - ShellKS23
+      capacity: 6
+    - type: Item
+      size: Normal
+      shape:
+      - 0,0,1,0
+
+- type: entity
+  name: KS23 lethal cartridges dispenser
+  parent: AmmoProviderKS23Shell
+  id: BoxLethalshotKS23
+  description: A dispenser box full of lethal pellet shots.
+  components:
+    - type: BallisticAmmoProvider
+      proto: ShellKS23Base
+    - type: Icon
+      sprite: Corvax/Objects/Storage/boxes.rsi
+      state: KS23BaseDispenser
+    - type: Sprite
+      sprite: Corvax/Objects/Storage/boxes.rsi
+      state: KS23BaseDispenser
+
+- type: entity
+  name: KS23 flashbang cartridges dispenser
+  parent: AmmoProviderKS23Shell
+  id: BoxFlashbangKS23
+  description: A dispenser box full of flashbang pellet shots.
+  components:
+    - type: BallisticAmmoProvider
+      proto: ShellKS23Flashbang
+    - type: Icon
+      sprite: Corvax/Objects/Storage/boxes.rsi
+      state: KS23FlashbangDispenser
+    - type: Sprite
+      sprite: Corvax/Objects/Storage/boxes.rsi
+      state: KS23FlashbangDispenser
+
+- type: entity
+  name: KS23 smoke cartridges dispenser
+  parent: AmmoProviderKS23Shell
+  id: BoxSmokeKS23
+  description: A dispenser box full of smoke pellet shots.
+  components:
+    - type: BallisticAmmoProvider
+      proto: ShellKS23Smoke
+    - type: Icon
+      sprite: Corvax/Objects/Storage/boxes.rsi
+      state: KS23SmokeDispenser
+    - type: Sprite
+      sprite: Corvax/Objects/Storage/boxes.rsi
+      state: KS23SmokeDispenser
+
+- type: entity
+  name: KS23 beanbag cartridges dispenser
+  parent: AmmoProviderKS23Shell
+  id: BoxBeanbagKS23
+  description: A dispenser box full of beanbag pellet shots.
+  components:
+    - type: BallisticAmmoProvider
+      proto: ShellKS23Beanbag
+    - type: Icon
+      sprite: Corvax/Objects/Storage/boxes.rsi
+      state: KS23BeanbagDispenser
+    - type: Sprite
+      sprite: Corvax/Objects/Storage/boxes.rsi
+      state: KS23BeanbagDispenser

Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml

@@ -33,6 +33,8 @@
       reagents:
       - ReagentId: TearGas
         Quantity: 50
+      - ReagentId: Ipecac
+        Quantity: 10
     spreadAmount: 1
   - type: ActiveTimerTrigger
     timeRemaining: 1
@@ -53,7 +55,7 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 10
+        Piercing: 15
 
 - type: entity
   id: PelletKS23BaseSpread
@@ -62,7 +64,7 @@
   - type: ProjectileSpread
     proto: PelletKS23Base
     count: 6
-    spread: 15
+    spread: 5
 
 - type: entity
   id: PelletKS23Beanbag

Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml

@@ -19,5 +19,5 @@
     whitelist:
       tags:
       - ShellKS23
-    capacity: 3
+    capacity: 4
     proto: ShellKS23Base

Resources/Prototypes/Corvax/Recipes/Lathes/security.yml

@@ -1,37 +1,36 @@
 - type: latheRecipe
-  id: ShellKS23Flashbang
-  result: ShellKS23Flashbang
+  id: BoxFlashbangKS23
+  result: BoxFlashbangKS23
   category: Ammo
-  completetime: 1
+  completetime: 3
   materials:
-    Steel: 40
-    Plastic: 40
-    Glass: 20
+    Steel: 320
+    Plastic: 320
+    Glass: 160
 
 - type: latheRecipe
-  id: ShellKS23Smoke
-  result: ShellKS23Smoke
+  id: BoxSmokeKS23
+  result: BoxSmokeKS23
   category: Ammo
-  completetime: 1
+  completetime: 3
   materials:
-    Steel: 20
-    Plastic: 30
-    Glass: 20
+    Steel: 160
+    Plastic: 240
+    Glass: 160
 
 - type: latheRecipe
-  id: ShellKS23Beanbag
-  result: ShellKS23Beanbag
+  id: BoxBeanbagKS23
+  result: BoxBeanbagKS23
   category: Ammo
-  completetime: 1
+  completetime: 3
   materials:
-    Steel: 30
-    Plastic: 20
+    Steel: 240
+    Plastic: 160
 
 - type: latheRecipe
-  id: ShellKS23Base
-  result: ShellKS23Base
+  id: BoxLethalshotKS23
+  result: BoxLethalshotKS23
   category: Ammo
-  completetime: 1
+  completetime: 3
   materials:
-    Steel: 20
-    Plastic: 10
+    Steel: 160

Resources/Prototypes/Entities/Structures/Machines/lathe.yml

@@ -457,10 +457,10 @@
       - WeaponXrayCannon # Frontier
       - SpeedLoaderRifleHeavyIncendiary # Frontier
       - SpeedLoaderRifleHeavyUranium # Frontier
-      - ShellKS23Smoke # Corvax-Frontier
-      - ShellKS23Flashbang # Corvax-Frontier
-      - ShellKS23Beanbag # Corvax-Frontier
-      - ShellKS23Base #  Corvax-Frontier
+      - BoxSmokeKS23 # Corvax-Frontier
+      - BoxFlashbangKS23 # Corvax-Frontier
+      - BoxBeanbagKS23 # Corvax-Frontier
+      - BoxLethalshotKS23 #  Corvax-Frontier
       - MagazineBoxVector22Incendiary #Corvax-Frontier
       - MagazineBoxVector22Uranium #Corvax-Frontier
       - MagazineVector22Incendiary #Corvax-Frontier
@@ -873,8 +873,8 @@
       - MagazineVector45Empty
       - MagazineVector22
       - MagazineVector22Empty
-      - ShellKS23Beanbag # Corvax-Frontier
-      - ShellKS23Base # Corvax-Frontier
+      - BoxBeanbagKS23 # Corvax-Frontier
+      - BoxLethalshotKS23 # Corvax-Frontier
       - ClothingOuterHardsuitSecurity
       - ClothingOuterHardsuitWarden
       - ClothingOuterHardsuitBrigmedic
@@ -964,8 +964,8 @@
       - ShuttleSmgRifleAmmoBox
       - ShuttleRifleAmmoBox
       - ShuttleMagnumRifleAmmoBox
-      - ShellKS23Smoke #  Corvax-Frontier
-      - ShellKS23Flashbang # Corvax-Frontier
+      - BoxSmokeKS23 #  Corvax-Frontier
+      - BoxFlashbangKS23 # Corvax-Frontier
       #Corvax-Frontier End
   - type: MaterialStorage
     whitelist:
@@ -1020,8 +1020,8 @@
         - SpeedLoaderMagnumEmpty
         - SpeedLoaderRifleHeavy # Frontier
         - SpeedLoaderRifleHeavyEmpty # Frontier
-        - ShellKS23Beanbag # Corvax-Frontier
-        - ShellKS23Base # Corvax-Frontier
+        - BoxBeanbagKS23 # Corvax-Frontier
+        - BoxLethalshotKS23 # Corvax-Frontier
         - 10roundmagazine #frontier by VividPups
         - 10roundmagazineempty #frontier by VividPups
         - MagazineBoxVector45 #CorvaxFrontier

Resources/Prototypes/Research/arsenal.yml

@@ -74,8 +74,8 @@
   - MagazineBoxMagnumRubber # Frontier
   - MagazineBoxPistolRubber # Frontier
   - MagazineBoxRifleRubber # Frontier 
-  - ShellKS23Smoke # Corvax-Frontier
-  - ShellKS23Flashbang # Corvax-Frontier
+  - BoxSmokeKS23 # Corvax-Frontier
+  - BoxFlashbangKS23 # Corvax-Frontier
   - MagazineBoxVector22Practice #CorvaxFrontier
   - MagazineVector22Practice #CorvaxFrontier
   - MagazineBoxVector45Practice #CorvaxFrontier

Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml

@@ -413,8 +413,8 @@
       - MagazineBoxLightRifle
       - MagazineBoxPistol
       - MagazineBoxRifle
-      - ShellKS23Beanbag # Corvax-Frontier
-      - ShellKS23Base # Corvax-Frontier
+      - BoxBeanbagKS23 # Corvax-Frontier
+      - BoxLethalshotKS23 # Corvax-Frontier
       - CrossbowBolt
       - CrossbowBoltBroadhead
     ## Mags / Speedloaders / Clips
@@ -508,8 +508,8 @@
       - MagazineBoxPistolRubber
       - MagazineBoxRifleRubber
       - MagazineShotgunBeanbag
-      - ShellKS23Smoke # Corvax-Frontier
-      - ShellKS23Flashbang # Corvax-Frontier
+      - BoxSmokeKS23 # Corvax-Frontier
+      - BoxFlashbangKS23 # Corvax-Frontier
 
 - type: entity
   id: MercenaryTechFabHacked

Resources/Textures/Corvax/Objects/Storage/boxes.rsi/meta.json

@@ -0,0 +1,23 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by Terka120",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "KS23BaseDispenser"
+    },
+    {
+      "name": "KS23BeanbagDispenser"
+    },
+    {
+      "name": "KS23FlashbangDispenser"
+    },
+    {
+      "name": "KS23SmokeDispenser"
+    }
+  ]
+}

Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Casings/ks23_shell.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Created by FireFoxPhoenix",
+  "copyright": "Created by Terka120",
   "size": {
     "x": 32,
     "y": 32