diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index 076966619f..32fbb11bbe 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -141,7 +141,7 @@ uplink-ammo-bundle-name = Ammo Bundle uplink-ammo-bundle-desc = Reloading! Contains 4 magazines for the C-20r, 4 drums for the Bulldog, and 2 ammo boxes for the L6 SAW. uplink-sniper-bundle-name = Sniper Bundle -uplink-sniper-bundle-desc = An inconspicuous briefcase that contains a hristov, 30 spare bullets and a convenient disguise +uplink-sniper-bundle-desc = An inconspicuous briefcase that contains a hristov, 10 spare bullets and a convenient disguise uplink-c20r-bundle-name = C-20r Bundle uplink-c20r-bundle-desc = Old faithful: The classic C-20r Submachine Gun, bundled with three magazines. diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 40801848b6..d40abaccf5 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -589,7 +589,7 @@ icon: { sprite: /Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi, state: base } productEntity: BriefcaseSyndieSniperBundleFilled cost: - Telecrystal: 6 + Telecrystal: 12 categories: - UplinkBundles diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml index aa07a756d8..c7980f845f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml @@ -1,25 +1,60 @@ - type: entity + abstract: true parent: BaseItem - id: MagazineBoxAntiMateriel + id: BaseMagazineBoxAntiMateriel name: ammunition box (.60 anti-materiel) components: - type: BallisticAmmoProvider mayTransfer: true - capacity: 30 + whitelist: + tags: + - CartridgeAntiMateriel proto: CartridgeAntiMateriel + capacity: 10 + - type: Item + size: 5 + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container - type: Sprite sprite: Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.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 - - type: ContainerContainer - containers: - ballistic-ammo: !type:Container - ents: [] + +# Boxes +- type: entity + parent: BaseMagazineBoxAntiMateriel + id: MagazineBoxAntiMaterielBig + name: ammunition box (.60 anti-materiel) + components: + - type: BallisticAmmoProvider + capacity: 30 + proto: CartridgeAntiMateriel + - type: Sprite + layers: + - state: base-b + map: ["enum.GunVisualLayers.Base"] + - state: magb-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: magb + steps: 2 + zeroVisible: false + - type: Appearance + +- type: entity + parent: BaseMagazineBoxAntiMateriel + id: MagazineBoxAntiMateriel + name: ammunition box (.60 anti-materiel) + components: + - type: BallisticAmmoProvider + proto: CartridgeAntiMateriel + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/base-b.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/base-b.png new file mode 100644 index 0000000000..1bc6823aba Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/base-b.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/base.png index 1bc6823aba..225ec31758 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/mag-1.png index 3ff1180051..a8052fc9ad 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/magb-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/magb-1.png new file mode 100644 index 0000000000..3ff1180051 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/magb-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/meta.json index 3a7a5a89c9..190fa5a6dc 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/meta.json @@ -10,8 +10,14 @@ { "name": "base" }, + { + "name": "base-b" + }, { "name": "mag-1" + }, + { + "name": "magb-1" } ] }