XL-магазины на бульдог (#3780)

Resources/Locale/en-US/_prototypes/_sunrise/catalog/fills/boxes/syndicate.ftl

@@ -14,6 +14,10 @@ ent-DragunovAmmoKit = Dragunov ammo kit
     .desc = { ent-BoxCardboard.desc }
 ent-ShotGunKit = Bulldog ammo kit
     .desc = { ent-BoxCardboard.desc }
+ent-ShotGunKitSmall = ammo drum kit
+    .desc = { ent-BoxCardboard.desc }
+ent-ShotGunKitLarge = XL ammo kit
+    .desc = { ent-BoxCardboard.desc }
 ent-MMGKit = DL6902 ammo kit
     .desc = { ent-BoxCardboard.desc }
 ent-LMGKit = L6 Saw ammo kit
@@ -36,6 +40,8 @@ ent-CyberArmMechwrightBox = Cyber-Arm "Mechwright" box
     .desc = { ent-CyberArmAtmosBox.desc }
 ent-CyberArmThrowerBox = Cyber-Arm "Thrower" box
     .desc = { ent-CyberArmAtmosBox.desc }
+ent-SyndicateRapierToxinBox = syndicate rapier kit
+    .desc = Contains a wrapped syndicate rapier and a random toxin bottle. Packaging disintegrates when opened, leaving no evidence behind.
 ent-MantisBladeArmsKit = suspicious box
     .desc = { ent-BoxCardboard.desc }
 ent-SMGIncendiaryAmmoKit = C20r Incendiary ammo kit

Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/shotgun.ftl

@@ -2,7 +2,23 @@ ent-BaseMagazineAsh12 = ash-12 magazine (.50 slug)
     .desc = { ent-BaseItem.desc }
 ent-MagazineAsh12Slug = { ent-BaseMagazineAsh12 }
     .desc = { ent-BaseMagazineAsh12.desc }
+ent-MagazineAsh12Beanbag = ash-12 magazine beanbag
+    .desc = { ent-BaseMagazineAsh12.desc }
+ent-MagazineAsh12Flare = ash-12 magazine flare
+    .desc = { ent-BaseMagazineAsh12.desc }
+ent-BaseMagazineShotgunXL = XL ammo drum (.50 shells)
+    .desc = { ent-BaseItem.desc }
 ent-MagazineShotgunUranium = ammo drum (.50 Uranium)
     .desc = { ent-BaseMagazineShotgun.desc }
 ent-MagazineShotgunBreach = ammo drum (.50 Breach)
     .desc = { ent-BaseMagazineShotgun.desc }
+ent-MagazineShotgunFlechette = ammo drum (.50 flechette)
+    .desc = { ent-BaseMagazineShotgun.desc }
+ent-MagazineShotgunFlechetteXL = XL ammo drum (.50 flechette)
+    .desc = An extra-large drum magazine used by some military-grade automatic shotguns to fire flechette loads.
+ent-MagazineShotgunIncendiaryXL = XL ammo drum (.50 incendiary)
+    .desc = An extra-large drum magazine used by some military-grade automatic shotguns. Intended to hold self-igniting incendiary ammunition.
+ent-MagazineShotgunXL = XL ammo drum (.50 pellet)
+    .desc = An extra-large drum magazine used by some military-grade automatic shotguns. Intended to hold general-purpose kinetic ammunition.
+ent-MagazineShotgunSlugXL = XL ammo drum (.50 slug)
+    .desc = An extra-large drum magazine used by some military-grade automatic shotguns. Intended to hold long-ranged slug ammunition.

Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/boxes/syndicate.ftl

@@ -1,4 +1,4 @@
-ent-ExpCollarsKit = Коробка с взрывными ошейниками
+ent-ExpCollarsKit = Коробка с взрывными ошейниками
     .desc = Ужасающе
 ent-BaseSyndicateAmmoKit = Коробка с боеприпасами Синдиката
     .desc = { ent-BoxCardboard.desc }
@@ -10,6 +10,10 @@ ent-CaselessAmmoKit = Коробка с магазинами для Siar-52
     .desc = Содержит 3 расширенных магазина и 3 базовых магазина для Siar-52
 ent-ShotGunKit = Коробка с магазинами для Бульдога
     .desc = Перезаряжаю! Содержит 5 магазинов дроби и 3 магазина пуля для Bulldog
+ent-ShotGunKitSmall = Коробка с барабанами для дробовика
+    .desc = { ent-BoxCardboard.desc }
+ent-ShotGunKitLarge = Коробка с XL-магазинами для дробовика
+    .desc = { ent-BoxCardboard.desc }
 ent-LMGKit = Коробка с коробами для L6 SAW
     .desc = Перезаряжаю! Содержит 3 магазина для L6 Saw
 ent-AntimaterialAmmoKit = Коробка с антиматериальными магазинами
@@ -30,6 +34,8 @@ ent-CyberArmMechwrightBox = Коробка с кибер-рукой "Mechwright"
     .desc = { ent-CyberArmAtmosBox.desc }
 ent-CyberArmThrowerBox = Коробка с кибер-рукой "Thrower"
     .desc = { ent-CyberArmAtmosBox.desc }
+ent-SyndicateRapierToxinBox = Набор синдикатской рапиры с токсином
+    .desc = Содержит завернутую синдикатскую рапиру и случайный флакон токсина. Упаковка распадается при вскрытии, не оставляя улик.
 ent-MantisBladeArmsKit = Подозрительная коробка
     .desc = { ent-BoxCardboard.desc }
 ent-SMGIncendiaryAmmoKit = Коробка с зажигательными магазинами ПП (.35 Авто)
@@ -54,3 +60,4 @@ ent-DragunovAmmoKit = Коробка с магазинами для Драгун
     .desc = Перезаряжаю! Содержит 5 магазинов для Драгунова и коробку FMJ патронов к ним
 ent-RifleAmmoKit = Коробка с магазинами для Эсток
     .desc = Перезаряжаю! Содержит 6 магазинов, 3 SP, 2 FMJ и 1 AP
+

Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/shotgun.ftl

@@ -14,3 +14,13 @@ ent-MagazineShotgunBreach = барабан пробивных 12 калибра
 ent-MagazineShotgunFlechette = барабан флешетты 12 калибра
     .desc = { ent-BaseMagazineShotgun.desc }
 
+ent-BaseMagazineShotgunXL = XL барабан 12 калибра
+    .desc = { ent-BaseItem.desc }
+ent-MagazineShotgunFlechetteXL = XL барабан флешетты 12 калибра
+    .desc = { ent-BaseMagazineShotgunXL.desc }
+ent-MagazineShotgunIncendiaryXL = XL барабан зажигательных 12 калибра
+    .desc = { ent-BaseMagazineShotgunXL.desc }
+ent-MagazineShotgunXL = XL барабан дроби 12 калибра
+    .desc = { ent-BaseMagazineShotgunXL.desc }
+ent-MagazineShotgunSlugXL = XL барабан пуль 12 калибра
+    .desc = { ent-BaseMagazineShotgunXL.desc }

Resources/Locale/ru-RU/_strings/_sunrise/store/uplink-catalog.ftl

@@ -197,8 +197,9 @@ uplink-ammo-smgincendiarykit-name = Набор зажигательных маг
 uplink-ammo-smgincendiarykit-desc = Перезаряжаю! Содержит 8 зажигательных магазина для C-20r.
 uplink-ammo-smguraniumkit-name = Набор урановых магазинов для C-20r
 uplink-ammo-smguraniumkit-desc = Перезаряжаю! Содержит 8 урановых магазина для C-20r.
-uplink-ammo-shotgunkit-name = Набор магазинов для дробовика
-uplink-ammo-shotgunkit-desc = Перезаряжаю! Содержит 5 магазина дроби and 3 магазина пуля для Bulldog.
+uplink-ammo-shotgunkit-name = Набор барабанов 12 калибра
+uplink-ammo-shotgunkit-desc =  Выгодный набор, когда нужно совершать военные преступления в промышленных масштабах. Содержит 2 барабана дроби, 2 магазина с пулями и по одному магазину с флешеттами и зажигательными 12 калибра.
+uplink-ammo-shotgunkit-xl-desc = Большие барабаны для лучших ударников команды. В наборе есть дробовые, флешетты, пули и зажигательные 12 калибра. В каждом барабане по 16 патронов, всего их четыре.
 uplink-ammo-shotgunincendiarykit-name = Набор зажигательных магазинов для дробовика
 uplink-ammo-shotgunincendiarykit-desc = Перезаряжаю! Содержит 8 зажигательные магазины для Bulldog.
 uplink-ammo-shotgunuraniumkit-name = Набор урановых магазинов для дробовика

Resources/Prototypes/Catalog/uplink_catalog.yml

@@ -194,7 +194,7 @@
       tags:
       - AssaultOpsUplink
       - NukeOpsUplink
-      - LoneOpsUplink
+      - LoneOpsUplink # Sunrise-Edit
   #Sunrise-end
 
 - type: listing
@@ -1285,6 +1285,7 @@
     whitelist:
       tags:
       - NukeOpsUplink
+      - LoneOpsUplink
 
 - type: listing
   id: UplinkSurplusBundle
@@ -1416,7 +1417,6 @@
       blacklist:
         tags:
           - NukeOpsUplink
-          - LoneOpsUplink # Sunrise-Edit
           - AssaultOpsUplink # Sunrise-Edit
 
 - type: listing
@@ -1434,6 +1434,7 @@
     whitelist:
       tags:
       - NukeOpsUplink
+      - LoneOpsUplink # Sunrise-Edit
 
 # Move to _Sunrise
 #- type: listing

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

@@ -198,7 +198,7 @@
     slots:
       gun_magazine:
         name: Magazine
-        startingItem: MagazineShotgun
+        startingItem: MagazineShotgunXL
         priority: 2
         whitelist:
           tags:

Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/duffelbag.yml

@@ -424,10 +424,8 @@
       storagebase: !type:AllSelector
         children:
         - id: WeaponShotgunMinotaurBiocode
-        - id: MagazineShotgun
-        - id: MagazineShotgun
-        - id: MagazineShotgun
-        - id: MagazineShotgun
+        - id: MagazineShotgunXL
+        - id: MagazineShotgunBreach
 
 - type: entity
   parent: ClothingBackpackDuffelSyndicateBundle

Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/syndicate.yml

@@ -167,7 +167,7 @@
     - state: smg_base
 
 - type: entity
-  parent: BaseSyndicateAmmoKit
+  parent: BaseSyndicateAmmoKitSmall
   id: SMGIncendiaryAmmoKit
   name: C20r Incendiary ammo kit
   components:
@@ -176,7 +176,7 @@
       storagebase: !type:AllSelector
         children:
         - id: MagazinePistolSubMachineGunIncendiary
-          amount: 8
+          amount: 6
   - type: Sprite
     layers:
     - state: box_of_doom_big
@@ -200,6 +200,44 @@
     - state: box_of_doom_big
     - state: shotgun_base
 
+- type: entity
+  parent: BaseSyndicateAmmoKitSmall
+  id: ShotGunKitSmall
+  name: ammo drum kit
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      storagebase: !type:AllSelector
+        children:
+        - id: MagazineShotgun
+          amount: 2
+        - id: MagazineShotgunSlug
+          amount: 2
+        - id: MagazineShotgunIncendiary
+        - id: MagazineShotgunFlechette
+  - type: Sprite
+    layers:
+    - state: box_of_doom_big
+    - state: shotgun_base
+
+- type: entity
+  parent: BaseSyndicateAmmoKit
+  id: ShotGunKitLarge
+  name: XL ammo kit
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      storagebase: !type:AllSelector
+        children:
+        - id: MagazineShotgunXL
+        - id: MagazineShotgunFlechetteXL
+        - id: MagazineShotgunSlugXL
+        - id: MagazineShotgunIncendiaryXL
+  - type: Sprite
+    layers:
+    - state: box_of_doom_big
+    - state: shotgun_xl_big
+
 - type: entity
   parent: BaseSyndicateAmmoKit
   id: MMGKit

Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml

@@ -733,6 +733,44 @@
   categories:
   - UplinkAmmo
 
+- type: listing
+  id: UplinkShotGunKitSmall
+  name: uplink-ammo-shotgunkit-name
+  description: uplink-ammo-shotgunkit-desc
+  productEntity: ShotGunKitSmall
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 5
+  cost:
+    Telecrystal: 9
+  categories:
+  - UplinkAmmo
+  conditions:
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - NukeOpsUplink
+      - LoneOpsUplink
+
+- type: listing
+  id: UplinkShotGunKitLarge
+  description: uplink-ammo-shotgunkit-xl-desc
+  icon: { sprite: /Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m16.rsi, state: base }
+  productEntity: ShotGunKitLarge
+  discountCategory: rareDiscounts
+  discountDownTo:
+    Telecrystal: 8
+  cost:
+    Telecrystal: 12
+  categories:
+  - UplinkAmmo
+  conditions:
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - NukeOpsUplink
+      - LoneOpsUplink
+
 - type: listing
   id: UplinkBoomboxBundle
   name: uplink-music-boombox-name
@@ -2278,6 +2316,7 @@
     whitelist:
       tags:
       - NukeOpsUplink
+      - LoneOpsUplink
 
 - type: listing
   id: uplinkWeaponPistolDeagle

Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml

@@ -1,3 +1,51 @@
+# region Base
+- type: entity
+  abstract: true
+  parent: [ BaseItem, BaseSecurityContraband ]
+  id: BaseMagazineShotgunXL
+  name: XL ammo drum (.50 shells)
+  components:
+  - type: Tag
+    tags:
+    - MagazineShotgun
+  - type: BallisticAmmoProvider
+    mayTransfer: true
+    whitelist:
+      tags:
+        - ShellShotgun
+    capacity: 16
+    soundRack:
+      path: /Audio/Weapons/Guns/Cock/smg_cock.ogg
+  - type: Item
+    shape:
+    - 0,0,1,1
+    size: Small
+    inhandVisuals:
+      left:
+      - state: inhand-left-mag
+      - state: inhand-left-stripe
+        color: "#d73307"
+      right:
+      - state: inhand-right-mag
+      - state: inhand-right-stripe
+        color: "#d73307"
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+  - type: Sprite
+    scale: 1.1,1.1
+    sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m16.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: MagazineVisuals
+    magState: mag
+    steps: 17
+    zeroVisible: false
+  - type: Appearance
+
 - type: entity
   id: BaseMagazineAsh12
   name: "ash-12 magazine(.50 slug)"
@@ -151,3 +199,103 @@
       - state: inhand-right-mag
       - state: inhand-right-stripe
         color: "#40F57A"
+
+# region XL drummag
+- type: entity
+  parent: BaseMagazineShotgunXL
+  id: MagazineShotgunFlechetteXL
+  name: XL ammo drum (.50 flechette)
+  components:
+  - type: BallisticAmmoProvider
+    proto: ShellShotgunFlechette
+  - type: Sprite
+    layers:
+    - state: flechette
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-mag
+      - state: inhand-left-stripe
+        color: "#5da0b5"
+      right:
+      - state: inhand-right-mag
+      - state: inhand-right-stripe
+        color: "#5da0b5"
+
+- type: entity
+  parent: BaseMagazineShotgunXL
+  id: MagazineShotgunIncendiaryXL
+  name: XL ammo drum (.50 incendiary)
+  description: A extra-large drum magazine used by some military-grade automatic shotguns. Intended to hold self-igniting incendiary ammunition.
+  components:
+  - type: BallisticAmmoProvider
+    proto: ShellShotgunIncendiary
+  - type: Sprite
+    layers:
+    - state: flame
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-mag
+      - state: inhand-left-stripe
+        color: "#72382d"
+      right:
+      - state: inhand-right-mag
+      - state: inhand-right-stripe
+        color: "#72382d"
+
+- type: entity
+  parent: BaseMagazineShotgunXL
+  id: MagazineShotgunXL
+  name: XL ammo drum (.50 pellet)
+  description: A extra-large  drum magazine used by some military-grade automatic shotguns. Intended to hold general-purpose kinetic ammunition.
+  components:
+  - type: BallisticAmmoProvider
+    proto: ShellShotgun
+  - type: Sprite
+    layers:
+    - state: pellets
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-mag
+      - state: inhand-left-stripe
+        color: "#ba7710"
+      right:
+      - state: inhand-right-mag
+      - state: inhand-right-stripe
+        color: "#ba7710"
+
+- type: entity
+  parent: BaseMagazineShotgunXL
+  id: MagazineShotgunSlugXL
+  name: XL ammo drum (.50 slug)
+  description: A extra-large  drum magazine used by some military-grade automatic shotguns. Intended to hold long-ranged slug ammunition.
+  components:
+  - type: BallisticAmmoProvider
+    proto: ShellShotgunSlug
+  - type: Sprite
+    layers:
+    - state: slug
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-mag
+      - state: inhand-left-stripe
+        color: "#72382d"
+      right:
+      - state: inhand-right-mag
+      - state: inhand-right-stripe
+        color: "#72382d"

Resources/Textures/_Sunrise/Objects/Storage/boxes_sunrise.rsi/meta.json

@@ -103,6 +103,9 @@
         },
         {
             "name": "wide_ert"
+        },
+        {
+            "name": "shotgun_xl_big"
         }
     ]
 }

Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m16.rsi/meta.json

@@ -0,0 +1,90 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi, inhands by TiniestShark (github). resprite to XL and mag state by KaiserMaus for Sunrise",
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "flechette"
+        },
+        {
+            "name": "pellets"
+        },
+        {
+            "name": "slug"
+        },
+        {
+            "name": "flame"
+        },
+        {
+            "name": "mag-1"
+        },
+        {
+            "name": "mag-2"
+        },
+        {
+            "name": "mag-3"
+        },
+        {
+            "name": "mag-4"
+        },
+        {
+            "name": "mag-5"
+        },
+        {
+            "name": "mag-6"
+        },
+        {
+            "name": "mag-7"
+        },
+        {
+            "name": "mag-8"
+        },
+        {
+            "name": "mag-9"
+        },
+        {
+            "name": "mag-10"
+        },
+        {
+            "name": "mag-11"
+        },
+        {
+            "name": "mag-12"
+        },
+        {
+            "name": "mag-13"
+        },
+        {
+            "name": "mag-14"
+        },
+        {
+            "name": "mag-15"
+        },
+        {
+            "name": "mag-16"
+        },
+        {
+            "name": "inhand-left-mag",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-stripe",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-mag",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-stripe",
+            "directions": 4
+        }
+    ]
+}