From 7c55aacf2956658bff626e12d070fc2cb062ce70 Mon Sep 17 00:00:00 2001 From: ASaltySeabass Date: Thu, 7 May 2026 02:57:10 -0400 Subject: [PATCH 1/4] First pass --- .../PowerCell/SharedPowerCellSystem.cs | 14 +- .../Weapons/Guns/Rifles/peregrineShoot.ogg | Bin 15461 -> 0 bytes Resources/Locale/en-US/_HL/recipes/misc.ftl | 2 +- .../Entities/Structures/Power/chargers.yml | 1 - Resources/Prototypes/Research/arsenal.yml | 2 +- .../Weapons/Guns/Ammunition/Boxes/railgun.yml | 45 +++++++ .../Guns/Ammunition/Cartridges/railgun.yml | 45 +++++++ .../Ammunition/Magazines/Railgun/railgun.yml | 94 ++++++++++--- .../Guns/Ammunition/Projectiles/hitscan.yml | 18 --- .../Guns/Ammunition/Projectiles/railgun.yml | 41 ++++++ .../Objects/Weapons/Guns/Specific/railgun.yml | 59 +++++--- .../Crafting/Graphs/improvised_railgun.yml | 37 +++-- .../_HL/Recipes/Crafting/improvised.yml | 12 +- .../Prototypes/_HL/Recipes/Lathes/ammo.yml | 13 +- .../_HL/Recipes/Lathes/security.yml | 26 +++- Resources/Prototypes/_HL/tags.yml | 7 +- .../Projectiles/Effects/muzzleflashes.yml | 18 +++ .../_Mono/Recipes/Lathes/Packs/ammo.yml | 8 +- .../_Mono/Research/Universal/shipgun_ammo.yml | 1 + .../Fills/Items/weapon_cases_expedition.yml | 2 +- .../_NF/Entities/Objects/Storage/pouches.yml | 2 +- .../Ammunition/Boxes/15mm_sabot.rsi/base.png | Bin 0 -> 274 bytes .../Ammunition/Boxes/15mm_sabot.rsi/mag-1.png | Bin 0 -> 544 bytes .../Ammunition/Boxes/15mm_sabot.rsi/mag-2.png | Bin 0 -> 567 bytes .../Ammunition/Boxes/15mm_sabot.rsi/mag-3.png | Bin 0 -> 566 bytes .../Ammunition/Boxes/15mm_sabot.rsi/meta.json | 23 ++++ .../Casings/15mm_casing.rsi/base.png | Bin 0 -> 202 bytes .../Casings/15mm_casing.rsi/improvised.png | Bin 0 -> 200 bytes .../Casings/15mm_casing.rsi/meta.json | 17 +++ .../Peregrine/peregrine_mag.rsi/base.png | Bin 0 -> 287 bytes .../Peregrine/peregrine_mag.rsi/mag-1.png | Bin 0 -> 109 bytes .../Peregrine/peregrine_mag.rsi/mag-2.png | Bin 0 -> 109 bytes .../Peregrine/peregrine_mag.rsi/mag-3.png | Bin 0 -> 109 bytes .../Peregrine/peregrine_mag.rsi/mag-4.png | Bin 0 -> 109 bytes .../Peregrine/peregrine_mag.rsi/mag-5.png | Bin 0 -> 109 bytes .../peregrine_mag.rsi/mag-unshaded-1.png | Bin 0 -> 92 bytes .../peregrine_mag.rsi/mag-unshaded-2.png | Bin 0 -> 96 bytes .../peregrine_mag.rsi/mag-unshaded-3.png | Bin 0 -> 97 bytes .../peregrine_mag.rsi/mag-unshaded-4.png | Bin 0 -> 98 bytes .../peregrine_mag.rsi/mag-unshaded-5.png | Bin 0 -> 99 bytes .../Peregrine/peregrine_mag.rsi/meta.json | 44 ++++++ .../peregrine_mag_improvised.rsi/base.png | Bin 0 -> 252 bytes .../peregrine_mag_improvised.rsi/mag-1.png | Bin 0 -> 109 bytes .../peregrine_mag_improvised.rsi/mag-2.png | Bin 0 -> 146 bytes .../peregrine_mag_improvised.rsi/mag-3.png | Bin 0 -> 168 bytes .../peregrine_mag_improvised.rsi/meta.json | 23 ++++ .../railgun.rsi/impact_railgun.png | Bin 1482 -> 0 bytes .../Guns/Projectiles/railgun.rsi/meta.json | 59 -------- .../railgun.rsi/muzzle_railgun.png | Bin 1194 -> 0 bytes .../Guns/Projectiles/railgun.rsi/railgun.png | Bin 861 -> 0 bytes .../railgunprojectiles.rsi/dart.png | Bin 0 -> 675 bytes .../railgunprojectiles.rsi/meta.json | 14 ++ .../Guns/Rifles/peregrine.rsi/base.png | Bin 903 -> 591 bytes .../Guns/Rifles/peregrine.rsi/bolt-open.png | Bin 873 -> 0 bytes .../peregrine.rsi/equipped-BACKPACK.png | Bin 1209 -> 1096 bytes .../peregrine.rsi/equipped-SUITSTORAGE.png | Bin 1209 -> 1096 bytes .../Guns/Rifles/peregrine.rsi/icon.png | Bin 963 -> 609 bytes .../Guns/Rifles/peregrine.rsi/inhand-left.png | Bin 915 -> 730 bytes .../Rifles/peregrine.rsi/inhand-right.png | Bin 861 -> 715 bytes .../Guns/Rifles/peregrine.rsi/mag-0.png | Bin 309 -> 144 bytes .../Guns/Rifles/peregrine.rsi/mag-1.png | Bin 0 -> 144 bytes .../Guns/Rifles/peregrine.rsi/mag-2.png | Bin 0 -> 144 bytes .../Guns/Rifles/peregrine.rsi/mag-3.png | Bin 0 -> 144 bytes .../Guns/Rifles/peregrine.rsi/mag-4.png | Bin 0 -> 144 bytes .../Guns/Rifles/peregrine.rsi/mag-5.png | Bin 0 -> 144 bytes .../Rifles/peregrine.rsi/mag-unshaded-0.png | Bin 0 -> 133 bytes .../Rifles/peregrine.rsi/mag-unshaded-1.png | Bin 0 -> 138 bytes .../Rifles/peregrine.rsi/mag-unshaded-2.png | Bin 0 -> 141 bytes .../Rifles/peregrine.rsi/mag-unshaded-3.png | Bin 0 -> 141 bytes .../Rifles/peregrine.rsi/mag-unshaded-4.png | Bin 0 -> 140 bytes .../Rifles/peregrine.rsi/mag-unshaded-5.png | Bin 0 -> 141 bytes .../Guns/Rifles/peregrine.rsi/meta.json | 126 +++++++++++------- .../peregrine.rsi/wielded-inhand-left.png | Bin 810 -> 622 bytes .../peregrine.rsi/wielded-inhand-right.png | Bin 759 -> 564 bytes 74 files changed, 559 insertions(+), 194 deletions(-) delete mode 100644 Resources/Audio/_HL/Weapons/Guns/Rifles/peregrineShoot.ogg create mode 100644 Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Ammunition/Boxes/railgun.yml create mode 100644 Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/railgun.yml delete mode 100644 Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/hitscan.yml create mode 100644 Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/railgun.yml create mode 100644 Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Guns/Projectiles/Effects/muzzleflashes.yml create mode 100644 Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Boxes/15mm_sabot.rsi/base.png create mode 100644 Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Boxes/15mm_sabot.rsi/mag-1.png create mode 100644 Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Boxes/15mm_sabot.rsi/mag-2.png create mode 100644 Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Boxes/15mm_sabot.rsi/mag-3.png create mode 100644 Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Boxes/15mm_sabot.rsi/meta.json create mode 100644 Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Casings/15mm_casing.rsi/base.png create mode 100644 Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Casings/15mm_casing.rsi/improvised.png create mode 100644 Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Casings/15mm_casing.rsi/meta.json create mode 100644 Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag.rsi/base.png create mode 100644 Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag.rsi/mag-1.png create mode 100644 Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag.rsi/mag-2.png create mode 100644 Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag.rsi/mag-3.png create mode 100644 Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag.rsi/mag-4.png create mode 100644 Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag.rsi/mag-5.png create mode 100644 Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag.rsi/mag-unshaded-1.png create mode 100644 Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag.rsi/mag-unshaded-2.png create mode 100644 Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag.rsi/mag-unshaded-3.png create mode 100644 Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag.rsi/mag-unshaded-4.png create mode 100644 Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag.rsi/mag-unshaded-5.png create mode 100644 Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag.rsi/meta.json create mode 100644 Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag_improvised.rsi/base.png create mode 100644 Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag_improvised.rsi/mag-1.png create mode 100644 Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag_improvised.rsi/mag-2.png create mode 100644 Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag_improvised.rsi/mag-3.png create mode 100644 Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag_improvised.rsi/meta.json delete mode 100644 Resources/Textures/_HL/Objects/Weapons/Guns/Projectiles/railgun.rsi/impact_railgun.png delete mode 100644 Resources/Textures/_HL/Objects/Weapons/Guns/Projectiles/railgun.rsi/meta.json delete mode 100644 Resources/Textures/_HL/Objects/Weapons/Guns/Projectiles/railgun.rsi/muzzle_railgun.png delete mode 100644 Resources/Textures/_HL/Objects/Weapons/Guns/Projectiles/railgun.rsi/railgun.png create mode 100644 Resources/Textures/_HL/Objects/Weapons/Guns/Projectiles/railgunprojectiles.rsi/dart.png create mode 100644 Resources/Textures/_HL/Objects/Weapons/Guns/Projectiles/railgunprojectiles.rsi/meta.json delete mode 100644 Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/bolt-open.png create mode 100644 Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/mag-1.png create mode 100644 Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/mag-2.png create mode 100644 Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/mag-3.png create mode 100644 Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/mag-4.png create mode 100644 Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/mag-5.png create mode 100644 Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/mag-unshaded-0.png create mode 100644 Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/mag-unshaded-1.png create mode 100644 Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/mag-unshaded-2.png create mode 100644 Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/mag-unshaded-3.png create mode 100644 Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/mag-unshaded-4.png create mode 100644 Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/mag-unshaded-5.png diff --git a/Content.Shared/PowerCell/SharedPowerCellSystem.cs b/Content.Shared/PowerCell/SharedPowerCellSystem.cs index 025922c322a..f79c2354a10 100644 --- a/Content.Shared/PowerCell/SharedPowerCellSystem.cs +++ b/Content.Shared/PowerCell/SharedPowerCellSystem.cs @@ -57,13 +57,13 @@ private void OnCellInsertAttempt(EntityUid uid, PowerCellSlotComponent component } // Special-case the NT-88 Peregrine magazine so it cannot be treated as a generic power cell. - var magazineRailgunTag = "MagazineRailgunTag"; - if (_tag.HasTag(args.EntityUid, magazineRailgunTag) && - (!_itemSlots.TryGetSlot(uid, component.CellSlotId, out var itemSlot) || - !_whitelist.IsWhitelistPass(itemSlot.Whitelist, args.EntityUid))) - { - args.Cancel(); - } +// var magazineRailgunTag = "MagazineRailgunTag"; +// if (_tag.HasTag(args.EntityUid, magazineRailgunTag) && +// (!_itemSlots.TryGetSlot(uid, component.CellSlotId, out var itemSlot) || +// !_whitelist.IsWhitelistPass(itemSlot.Whitelist, args.EntityUid))) +// { +// args.Cancel(); +// } } private void OnCellInserted(EntityUid uid, PowerCellSlotComponent component, EntInsertedIntoContainerMessage args) diff --git a/Resources/Audio/_HL/Weapons/Guns/Rifles/peregrineShoot.ogg b/Resources/Audio/_HL/Weapons/Guns/Rifles/peregrineShoot.ogg deleted file mode 100644 index 920ceca65e6241d40dbf1570e8ab2f71035b6697..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15461 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 SEF~K&vR_wLdUj|Y;{Ff9z6h=W diff --git a/Resources/Locale/en-US/_HL/recipes/misc.ftl b/Resources/Locale/en-US/_HL/recipes/misc.ftl index 2504f0dcd68..fdd1eae525b 100644 --- a/Resources/Locale/en-US/_HL/recipes/misc.ftl +++ b/Resources/Locale/en-US/_HL/recipes/misc.ftl @@ -1,5 +1,5 @@ # Random Hardlight additions that done need localizin' -improvised-railgun-mag-desc = Making a railgun takes a research team five years and multiple doctorates. Making the ammunition for one, on the other hand, takes a minute or two. +improvised-railgun-sabot-desc = A hastily constructed sabot for use with the NT-88 Peregrine that is little more than a rod encased in plasteel. construction-graph-component-gaslock-circuit-board = a portable gaslock circuit board storage-port-construction-desc = A gas storage port, holds gas canisters without leaking gas! improvised-scrap-ring-lv-desc = a ring made out of welded LV cable diff --git a/Resources/Prototypes/Entities/Structures/Power/chargers.yml b/Resources/Prototypes/Entities/Structures/Power/chargers.yml index c6433f2f95c..b72d27299aa 100644 --- a/Resources/Prototypes/Entities/Structures/Power/chargers.yml +++ b/Resources/Prototypes/Entities/Structures/Power/chargers.yml @@ -141,7 +141,6 @@ whitelist: tags: - PowerCage - - MagazineRailgunTag - type: Machine board: PowerCageRechargerCircuitboard - type: StaticPrice diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 53f400d2da6..8fedbf261c9 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -226,7 +226,7 @@ - 40mmGrenadeThermobaric - 40mmGrenadeEMP #Frontier - PowerCageHigh #frontier - - MagRailgun # HL + - MagazineRailgunPeregrine # HL # - ShuttleGunSvalinnMachineGunCircuitboard # Frontier # - ShuttleGunPerforatorCircuitboard # Frontier # - ShuttleGunFriendshipCircuitboard # Frontier diff --git a/Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Ammunition/Boxes/railgun.yml b/Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Ammunition/Boxes/railgun.yml new file mode 100644 index 00000000000..f34d69a7581 --- /dev/null +++ b/Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Ammunition/Boxes/railgun.yml @@ -0,0 +1,45 @@ +- type: entity + abstract: true + parent: [BaseItem, RecyclableItemCardboard] + id: BaseAmmoBox15mmSabot + components: + - type: BallisticAmmoProvider + mayTransfer: true + whitelist: + tags: + - Cartridge15mmSabot + proto: Cartridge15mmSabot + capacity: 15 + - type: Item + size: Normal + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + sprite: _HL/Objects/Weapons/Guns/Ammunition/Boxes/15mm_sabot.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 4 + zeroVisible: false + - type: Appearance + +- type: entity + parent: BaseAmmoBox15mmSabot + id: AmmoBox15mmSabot + name: ammunition box (15mm Sabot) + components: + - type: BallisticAmmoProvider + capacity: 15 + proto: Cartridge15mmSabot + - type: Sprite + sprite: _HL/Objects/Weapons/Guns/Ammunition/Boxes/15mm_sabot.rsi + - type: MagazineVisuals + magState: mag + steps: 4 + zeroVisible: false + - type: Appearance diff --git a/Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/railgun.yml b/Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/railgun.yml new file mode 100644 index 00000000000..bf8ae9741a0 --- /dev/null +++ b/Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/railgun.yml @@ -0,0 +1,45 @@ +- type: entity + id: BaseCartridge15mmSabot + name: sabot (15mm) + parent: [BaseCartridge, BaseC3ContrabandNoValue] + abstract: true + components: + - type: Tag + tags: + - Cartridge + - Cartridge15mmSabot + - type: CartridgeAmmo + proto: Bullet15mmSabot + muzzleFlash: MuzzleFlashEffectEnergyStun + deleteOnSpawn: true + - type: Sprite + sprite: _HL/Objects/Weapons/Guns/Ammunition/Casings/15mm_casing.rsi + layers: + - state: base + map: ["enum.AmmoVisualLayers.Base"] + - type: StaticPrice + price: 20 + +- type: entity + id: Cartridge15mmSabot + name: sabot (15mm) + parent: BaseCartridge15mmSabot + components: + - type: CartridgeAmmo + proto: Bullet15mmSabot + +- type: entity + id: Cartridge15mmSabotImprovised + name: improvised sabot (15mm) + parent: BaseCartridge15mmSabot + components: + - type: CartridgeAmmo + proto: Bullet15mmSabotImprovised + - type: Sprite + sprite: _HL/Objects/Weapons/Guns/Ammunition/Casings/15mm_casing.rsi + layers: + - state: improvised + map: ["enum.AmmoVisualLayers.Base"] + - type: Construction + graph: SabotRailgunImprovisedCraftingGraph + node: sabot diff --git a/Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Ammunition/Magazines/Railgun/railgun.yml b/Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Ammunition/Magazines/Railgun/railgun.yml index d8849da601e..10828d959e2 100644 --- a/Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Ammunition/Magazines/Railgun/railgun.yml +++ b/Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Ammunition/Magazines/Railgun/railgun.yml @@ -1,36 +1,90 @@ -# Empty mags - type: entity - parent: BasePowerCell - id: MagazineRailgun - name: Peregrine Magazine - description: A magazine built to fuel the NT-88 Peregrine. The warranty is still in effect. + parent: [BaseItem, BaseC3ContrabandNoValue, RecyclableItemSteelTiny] + id: MagazineRailgunPeregrine + name: peregrine magazine (15mm sabot) + description: A magazine specially designed for the NT-88 Peregrine. Uses 15mm sabot ammo. components: - type: Tag tags: - - MagazineRailgunTag + - MagazineRailgunPeregrine - type: Item size: Small - - type: Battery - maxCharge: 5000 # DV did this I'm doing too monke see monke do - startingCharge: 5000 + - type: BallisticAmmoProvider + mayTransfer: true + whitelist: + tags: + - Cartridge15mmSabot + proto: Cartridge15mmSabot + capacity: 5 + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container - type: Sprite - sprite: _HL/Objects/Weapons/Guns/Ammunition/Magazine/Railgun/railgun_mag.rsi + sprite: _HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag.rsi layers: - - map: ["enum.GunVisualLayers.Base"] - state: base + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - state: mag-unshaded-1 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: MagazineVisuals + magState: mag + steps: 6 + zeroVisible: false + - type: Appearance - type: entity - parent: MagazineRailgun - id: MagazineRailgunImprovised - name: Improvised Peregrine Magazine - description: A magazine cobbled together from found materials. Putting this in your NT-88 Peregrine will void the warranty, but chances are, you're not in a situation to care. + parent: [MagazineRailgunPeregrine] + id: MagazineRailgunPeregrineEmpty + name: peregrine magazine (15mm Sabot) + suffix: empty + components: + - type: BallisticAmmoProvider + proto: null + +- type: entity + parent: MagazineRailgunPeregrine + id: MagazineRailgunPeregrineImprovised + name: improvised peregrine magazine (15mm Sabot) + description: An improvized magazine meant to be used with the NT-88 Peregrine. Uses 15mm sabot ammo. components: - type: Tag tags: - - MagazineRailgunTag + - MagazineRailgunPeregrine + - type: BallisticAmmoProvider + mayTransfer: true + whitelist: + tags: + - Cartridge15mmSabot + proto: Cartridge15mmSabot + capacity: 3 + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + sprite: _HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag_improvised.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 4 + zeroVisible: false + - type: Appearance + +- type: entity + parent: MagazineRailgunPeregrineImprovised + id: MagazineRailgunPeregrineImprovisedEmpty + name: improvised peregrine magazine (15mm sabot) + suffix: empty + components: - type: Construction graph: MagazineRailgunImprovisedCraftingGraph node: mag - - type: Battery - maxCharge: 2500 # way more than a highcap but we'll cross that bridge - startingCharge: 2500 + - type: BallisticAmmoProvider + mayTransfer: true + proto: null diff --git a/Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/hitscan.yml b/Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/hitscan.yml deleted file mode 100644 index 37496778da8..00000000000 --- a/Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/hitscan.yml +++ /dev/null @@ -1,18 +0,0 @@ -- type: hitscan - id: RailgunLaser - damage: - types: - Piercing: 25 - Heat: 5 - Shock: 5 - Structural: 50 - Stamina: 20 - muzzleFlash: - sprite: _HL/Objects/Weapons/Guns/Projectiles/railgun.rsi - state: muzzle_railgun - travelFlash: - sprite: _HL/Objects/Weapons/Guns/Projectiles/railgun.rsi - state: railgun - impactFlash: - sprite: _HL/Objects/Weapons/Guns/Projectiles/railgun.rsi - state: impact_railgun diff --git a/Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/railgun.yml b/Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/railgun.yml new file mode 100644 index 00000000000..c8892a7e33e --- /dev/null +++ b/Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/railgun.yml @@ -0,0 +1,41 @@ +- type: entity + categories: [ HideSpawnMenu ] + parent: BaseBullet + id: Bullet15mmSabot + name: bullet (15mm Sabot) + components: + - type: Projectile + damage: + types: + Piercing: 65 + Structural: 50 + penetrationThreshold: 300 + penetrationDamageTypeRequirement: + - Structural + - type: Sprite + noRot: false + sprite: _HL/Objects/Weapons/Guns/Projectiles/railgunprojectiles.rsi + layers: + - state: dart + shader: unshaded + +- type: entity + categories: [ HideSpawnMenu ] + parent: BaseBullet + id: Bullet15mmSabotImprovised + name: bullet (15mm Sabot) + components: + - type: Projectile + damage: + types: + Piercing: 45 + Structural: 50 + penetrationThreshold: 300 + penetrationDamageTypeRequirement: + - Structural + - type: Sprite + noRot: false + sprite: _HL/Objects/Weapons/Guns/Projectiles/railgunprojectiles.rsi + layers: + - state: dart + shader: unshaded diff --git a/Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Specific/railgun.yml b/Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Specific/railgun.yml index f90c9570ddd..851f7130f13 100644 --- a/Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Specific/railgun.yml +++ b/Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Specific/railgun.yml @@ -1,47 +1,74 @@ - type: entity name: NT-88 Peregrine - parent: [BaseC3ExpeditionContraband , BaseWeaponPowerCell, BaseGunWieldable] + parent: [BaseWeaponRifle, BaseC3ExpeditionContraband] id: WeaponRailgunPeregrine - description: From NanoTrasen Skunkworks. Uses a specific proprietary cartridge, although it may be possible to jury-rig something workable... + description: A miniaturized linear accelerator from NanoTrasen's R&D department. Uses 15mm sabot ammo. components: - type: Item - size: Large - sprite: _HL/Objects/Weapons/Guns/Rifles/peregrine.rsi #floof + size: Huge + sprite: _HL/Objects/Weapons/Guns/Rifles/peregrine.rsi - type: Sprite - sprite: _HL/Objects/Weapons/Guns/Rifles/peregrine.rsi #floof + sprite: _HL/Objects/Weapons/Guns/Rifles/peregrine.rsi layers: - state: base map: ["enum.GunVisualLayers.Base"] - state: mag-0 map: ["enum.GunVisualLayers.Mag"] + - state: mag-unshaded-0 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded - type: Clothing - sprite: _HL/Objects/Weapons/Guns/Rifles/peregrine.rsi #floof + sprite: _HL/Objects/Weapons/Guns/Rifles/peregrine.rsi quickEquip: false slots: - Back - suitStorage - - type: HitscanBatteryAmmoProvider - proto: RailgunLaser - fireCost: 500 - type: Gun - fireRate: 0.8 + fireRate: 0.5 + projectileSpeed: 60 #About as fast as I could make the rounds before things started breaking. selectedMode: SemiAuto availableModes: - SemiAuto soundGunshot: - path: /Audio/_HL/Weapons/Guns/Rifles/peregrineShoot.ogg # Credit: Freesound Community on Pixabay + path: /Audio/Weapons/Guns/Gunshots/laser_cannon2.ogg + - type: ChamberMagazineAmmoProvider + boltClosed: null #The lack of a bolt hold-open is intentional. Subject to change. + soundRack: + path: /Audio/Weapons/Guns/Cock/ltrifle_cock.ogg - type: ItemSlots slots: - cell_slot: - name: power-cell-slot-component-slot-name-default - startingItem: MagazineRailgun + gun_magazine: + name: Magazine + startingItem: MagazineRailgunPeregrine insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg + priority: 2 whitelist: tags: - - MagazineRailgunTag + - MagazineRailgunPeregrine + whitelistFailPopup: gun-magazine-whitelist-fail + gun_chamber: + name: Chamber + startingItem: Cartridge15mmSabot + priority: 1 + whitelist: + tags: + - Cartridge15mmSabot + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: AmmoCounter - type: GunRequiresWield - type: MagazineVisuals magState: mag - steps: 1 + steps: 6 zeroVisible: true + - type: Appearance + - type: SpeedModifiedOnWield + walkModifier: 0.5 + sprintModifier: 0.5 + - type: CursorOffsetRequiresWield + - type: EyeCursorOffset + maxOffset: 3 + pvsIncrease: 0.3 diff --git a/Resources/Prototypes/_HL/Recipes/Crafting/Graphs/improvised_railgun.yml b/Resources/Prototypes/_HL/Recipes/Crafting/Graphs/improvised_railgun.yml index c22ffb37f97..fdbc1fa4a16 100644 --- a/Resources/Prototypes/_HL/Recipes/Crafting/Graphs/improvised_railgun.yml +++ b/Resources/Prototypes/_HL/Recipes/Crafting/Graphs/improvised_railgun.yml @@ -6,14 +6,31 @@ edges: - to: mag steps: - - material: Plasma - amount: 5 - doAfter: 0.5 - - material: MetalRod - amount: 5 - doAfter: 0.5 - - material: Plasteel - amount: 5 - doAfter: 5 + - material: ReinforcedGlass + amount: 5 + doAfter: 5 + - material: MetalRod + amount: 5 + doAfter: 5 + - material: Plasteel + amount: 5 + doAfter: 5 - node: mag - entity: MagazineRailgunImprovised + entity: MagazineRailgunPeregrineImprovisedEmpty + +- type: constructionGraph + id: SabotRailgunImprovisedCraftingGraph + start: start + graph: + - node: start + edges: + - to: sabot + steps: + - material: MetalRod + amount: 1 + doAfter: 2 + - material: Plasteel + amount: 1 + doAfter: 2 + - node: sabot + entity: Cartridge15mmSabotImprovised diff --git a/Resources/Prototypes/_HL/Recipes/Crafting/improvised.yml b/Resources/Prototypes/_HL/Recipes/Crafting/improvised.yml index 254da101322..350f3ab79bf 100644 --- a/Resources/Prototypes/_HL/Recipes/Crafting/improvised.yml +++ b/Resources/Prototypes/_HL/Recipes/Crafting/improvised.yml @@ -4,7 +4,15 @@ startNode: start targetNode: mag category: construction-category-weapons - description: improvised-railgun-mag-desc + objectType: Item + +- type: construction + id: SabotRailgunImprovisedCrafting + graph: SabotRailgunImprovisedCraftingGraph + startNode: start + targetNode: sabot + category: construction-category-weapons + description: improvised-railgun-sabot-desc objectType: Item - type: construction @@ -72,4 +80,4 @@ startNode: start targetNode: vest category: construction-category-weapons - objectType: Item \ No newline at end of file + objectType: Item diff --git a/Resources/Prototypes/_HL/Recipes/Lathes/ammo.yml b/Resources/Prototypes/_HL/Recipes/Lathes/ammo.yml index 7d4fa96faa4..cb6f7cbcffc 100644 --- a/Resources/Prototypes/_HL/Recipes/Lathes/ammo.yml +++ b/Resources/Prototypes/_HL/Recipes/Lathes/ammo.yml @@ -11,7 +11,7 @@ completetime: 5 materials: Brass: 10 - + - type: latheRecipe id: BulletCasing45_ACP result: MaterialBulletCasing45_ACP @@ -81,7 +81,7 @@ completetime: 5 materials: Brass: 100 - + - type: latheRecipe id: BulletCasing12_gauge result: MaterialBulletCasing12_gauge @@ -214,3 +214,12 @@ id: AmmoBox762x54mmRRubberBig parent: AmmoBoxBigRubber result: AmmoBox762x54mmRRubberBig + +- type: latheRecipe + id: AmmoBox15mmSabot + result: AmmoBox15mmSabot + completetime: 10 + materials: + Steel: 2000 + Plasteel: 1000 + Plastic: 1000 diff --git a/Resources/Prototypes/_HL/Recipes/Lathes/security.yml b/Resources/Prototypes/_HL/Recipes/Lathes/security.yml index 310a9450314..6536205e184 100644 --- a/Resources/Prototypes/_HL/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/_HL/Recipes/Lathes/security.yml @@ -1,12 +1,28 @@ - type: latheRecipe - parent: BaseAmmoRecipe - id: MagRailgun - result: MagazineRailgun - completetime: 5 + parent: BaseEmptyAmmoRecipe + id: MagazineRailgunPeregrine + result: MagazineRailgunPeregrineEmpty + completetime: 10 materials: Plasteel: 500 + Plastic: 500 + Steel: 500 + Glass: 200 + Silver: 50 + Gold: 50 + +- type: latheRecipe + parent: BaseAmmoBoxRecipe + id: MagazineBoxRailgunPeregrine + result: MagazineRailgunPeregrineEmpty + completetime: 10 + materials: + Plasteel: 500 + Plastic: 500 + Steel: 500 + Glass: 200 + Silver: 50 Gold: 50 - Plasma: 500 # Security Borg limbs diff --git a/Resources/Prototypes/_HL/tags.yml b/Resources/Prototypes/_HL/tags.yml index 9214050de35..4972acb6769 100644 --- a/Resources/Prototypes/_HL/tags.yml +++ b/Resources/Prototypes/_HL/tags.yml @@ -317,7 +317,10 @@ # Peregrine - type: Tag - id: MagazineRailgunTag + id: MagazineRailgunPeregrine + +- type: Tag + id: Cartridge15mmSabot #bolts - type: Tag @@ -363,7 +366,7 @@ - type: Tag id: Cartridge25x59HE - + - type: Tag id: DinoFang diff --git a/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Guns/Projectiles/Effects/muzzleflashes.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Guns/Projectiles/Effects/muzzleflashes.yml new file mode 100644 index 00000000000..1ec4c31fae4 --- /dev/null +++ b/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Guns/Projectiles/Effects/muzzleflashes.yml @@ -0,0 +1,18 @@ +- type: entity #Ported from Impstation by ASaltySeabass - The sprites were already there, just not the muzzle flash prototype + parent: MuzzleFlashEffect + id: MuzzleFlashEffectEnergyStun + categories: [ HideSpawnMenu ] + components: + - type: PointLight + enabled: true + color: "#0ab8c4" + radius: 1.4 + energy: 5.0 + - type: Sprite + drawdepth: BelowMobs + offset: 0.15, 0 + layers: + - shader: unshaded + map: ["enum.EffectLayers.Unshaded"] + sprite: _Impstation/Objects/Weapons/Guns/Projectiles/muzzleflashes.rsi + state: energystun diff --git a/Resources/Prototypes/_Mono/Recipes/Lathes/Packs/ammo.yml b/Resources/Prototypes/_Mono/Recipes/Lathes/Packs/ammo.yml index 4f81d3428f7..592b9439189 100644 --- a/Resources/Prototypes/_Mono/Recipes/Lathes/Packs/ammo.yml +++ b/Resources/Prototypes/_Mono/Recipes/Lathes/Packs/ammo.yml @@ -230,7 +230,7 @@ - Magazine8x65mmEmpty - Magazine762x54mmREmpty - Magazine762x51mmEmpty - - Magazine12_gaugeEmpty + - Magazine12_gaugeEmpty - Magazine45_ACPSubMachineGunTopMountedEmpty - Magazine9x19mmSubMachineGunTopMountedEmpty - Magazine57x28mmSubMachineGunTopMountedEmpty @@ -373,7 +373,8 @@ - AmmoBox23x75mmSlug - AmmoBox23x75mmDozd # HL - - MagRailgun + - MagazineRailgunPeregrine + - AmmoBox15mmSabot - AmmoBox46x30mmBig - AmmoBox556x45mmBigFMJ - AmmoBox635x40mmCaselessBig @@ -625,7 +626,8 @@ - AmmoBox12_gaugeUranium - AmmoBox23x75mmUranium # HL - - MagRailgun + - MagazineRailgunPeregrine + - AmmoBox15mmSabot - MagazineNovaliteC1 - MagazineNovaliteC1Empty - Magazine635x40mmCaseless diff --git a/Resources/Prototypes/_Mono/Research/Universal/shipgun_ammo.yml b/Resources/Prototypes/_Mono/Research/Universal/shipgun_ammo.yml index 489462f0dc5..d29bffad9ec 100644 --- a/Resources/Prototypes/_Mono/Research/Universal/shipgun_ammo.yml +++ b/Resources/Prototypes/_Mono/Research/Universal/shipgun_ammo.yml @@ -15,6 +15,7 @@ cost: 20000 recipeUnlocks: - CharonSlugUniversal + - AmmoBox15mmSabot #HL Change - type: technology id: UniversalSubnuclearRailgunAmmo diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml index 90f0a39c817..f8ee85a9b5d 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml @@ -699,7 +699,7 @@ contents: - id: WeaponRailgunPeregrine amount: 1 - - id: MagazineRailgun + - id: MagazineRailgunPeregrine amount: 2 - type: entity diff --git a/Resources/Prototypes/_NF/Entities/Objects/Storage/pouches.yml b/Resources/Prototypes/_NF/Entities/Objects/Storage/pouches.yml index 53043bc3b56..cfb9fa1adb7 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Storage/pouches.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Storage/pouches.yml @@ -1092,7 +1092,7 @@ - NFMagazineHiCaPistol35 - NFMagazineSuMaGunPistol35 - MagazineAMR - - MagazineRailgunTag + - MagazineRailgunPeregrine - Magazine75Bolt - MagazineRiotGun - MagazineEsar550Tag diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Boxes/15mm_sabot.rsi/base.png b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Boxes/15mm_sabot.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..507b1558f5c0ba8595c9227d7b303849d9fc9617 GIT binary patch literal 274 zcmV+t0qy>YP)npMrdb-2pYm6j<+>z53d+EX>4Tx04R}tkv&L4Q5c4wdo7AEByy-|xI;B1MMX4*MG_>48E7?hf6@f+Rqj<< z9D`P&p`RtIp{2RjhSnem`hjR_Y$|GrxN%faBKwx}@SgAeINy6fE@yPpX&D96%G=RU zP>Cm&m9`gJ>BUPIBdYG?!i#e;n%3tXk~nVzVpj9MKdaMNcXW^xU|P@Fd63qC$<2ID z@E+jTH&g?pGho<`Cze5a5V}_7SHY&Fsp=}4gORoEMizp886E?jIw&tp!t)r#Z+5>QG(YYnP;C!qI^S}V-#PC%x2XA}`I iGt4>ji-?Gbe&+*5ZVh`D>B@Eh0000EX>4Tx04R}tkv&L4Q5c4wdo7AEByy-|xI;B1MMX4*MG_>48E7?hf6@f+Rqj<< z9D`P&p`RtIp{2RjhSnem`hjR_Y$|GrxN%faBKwx}@SgAeINy6fE@yPpX&D96%G=RU zP>Cm&m9`gJ>BUPIBdYG?!i#e;n%3tXk~nVzVpj9MKdaMNcXW^xU|P@Fd63qC$<2ID z@E+jTH&g?pGho<`Cze5a5V}_7SHY&Fsp=}4gORoEMizp886E?jIw&tp!t)r#Z+N z76>80IR{mp=A#8pT6&xqV^>wwS^)r~TuRw`LLwp}dI00^BoM{!eh&Zu002ovPDHLk FV1hdK_p<;1 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Boxes/15mm_sabot.rsi/mag-3.png b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Boxes/15mm_sabot.rsi/mag-3.png new file mode 100644 index 0000000000000000000000000000000000000000..84c8142325cd11cb09366219ce1a3ce3338dc111 GIT binary patch literal 566 zcmV-60?GY}P)EX>4Tx04R}tkv&L4Q5c4wdo7AEByy-|xI;B1MMX4*MG_>48E7?hf6@f+Rqj<< z9D`P&p`RtIp{2RjhSnem`hjR_Y$|GrxN%faBKwx}@SgAeINy6fE@yPpX&D96%G=RU zP>Cm&m9`gJ>BUPIBdYG?!i#e;n%3tXk~nVzVpj9MKdaMNcXW^xU|P@Fd63qC$<2ID z@E+jTH&g?pGho<`Cze5a5V}_7SHY&Fsp=}4gORoEMizp886E?jIw&tp!t)r#Z+sysw#T#0DzU;S~Kk+A|g811IT+ezG?Wm{{R3007*qoM6N<$ Ef_CBgL;wH) literal 0 HcmV?d00001 diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Boxes/15mm_sabot.rsi/meta.json b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Boxes/15mm_sabot.rsi/meta.json new file mode 100644 index 00000000000..02fe92c1963 --- /dev/null +++ b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Boxes/15mm_sabot.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/983ad377d25729357b7ff8025f8014bd2f6ae9f7/icons/obj/ammo.dmi, base and mag-1 by Alekshhh. Colors modified by ASaltySeabass for Hardlight.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "mag-1" + }, + { + "name": "mag-2" + }, + { + "name": "mag-3" + } + ] +} diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Casings/15mm_casing.rsi/base.png b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Casings/15mm_casing.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..02f5a6b25fb0843153d167c0d0634c767666acdc GIT binary patch literal 202 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJiJmTwArY-_FDUZ07>Kkytlw__ zz*B~E)|IaeFXpXrKUBmeB*V#dndSNhu8pfyw6C36u0Hu>Lq|u)pPQ@2B#wV%%9zF0 zP8%15ea#ZehHebM_OTzRK5ttj!4~9o z-RAuD$&B{48`f#3x!vBDbKC9Q&+IKgQ*Ayno@>!J3(T8&2V!Z literal 0 HcmV?d00001 diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Casings/15mm_casing.rsi/improvised.png b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Casings/15mm_casing.rsi/improvised.png new file mode 100644 index 0000000000000000000000000000000000000000..ef5e8935e1bb8b725d0aefc163a19badae31f4d1 GIT binary patch literal 200 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJeoq(2kcif|7Yw;t3?y70ZeRIN zEn{(ls^a#W(iIo)UQ?EAQgAsFc8yEy_L*@1j}iicf)nklV|kAiu3<=HJFsgVgNg6q zeeY*Tp0n(GoDeC-;KcF1a^C)OraM;^S{M!(@Z{Wf>zOE_%#eGV>B4v0^pxwRSEB4M yn_RVK?3eSq3nR!h2pv+9xM+hukDw2nhfpRiD$+^>NryspryI2vH@QLTqW3K4=W^}` zcLo$iQT{uD;b}7cvWZhzWluqR4d((2mtu#70R5+cm#lRj+vY9<8JSKX8XOR zYI9Ax7HF96KkoXE6K0+kR8Om_yu8fz^8{UqUSv4Ee>Mbu8R53QU<3wnB=cxZ3-ZF?^1nu-1~MDI8zI6LrS0 l)?ZKs|G5#>Ruo0K8wUVOOv-X)LxBJQ002ovPDHLkV1mWSdAa}q literal 0 HcmV?d00001 diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag.rsi/mag-1.png b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag.rsi/mag-1.png new file mode 100644 index 0000000000000000000000000000000000000000..6386cc1a0df9f7e17170a9c2bad9a2a1f117ae89 GIT binary patch literal 109 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz6Hgb%kcif|XB-8A5)228nF=M? zer>-b^y`z^fhLu|d3Qb1(wIxk1s&6ZLc{YsC#k&L$!yKe!t~E;doWNxgQu&X%Q~lo FCIIY7AMF4D literal 0 HcmV?d00001 diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag.rsi/mag-2.png b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag.rsi/mag-2.png new file mode 100644 index 0000000000000000000000000000000000000000..6386cc1a0df9f7e17170a9c2bad9a2a1f117ae89 GIT binary patch literal 109 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz6Hgb%kcif|XB-8A5)228nF=M? zer>-b^y`z^fhLu|d3Qb1(wIxk1s&6ZLc{YsC#k&L$!yKe!t~E;doWNxgQu&X%Q~lo FCIIY7AMF4D literal 0 HcmV?d00001 diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag.rsi/mag-3.png b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag.rsi/mag-3.png new file mode 100644 index 0000000000000000000000000000000000000000..6386cc1a0df9f7e17170a9c2bad9a2a1f117ae89 GIT binary patch literal 109 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz6Hgb%kcif|XB-8A5)228nF=M? zer>-b^y`z^fhLu|d3Qb1(wIxk1s&6ZLc{YsC#k&L$!yKe!t~E;doWNxgQu&X%Q~lo FCIIY7AMF4D literal 0 HcmV?d00001 diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag.rsi/mag-4.png b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag.rsi/mag-4.png new file mode 100644 index 0000000000000000000000000000000000000000..6386cc1a0df9f7e17170a9c2bad9a2a1f117ae89 GIT binary patch literal 109 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz6Hgb%kcif|XB-8A5)228nF=M? zer>-b^y`z^fhLu|d3Qb1(wIxk1s&6ZLc{YsC#k&L$!yKe!t~E;doWNxgQu&X%Q~lo FCIIY7AMF4D literal 0 HcmV?d00001 diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag.rsi/mag-5.png b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag.rsi/mag-5.png new file mode 100644 index 0000000000000000000000000000000000000000..6386cc1a0df9f7e17170a9c2bad9a2a1f117ae89 GIT binary patch literal 109 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz6Hgb%kcif|XB-8A5)228nF=M? zer>-b^y`z^fhLu|d3Qb1(wIxk1s&6ZLc{YsC#k&L$!yKe!t~E;doWNxgQu&X%Q~lo FCIIY7AMF4D literal 0 HcmV?d00001 diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag.rsi/mag-unshaded-1.png b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag.rsi/mag-unshaded-1.png new file mode 100644 index 0000000000000000000000000000000000000000..8d05b9c07d20851b91a20e25d4f9fa4b89fa927c GIT binary patch literal 92 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzWltB!kcif|=NNez7+4q#6itO^ pNF4je($DZ<&YF9A3=AJmGaQ@8_}p{BiU6Q;22WQ%mvv4FO#rnm86*Gz literal 0 HcmV?d00001 diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag.rsi/mag-unshaded-2.png b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag.rsi/mag-unshaded-2.png new file mode 100644 index 0000000000000000000000000000000000000000..ad209bfd7b28b48e2c175f0b6812051737a665d2 GIT binary patch literal 96 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzbx#+^kcif|7Z^Di7&s0XINv&R tAj(M~(Yrv7@ql$??c9Phj0_E_%#$6N&$eaMngX>jc)I$ztaD0e0styk8N~nq literal 0 HcmV?d00001 diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag.rsi/mag-unshaded-3.png b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag.rsi/mag-unshaded-3.png new file mode 100644 index 0000000000000000000000000000000000000000..ee89b7e20b3555f1baec696e9768f4d879df3547 GIT binary patch literal 97 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz4Nn)xkcif|7Z^Di7&s0XINv&R uAj(M~(Yrv7@ql$??c9PhjO+{zsm!InST|RC7XAb3VeoYIb6Mw<&;$TZqZ;7= literal 0 HcmV?d00001 diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag.rsi/mag-unshaded-4.png b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag.rsi/mag-unshaded-4.png new file mode 100644 index 0000000000000000000000000000000000000000..2cf0f214414a48298eba7bcd9fa3f75c2769992d GIT binary patch literal 98 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzO-~ockcif|7Z^Di7&s0XINv&R vAj(M~(Yrv7@ql$??c9PhjO;QD4XMm|C)sD7{+;3t)WqQF>gTe~DWM4fWJntF literal 0 HcmV?d00001 diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag.rsi/mag-unshaded-5.png b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag.rsi/mag-unshaded-5.png new file mode 100644 index 0000000000000000000000000000000000000000..9fde0fbeeb34e35e4ea84335f42badb42584d33e GIT binary patch literal 99 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzEl(H6kcif|7Z^Di7&s0XINv&R wAj(M~(Yrv7@ql$??c9PhjO;Q63=OHwwd*+RySrQyfVvnwUHx3vIVCg!0Cbodga7~l literal 0 HcmV?d00001 diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag.rsi/meta.json b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag.rsi/meta.json new file mode 100644 index 00000000000..428ca4b6143 --- /dev/null +++ b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag.rsi/meta.json @@ -0,0 +1,44 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Based on the xm43e1 mag taken from https://github.com/RMC-14/RMC-14/tree/master/Resources/Textures/_RMC14/Objects/Weapons/Guns/Ammunition/Magazines/xm43e1.rsi. Modified by ASaltySeabass.", + "states": [ + { + "name": "base" + }, + { + "name": "mag-1" + }, + { + "name": "mag-2" + }, + { + "name": "mag-3" + }, + { + "name": "mag-4" + }, + { + "name": "mag-5" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-unshaded-4" + }, + { + "name": "mag-unshaded-5" + } + ] +} diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag_improvised.rsi/base.png b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag_improvised.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..d3830b28a121795563d4dd8f9375c6a712aa2e88 GIT binary patch literal 252 zcmV1RFs&;5uA@`w+Jx?#2y>SV|N@G)NM#(M~X0pZUpWki z!wd)^gb;sLFj;mRts8*S>S?|Yw?;W%6&TN#(`y`4v+I4o0H^3e z({)IbG`_XR=-A;cYWb1f1Q&km#j0000ZA!u6{1- HoD!Mpl- t5&bdqUtf#tdX{-*pRTVT(AbjCO#5p1m~US(wgvJSJYD@<);T3K0RSHPGiLw* literal 0 HcmV?d00001 diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag_improvised.rsi/mag-3.png b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag_improvised.rsi/mag-3.png new file mode 100644 index 0000000000000000000000000000000000000000..dc6fa04e0752289ef1bcfa607b815c7eb97ad3c0 GIT binary patch literal 168 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJd`}n0kcif|=MVB8G7xaN_+COh zfwRzwGdE&dET`=RzoG@5Q`}fG8AL2~6C^uN@A-Y^T|-C5iTN|*r#zX%?cl}v-d2$% zsVBZP+`eG<`PAzAh-*_nzdT_QH`}dbD`PUh%{+ZQ=l;@lPq%e+bZ{_OSKbyhODVp@ Q3ACEQ)78&qol`;+0Ke}%NdN!< literal 0 HcmV?d00001 diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag_improvised.rsi/meta.json b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag_improvised.rsi/meta.json new file mode 100644 index 00000000000..99f6a09879a --- /dev/null +++ b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag_improvised.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Based on the xm43e1 mag taken from https://github.com/RMC-14/RMC-14/tree/master/Resources/Textures/_RMC14/Objects/Weapons/Guns/Ammunition/Magazines/xm43e1.rsi. Modified by ASaltySeabass.", + "states": [ + { + "name": "base" + }, + { + "name": "mag-1" + }, + { + "name": "mag-2" + }, + { + "name": "mag-3" + } + ] +} diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Projectiles/railgun.rsi/impact_railgun.png b/Resources/Textures/_HL/Objects/Weapons/Guns/Projectiles/railgun.rsi/impact_railgun.png deleted file mode 100644 index 1504260c911461c28f35cd0ccd016c86e1dc711e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1482 zcmZvcdpOg30LH(+U&BmnktnzEq>D?Tj+B#a8Kxa~OODGSQ#vX%qKtlIp0PHnhsr&o zTyj^r&E>ciX>zZ2H0n%Ba+Kt<9j8CfbN+bW&p+?;{_{T1o8;_hr-<2x0RSl4Q^>CC z^!rz6*>#`16=|^!h~a8?1eEt{z6U@i-kwZykMf<(HVxVAf$N?~AKDEo=j-a_k&j|B zc4<|SQ}KG?-+|H#&#>(ocXe5YK{)t(@{%QPGh34$dedr4o}a=t`V%`6)w*h+=~aF7 z%DI>WAs58jiPB^Dn#XTHl1}vTW5gHFi$dwNyq;}ZZCZft2m^rhVdzRJnEzuqj?Y|- z_RLy!N$V@&98zD1i*)g|^lso7)~yJL7L}k0FulFQGBTZ>!B4{@zdc$GM2QA%#1BW^ z11v&;ZF{cdX?=k>@kA|-i1GirbSiMJA~*BdZY!ux4DlLVK&y}(8YbHP!95UWbh9p0wo5q&{mCs$P)X5 zCr6zK>DXE0T{{7f8`0WG)E!i}Rj9^Z)X%bC>8e~Zp7zPVW|4l^hMFI8OJOqrag_8O zz^}Nx^#DMVtM@~I8X?1ni1_P;^5A%h;b%nvUo&z5t*$XPh_Y6DQfLrDs1^Yxt>ZqgirS1j{Wf+bUO zw}lxhy&YZ0pW-)3i4i)*0b^ck#c#)$##~X)i?b2TudMw5J9)F&pK(SB-F>OQ`D5dQ zLV}PWooy&obMg{C-;YO0Im2_zG8bj{dHMEijm(mz5{NNsf_?mLHK~DM^^?NE#nF2_ zCDyd?{1r*{Y5mZ5E_IuN4mBk2m3^}^Rcbyfd1?1Y`q@|%&G^!qla)tcn-RKddOJCb zHA2Jj;<~A-qWhREhL;+jM)P;ETJ?RcC2VPOQ_InlSEjL>xaPfAJWT z*Br6Hl~U5|w>WKn z&=Bcl%Lw3G^Ju2jkho87H8kQED-d@OzecMSdf~3z$A?3HFB5uhOhkX(Qahn(Is5Yn zv~>h>AXX}Cmv@Ny%3UF(sqnsKuhhThS-~?H_D+BFsR97TrVSP`;6(A6jZmwtN0kS_ zQ3C_ez`P;38Ags9Xjp^F0oq4Z(BV3+4kO(16BPiT{0kpz4=={>9NR-v-t)`$)P zYudggtik>h@7&dU$53ka3YjY~@hz;LqxkJ-LC;J;$ z4{oiv6QwYdb4(eD$~78+X5-kvS-mXb6-W4%v=P~}zJ}160t;fIqEJZR!S&Nk^^EHi gxj_HrZD<{9 diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Projectiles/railgun.rsi/meta.json b/Resources/Textures/_HL/Objects/Weapons/Guns/Projectiles/railgun.rsi/meta.json deleted file mode 100644 index ea8c97c7059..00000000000 --- a/Resources/Textures/_HL/Objects/Weapons/Guns/Projectiles/railgun.rsi/meta.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-NC-4.0", - "copyright": "Original sprite by META_mahn", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "muzzle_railgun", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.5 - ] - ] - }, - { - "name": "railgun", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.5 - ] - ] - }, - { - "name": "impact_railgun", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.5 - ] - ] - } - ] -} diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Projectiles/railgun.rsi/muzzle_railgun.png b/Resources/Textures/_HL/Objects/Weapons/Guns/Projectiles/railgun.rsi/muzzle_railgun.png deleted file mode 100644 index b62f6654aa9225c8810ab35f3d36cdc0318d7633..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1194 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-HD>U`g?GaSW-5 zdpmdUw95tpt&g|gNUGM*%y8n?+@>t6&v4$s)zS5!@B!`s#=B-K%cZ%zUTnXy-N5}= zQOePYZnHM#7ZqK8>9=@*iCc2WB@ga4@`Kh?pnpz>vUx z;L{ogCI)MUY3Zy23^y1z*l0H}9N=qs8p+tkaLYbEN_<`AFTXddD;6Zq+uXX!@PL-& z^0&SG`_CUe&y;a{+hVKht21Y%@ZAd${;QtPe<tpSbWx(w9SSeQ?}nOwG5GzmHPGlb)ubc+wo?b2D8)>8%>kTv*nmN&es3@ zyCQsgD5J31lXcgX4T6ugTi*+BTHkf#-1p0y7<{(V6Dq?P7#n06PH$!+%DXHKWehs!xiGahOsx6+GV98r z8++h+U6G@oKldIm5|fhMh7Y3~kNNzaB5l-*Y?c(!U=~ z%RQHstu|M*W9fhQ=K1Tt(bvsg{Wr^m%t)Br%J6R9+P3DZzm>OJZ`;dXnE&YCgAc-o z*RywjI`&-7&*SUybh!&0>zBtK`g`{%$G`LZKeao}?>&{WF`rQFpe%Yre&524`gQMZ zWhMVT%aT9!^iuwXS6mh^X7kI36a;-d?;bYk_4)Ibw`KnvXK2}NyXKU_3b*=K@6un% z?E3%B;!o9E2bRiEW{y_9Z#)8bvd&ep$uuk6l-xO2x7L2?)aX4S%9WB{4h7Q}e3)b+ zdVC2}+v}45bFNO3Z<@31S@Q%jC$3MA7`Aj@JoEnClKAh=94D6t^xj+XOMR6?(!Upa zC$wgI_X^+pXu)4JUGDwlm#Qy<&R$2Y`IT=4*BCT* zn&_B{u{rEM(9Ir@}7h#qdF3+P<~crpDQy44DIz&sqLaxBFmwfQvy{0WFs^@H~)D-pX@L UF<;OZSokn_y85}Sb4q9e0KJS1>;M1& diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Projectiles/railgun.rsi/railgun.png b/Resources/Textures/_HL/Objects/Weapons/Guns/Projectiles/railgun.rsi/railgun.png deleted file mode 100644 index b62175fe3744820d6dafc65ea3398d88b50ccc3b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 861 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-HD>U>5UqaSW-5 zdppOlNZ3)pwLI@(!<;D%E`DoUF1W-rNDCCOu+KRV)4p`nNY%zx}=T_1CQrORs9`PWN8ja5d}dK1)^~&Ml$$nbu|e z`&PAURm;i)`+wQoI&aT-yeasI#)PZ0gg(gpxD$Nmr?XA`p;a9VtXNnYLvJfNsEUTP zHz;h#ie_1{r0JD_083bIH^bDB09mG{1FLcc7fj+>UR6}!SaVB^QEMf|hU$H_&*$%7-aof}fBg38ABzfq{F}JEMc!27 z^XfBSm$yHY63f>!ad{f`St|N_RLZo<>Gt!!o%h|h|HZd8;_~avU;nMP*;}giPvXJT zx7R?o=;rQp?|GR+eAte;gEYvS9PQq*!&{t9HyQv^W(G?2#ur z7Kw;xbR`eOF4XV6H!t$O>{+{~l|Ob?pT4==ZmP}npX+1&r5RcOTyy658u)r)+8d5< zH@-F-e~P`n_Ws?sGka_q4Cfr2-yA;w?)ulqug!iv@7IT;cW!<98dmozU+>qKe-Gct zyIPv-pPIP#fK~X}n+NB=KK5_A49g5(MFz$+re_su1gRhPClojA&?;;^2+S@Fp00i_ J>zopr7yznqYHa`j diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Projectiles/railgunprojectiles.rsi/dart.png b/Resources/Textures/_HL/Objects/Weapons/Guns/Projectiles/railgunprojectiles.rsi/dart.png new file mode 100644 index 0000000000000000000000000000000000000000..51108919991231fa4eab9df9389a59354751da59 GIT binary patch literal 675 zcmV;U0$lxxP)EX>4Tx04R}tkv&L4Q5c4wdrhn;8gh_uxPvtnL`5`)MG_>48fZ0ifAR;sSGiYd zX$)F}hJKc;hL+}98(M=P=m(;yv8kvf;>J-yiR@d>!+XB><9zP{xmwUor(+aMt8B+3 zVI`GbQhYCX3DQM?4pnzb(ZpPmw)J_3B+lCrF{^#wpVe!uIXXxRFs+yDGDxeydak=_QaJgs#>3RdBY(vY6?&lkpjl{eY5fVXcMroNaGq;ubP^+3m01ucr2;5T9Z70oXNo3DfFhH{|363>$x@VIk|`A1}t2|{s9bSp>L(l z-kq(v{oB*X?*}=8a*$c1-GTrB0N_bPK~!jg?bWdkf-nFC(9;;g)U6N`Hx>sc*qk~z z`VB687yrVC(8Y~7u@mCpAM_fFa&PY)IZ6OTL^f>49PYXf0BluNuh0zVTyTHi_we4^ zwrzv^_rdKS7Ql_n26r4EW0x2Suy&l0rEU& z`zbN{sR5>G0ss_6K|cu7&)EE5fVu(3m^80`CH*2IA|fL4yWSvUE^)p*#P?&Jo!Sl^uVzMMv)Ra?nx;kCUDpl#{5v3h;peX0V9U5p|9dKQr2mfIy=SC;{iO5s ze%u2G+}^%9uYW+jUYCzvzT)B5wG%hK{`7^rFWz!^`Yd~o?}Yl@Qco!W7oNP4!{-k| z=YfF1U;uz=nxR4S`Fz}iMlx@~6w@@RR;%pp?gqEGTrNxZhl6%LkK;HCBEF4V0Q^4i z*Ozl;0364OFJL?#FC_;kl}fbRZG@`QYPA$VGOfnNw11zF^xWTZ94yOHbX}K|$pj$; zp66lP_R`a|ENl7-DisNkPWzFX&1TRVfUmtC@Avl?0_eJa?31%BOPSd-nGEV&_^|}e z{!+5Jc_}b@o(F(X)g=L|P$(3n5Q1*E8@hMnsA_-S4~)95%URELU6)7wRzV1Xs;ZGb sk^h2eLL<5ArTUv$1rrhy68>ra0MN3{Al3#u4FCWD07*qoM6N<$f>fstpa1{> delta 868 zcmV-q1DpKM1cwKZFnn3HR zGpWMBffv2-QlYo{4|pMX=fG>(23~j}-YBSrD$Y7;hp3>XNJYooMK#^BbnTKfOZz5$ z^S(!NI@*e6X)IENyzsv7;hg6@&*yxf^PHn_#E){s@o59J6@O?e@IO?bBm|wx!@&lU64wp#G4;}MNO+9d#Y6)>FUPqwvfM_$J5)* z#&Q-^m5#8V7cX9+rd9d))$5P4Q-80&+lVa08t+wI2Ta9~qagiuf{V45HV*ld=TZuh$1U4RoO2H7YUSYOTY?tAb5 zWi!S4qJN^lKhE!eWH|rAIhog+kux&r{^zOuPtlj>MY6EG;eV0jy>-jEp{w zYO`^D=?6ZUncIaJA3q}k{vJM^o{@d0PL7K4)6bwNR_JEanrE?=&jD3M4+ zM59rv)vDaE@pzp1`T4(9iR=i6gCf{_443J^9HkDf2&MRPKx`bB2K4+ z&pzKPvymr9T8<$%ZI5q%*K#j;7F zzn@SzNOfxytHr`vzKE~K$G!D?%wPMar8=LOm=NW1nT3UghXXW9Rx&vx9zQ-H>pi!6 zmtCt@_tMfd!9Y5l7WMSZ%{89abVZ3oLU=km*fw;2`T5tT_WQxc#>Pbb@L613{C5f* uWR-`tX=z1=4fap-+W>6^+6o-G0)GMy^il{62B7Q!0000+ diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/bolt-open.png b/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/bolt-open.png deleted file mode 100644 index 11d37d7bc1b68fbaaa9ffa7d75c470f211bc75c1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 873 zcmV-v1D5=WP)Px&B1uF+R9Hvtl}k)qWfaGM_s$*W;m8aOGi4qy52wY#h}as^N|?bWCc0zcw#h8I zt9#?dolUxKq=^d`cBKm?L8H_Lsm7WpAqJyO?E)R_FbKUf&?$FbcfRI+B(z2mkp-Li zlKaT_oyY(D&pF>wIO3%ov47eC+6=TAXfx1e;7|;VkB^H`D1>R6R4Nr_XJ-#=Pby@x zSrG|`aX1_li$wx~0Gg&zC=~Gde3VKh`K?x~*zI0v7CC0xgX60vEvFwG{dhV|4D+Xki(y!Fl{ zQYRARau;aS>nMgnAlAdyW&@Y|DVn;@`Ikqe?QG^Har5h2d;aeN7#e&Q0lYhPg{n~p zRQ%mOo;jZ6yIVgH4ERZ>2l043IGs-HnuZVxiVCe32myAxdZ6iU+1&+j^5g)Uk_#UiG)O`_ZWVE53yK3iUP}b?{NLAZFO9PkG?=dPRTO zOS#e_nMe?hgs5#l#HOmO>t*~se(rDFXa43l2kP^Qi3wrd4+{$m{|;cUWTn%C;>7Wk z?Dyi@pWL|dI4%1o*y@06R#@qoo7-D&--wdQr0{k=P2Ftp^H0C*EB_?0(a}+1T|SG8 zi~o;-{}Sb4Weyb4VV(Vxej7lWfi?q2&cGvGpgIW6PlN0L00001ljw!3CIYLF@FL{L_t(|ob8&wYwK1N$GnK34bB9^nRi{Xyf%8)a&)N zPl9dRRH;<58?aullMsT05Y!)&c4k*WT%!BUVr`ZCytK}(Q388Wseh+goS2+ z>$)@?4lx`K9|a$uo>}r-@L#{_pxf<&AH$?1PJrV$G#ZUC8ja9sG;+W5%=!6wfrEeb z%TH*vS_s1szwfE&oV=^hR2j$oPXnaZ-hO5)}koY2~luET9kMHn2&m+(C zNGX+mdmAJ3j0qt~N(lh?`PbjD`B@>=HI!1(+g-QYg_JUy1)WYOwf_ z0fWH+&1N&5!W?lNhd%$}%jkcz*^FG`d1xCWIs>l4F>+m(ipAp8G2P&yn}A-gSBP8A zPk(icxvsnP;A^!Sl}aT5!2SJwbo`;-S!mAyUi>PR%A-%x+_mxIE2*zOCG1cGK%>zp zbUK{^`v*xDYV9)k+~UV~ewl7DJJfilH=*0@YVQZ;CLr$gFx;uZO%laoaVZ@lh|M-k z?mPhC1CeD}QvpjUwUVGU1A-uU)OND}?SD7Gq*-a1eFE>_y#-<|IhJJ+Yhil5UV-hi zOzDq_Y}+OP*x%n@$%g2uO2b;%OwIhFzVDM#>i@wHPS$oO$W0VU9AvFWAl{T<|NTP> zh4~WK7S}ur?J~$N?O!jxTSVJZU~LZ_Hq)$07*qoM6N<$f|slW5dZ)H delta 1176 zcmV;J1ZVrm2)PN6F@JMOL_t(|UhP{wXcR#do&&3-@J{8PMej_!Q`J0`Q99z<eY(qPv3_;@fiH6@mpmqnw|umix#%1SUh zI~)1~5FXvS&Jvsk02C764$++5EX?O#=0wym~9%Jev^+ z7@WqPW496j4wXx#QgCu|B3uIiTL3ify}i9+e}7+~*daB^c|@MBt*tGkf64_a0463T zg5%?30RT2OHd>aa(udy>aohpG;=4~`=I+f92%tQ-@(^ZyZY&1C!VQXt^#&UEWm$zlm9?tjm^@U<8m5R0<+7Cbxa-Iy2Mjnwd zF@y^Q4mqGbIgjT+|6;Ldl!Dp-P!WRSxSV$h0MQ-?vibS>&~cnl2>_EKtOWq=!>;%H zI5yxwc7Oi%gJ!j-ZJ7W!-G+?-aCz8?a~=n>`%f3cYL9%UV=mGGe`7a55k!D=ZPNmP zo2NF{QO=X|wD&^?=r03eqSrbAat(m-b8~ab^Z03o%e1f8>)|p0FgiM#c)ZmC!a4xh ziw6e>LmO~BEnPU%k`AIdK$j zS%^ZKHh2c4iGCJzdj{x40k5UDUU7Bw>a5kZk;MQAMcb*rzh9vLp4Axvd_u!)z~0`T zvVWURplSi|;{9jw{NX*L4vbC|P1jQ2;PIUsb^#a~8Vbh7#sof1XLUdVpTz$Kxn`%h zR;vkX-C;@rFd&NnP`7G#cQ*vUIs@pNoN7eIq%mPicY2QclxWWr05l@QDcGzUK+3AW z{{|2qH!%i7w!bu-PKZRolH2nK2M5hz34fih&};yxz@S4D{T>er_Vo0G_O)wHfFh4c z5o*s<7fGj3vjC7&AS#^3W8i$dCPXOb0lEx01<7g(P^Sl7nP?55@tAf-KB+w~Pl};~ z#F-UTGC-aZMGcTsfO4>%6Cx&T@kpUr?YjdZEo1K<+f qPLS;x&&2 diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/equipped-SUITSTORAGE.png index 888e4220bda94d364c702d17a2133aa514f73af9..ac855d3340d1de3c9a99a94ba71f3bdd18cc9e78 100644 GIT binary patch delta 1062 zcmV+>1ljw!3CIYLF@FL{L_t(|ob8&wYwK1N$GnK34bB9^nRi{Xyf%8)a&)N zPl9dRRH;<58?aullMsT05Y!)&c4k*WT%!BUVr`ZCytK}(Q388Wseh+goS2+ z>$)@?4lx`K9|a$uo>}r-@L#{_pxf<&AH$?1PJrV$G#ZUC8ja9sG;+W5%=!6wfrEeb z%TH*vS_s1szwfE&oV=^hR2j$oPXnaZ-hO5)}koY2~luET9kMHn2&m+(C zNGX+mdmAJ3j0qt~N(lh?`PbjD`B@>=HI!1(+g-QYg_JUy1)WYOwf_ z0fWH+&1N&5!W?lNhd%$}%jkcz*^FG`d1xCWIs>l4F>+m(ipAp8G2P&yn}A-gSBP8A zPk(icxvsnP;A^!Sl}aT5!2SJwbo`;-S!mAyUi>PR%A-%x+_mxIE2*zOCG1cGK%>zp zbUK{^`v*xDYV9)k+~UV~ewl7DJJfilH=*0@YVQZ;CLr$gFx;uZO%laoaVZ@lh|M-k z?mPhC1CeD}QvpjUwUVGU1A-uU)OND}?SD7Gq*-a1eFE>_y#-<|IhJJ+Yhil5UV-hi zOzDq_Y}+OP*x%n@$%g2uO2b;%OwIhFzVDM#>i@wHPS$oO$W0VU9AvFWAl{T<|NTP> zh4~WK7S}ur?J~$N?O!jxTSVJZU~LZ_Hq)$07*qoM6N<$f|slW5dZ)H delta 1176 zcmV;J1ZVrm2)PN6F@JMOL_t(|UhP{wXcR#do&&3-@J{8PMej_!Q`J0`Q99z<eY(qPv3_;@fiH6@mpmqnw|umix#%1SUh zI~)1~5FXvS&Jvsk02C764$++5EX?O#=0wym~9%Jev^+ z7@WqPW496j4wXx#QgCu|B3uIiTL3ify}i9+e}7+~*daB^c|@MBt*tGkf64_a0463T zg5%?30RT2OHd>aa(udy>aohpG;=4~`=I+f92%tQ-@(^ZyZY&1C!VQXt^#&UEWm$zlm9?tjm^@U<8m5R0<+7Cbxa-Iy2Mjnwd zF@y^Q4mqGbIgjT+|6;Ldl!Dp-P!WRSxSV$h0MQ-?vibS>&~cnl2>_EKtOWq=!>;%H zI5yxwc7Oi%gJ!j-ZJ7W!-G+?-aCz8?a~=n>`%f3cYL9%UV=mGGe`7a55k!D=ZPNmP zo2NF{QO=X|wD&^?=r03eqSrbAat(m-b8~ab^Z03o%e1f8>)|p0FgiM#c)ZmC!a4xh ziw6e>LmO~BEnPU%k`AIdK$j zS%^ZKHh2c4iGCJzdj{x40k5UDUU7Bw>a5kZk;MQAMcb*rzh9vLp4Axvd_u!)z~0`T zvVWURplSi|;{9jw{NX*L4vbC|P1jQ2;PIUsb^#a~8Vbh7#sof1XLUdVpTz$Kxn`%h zR;vkX-C;@rFd&NnP`7G#cQ*vUIs@pNoN7eIq%mPicY2QclxWWr05l@QDcGzUK+3AW z{{|2qH!%i7w!bu-PKZRolH2nK2M5hz34fih&};yxz@S4D{T>er_Vo0G_O)wHfFh4c z5o*s<7fGj3vjC7&AS#^3W8i$dCPXOb0lEx01<7g(P^Sl7nP?55@tAf-KB+w~Pl};~ z#F-UTGC-aZMGcTsfO4>%6Cx&T@kpUr?YjdZEo1K<+f qPLS;x&&2 diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/icon.png b/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/icon.png index 58d6974a64449a54a7ada640eebc8e04ed2fcd45..d4145947458bfdc645b8329d1e81b98a149d203e 100644 GIT binary patch delta 572 zcmV-C0>k~o2jK*eFnaI*%KFTeW`Qv#Wuee&+=~LMxb9oJ*5DgfBZ&v zp5F_6_XV`uZ2(Nu3=En|rJ^Pp%0Uapn5IdwSmgbOj|}z)^t!H+&*!E4!$CWj!f~8K zA_`xt0KC2CeJ}sY1K>DLbOFQR(BFKTTrNkgRzs*N)qiSL0VLyU?5=qmE>HP8j)P@c zimvN&G#Vj-LG9c8>|66mj2 zZpw}j0##LMHk*NSK>^TpT~1=ItX%Ys{eGXL0-}&kr=<`gRKUVSb@Gfi;r42E-?*eM z`aRcmT{TW;Hw%*rgyEloUibL;>~&oLIqRW1%A|rZF)=a!G=Bg(#oNyN2Iltw0000< KMNUMnLSTY)!50hw delta 929 zcmV;S177^$1j7fAFn$D?7|Din|-YMM0skhKXNq?0G|MK_nU_kJ}A{ z!GKgM1&6}{K@gBkCSkMLkj-Y88t&LIC z>2%99jCJWOcCu6KADt{EE3{}?N4bZv-MOE?jtpw`o zE%@e`53($SlO#C&O~|jxFqsdcEQ6BdgFMxzmWK>!g4jt5i~AOiGyeowc%7Pms+$dPue=CW8x zr||uy%YXk!CVz{MT3Z8n`YeIr&p%`5`oufHK({~L;zN{W!s6ovc)b3qWaj7Rw+N(@ z350t-hM?DDVg5dT8lS3=7#tiRr=tl!kBu|i(cT^!?EeHDr^BoDb(U}jgNZ3|;o?Qj zh4Xs7^~7o3L7~)Z(@x zS5OgbZH3$8LTP;sI-W;H%)#Dd$IF$Mn7(zp5~#boo3wJ(N=+-rLZN_oJdRi_R`D4c z8h;|qJ~K13JAs`JD-`Oa4-dC7fK>VgCMUO!B^(Zu)9GYOwViSt$9l-z+*}1L8jX^6 zJX2F!>;8>ZwQ~i7L9*7@VMCGe$M26S{%*IMIyyR#PN!LAXar)h7&4hm#iy^YkF@49 zJ3ISk3RF$wci>P}fp>thYls?wngTTi_8MJ*zX11BZ3xW*KXw2B002ovPDHLkV1fVu DM{mCN diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/inhand-left.png b/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/inhand-left.png index 2156ebcb2628f653886ffb767503843bd1345fc4..158eb157d4647c87d7617ab1ba023dba6d1e8091 100644 GIT binary patch delta 694 zcmV;n0!jUo2igUYFndwSS2MSK)(;cX*P03R^{R zYz$)R4vAjx<}nxyAf-eUML0P*N&lRKBig?_#)mIo0RX#&Jo*NZlckUJi5X5qX|B zaeui~Bq0O^L4QC&5ZGN>HYugZMiHcx)E(0JULgb(@;j>=+$4lZRRkU0_kHqxe?3BL zwXjM`DH1|Zoj`^B&Rj(>-@Nbpq>H(%`C8osrIZx^K8NeNI6Xae-ai-EezA?s4aaFT zTbNY@DJ3M;m~XxoR!Imk z@w>GMf0ye;xa~L7!aoSpitymWn{*M9UT2Ik#u#IaF~%5Uj4?LDJZFg3kH`Oq+m6po zThF!<7h!1~BFi#5Hb)diH%^eXPTaw_*7y7A9Z1y|kc81Yu=HmwB6V{_0y=ychU4e# zzkPH6{eJ^#`vQ_M!A{3gW92__ c#@Jf>2P}D|a5up%IsgCw07*qoM6N<$g0t^SNB{r; delta 880 zcmV-$1CRXL1(OGmFnTzEsO0fe01y;Vaspuslw1Iz2!<^Xwm``Vgnuniash->z`HH*?AuRq z{oEmXH`iwIoyCa0jq3Hf=yW=N><)#XO2oDXf`4>lMw)*6<~<7pHs=%sIC=T#0qV>x z5O?sim!|3d!za?`t20*w2LyHi&1O?vyZ3-31SnynDlneAFnvZWudLGZSFaNQw{Fi` z`)_T)JVhFfhJUElYGeiBZ}9qdI(Fo+==QpF^3(~rBuDVD!wvvWSF2T82O&>Q(6SCY zcVB*><9oJAANNn~6ZoEASY-8?)tFL4Dulc>VJJlX;1nVFn-|YhM8D{9>!}kzohaaJ z^R(#omuWB<5R~wJxI%Yc%&*mij5jYm^RV?P{vz$P+kZUAp1C|LSv~WuRx5&RC-+Xu z3?`?8IwDg*n87c7UZNe9U2;41`+fNhyPR*Ytj6FNP66G?yb#iY*Y~?=mkRU}FKGs<^%#bO@UjyptlBB~4^Ft*VduJ;?t+k||ey1_ihx>x0ADiY%FmzxS7d#$8x-J6 zrd;_M6yS=iFLr|he92T1Kk+ww-oMrTR6s_{U3HT4Kwt-uw6r%m7mzpAS`*c5v}~#Z z{^!?Fkhbrv$c}Ll+3QQO0>F5TnhQWbKTk_Mw{nfa2?YPO+mnwcQ)#)4t=-59 z0P;s4A43rnyC>v86Bh)%eU2)R;4wG>;9CNK3SLceK$2V#%-}IBr4LTnKwwh<wU0I((K`}3t&z;FEg5MO42qQze7U`V93Cg1mS`4s?wAP6W3 z0+LeFqlXVh^M6!IT@?R|($76!d|lUa-2kInDU+0PG|$11Xs*3$y!iN_>%#Lq@;r}H zH^CGS01X03DarT!`8v4*N-6SvpQM!Jc^+ZLO4u5Iv)S$Ix<<#l61`qe*tQMJvU2-V z7-v})Y}cw=T0%*9RjztqVXV~jDz7-Nhv#u&?}S}AYjpNUfsNEp>hnRagNOuU{cf?lyi z4d`@F#aaLC%IhX+iJ}NfDJ;7Qxr^pZoR%qvPx-86jh|SxQl`UaPew_S);fIzol-om zU)D2HF@GDPiJO+$gk_&qNVErx>vT^A02GTwG+P}Aoa5-Aj+qg3O7XZ};2h0X2ae+` zYIp#^wX6d;j)P{agQuT+C*!+b9j z=kN)~o|IVU>a5cErnIOgtaV&JGl!pHt&2CZHXvbRGW?AxgfX_U{sOOGihAvRNNoTB N002ovPDHLkV1k*SOd0?H delta 826 zcmV-A1I7Hy1>FXaFn8O_`+w(@T&#+XT986~uh)Z4r&Brr1c6du>eN(F3xc#wfG{j5l=BpM5B|c> z-mlUEpvaz|pA-0<>cEE|d*bfW1qf=F0z@>TQqH68QT*4P@B5n+nB!R+As6BdpWM4$u*D{W?1! zZG`c!Wz*h!+Px2QT`C8lc)9DUJg}w>eUKuPo}CH+ZlH2N&~uAvJX#Yiwd-w9siX#= z5<~5@paq?W3qrFBwx?8#0iYA+&dvH$7?Bn<&VLZuf)F#SV7otQ3_wl?bO5%Xhx+g| zNM!>=0kaAt0ibk10Qfxu!BS0#n^mwms*@Rj$uNRRQB<|-$0sHMd;d1mU}OL^i9rX_ z_2ILMr{5rQ@84w4xV0k#zzxGg6Sg1}*{;t7Kt(la7$Hr>iWHCMu?~RV5~^W@Gyrf- zku$Rjxd0%cMG8p^H@q%a0HYqN$om*Tk+jSBtjas!AFsyzP$3gLsQ>@~07*qoM6N<$ Ef+xd;_5c6? diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/mag-0.png b/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/mag-0.png index e3b62418defd55dae0630bd3cead447a47cd65d0..0cd2b39382dec176e924440bf6f5da92773decd7 100644 GIT binary patch delta 102 zcmdnWG=Xt~VZ4{8i(^PcYjT1F>*55Fo~A$pF1Ldk5w6t8nCHcI2_aG?4mlykTe-Ho}AOmE843L4}HNZKSkG`aR-zyKM9K3Dj z`@W3h81p>Cw(aA%swy;1qg+=xcn=^9!>i_7=A!^vmSI^IxPPvTbzLz{6NX_xS(eI! zDF<&21VJG4JcnTzuq+GXIPOnT6k0X4!e@vyO(p020NAFl>l#7`t(sclGeD9g((}B1 z%QQ_e#?ZE{mj3PCrvbKG5JeHXu7l$^JAe=ZI#=)|fOq{(KW%^j$N(Am8v_?_%}OEb TwI=5P0000Gdv)|wFp}y+I(U!ACRS`Xx8TIGcCN5dd%qDZ7wp;g{ leO-n1CZ}YG9yS&R26a=emf!liB|uXdJYD@<);T3K0RRfwD{%k- literal 0 HcmV?d00001 diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/mag-2.png b/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/mag-2.png new file mode 100644 index 0000000000000000000000000000000000000000..0cd2b39382dec176e924440bf6f5da92773decd7 GIT binary patch literal 144 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}UY;(FArY;~ z2@Gdv)|wFp}y+I(U!ACRS`Xx8TIGcCN5dd%qDZ7wp;g{ leO-n1CZ}YG9yS&R26a=emf!liB|uXdJYD@<);T3K0RRfwD{%k- literal 0 HcmV?d00001 diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/mag-3.png b/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/mag-3.png new file mode 100644 index 0000000000000000000000000000000000000000..0cd2b39382dec176e924440bf6f5da92773decd7 GIT binary patch literal 144 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}UY;(FArY;~ z2@Gdv)|wFp}y+I(U!ACRS`Xx8TIGcCN5dd%qDZ7wp;g{ leO-n1CZ}YG9yS&R26a=emf!liB|uXdJYD@<);T3K0RRfwD{%k- literal 0 HcmV?d00001 diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/mag-4.png b/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/mag-4.png new file mode 100644 index 0000000000000000000000000000000000000000..0cd2b39382dec176e924440bf6f5da92773decd7 GIT binary patch literal 144 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}UY;(FArY;~ z2@Gdv)|wFp}y+I(U!ACRS`Xx8TIGcCN5dd%qDZ7wp;g{ leO-n1CZ}YG9yS&R26a=emf!liB|uXdJYD@<);T3K0RRfwD{%k- literal 0 HcmV?d00001 diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/mag-5.png b/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/mag-5.png new file mode 100644 index 0000000000000000000000000000000000000000..0cd2b39382dec176e924440bf6f5da92773decd7 GIT binary patch literal 144 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}UY;(FArY;~ z2@Gdv)|wFp}y+I(U!ACRS`Xx8TIGcCN5dd%qDZ7wp;g{ leO-n1CZ}YG9yS&R26a=emf!liB|uXdJYD@<);T3K0RRfwD{%k- literal 0 HcmV?d00001 diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/mag-unshaded-0.png b/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/mag-unshaded-0.png new file mode 100644 index 0000000000000000000000000000000000000000..bf63059c8734f78e93fd38d51ae9880ff9785548 GIT binary patch literal 133 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!3HF&`%2dVDIZT4$B>N1w`UA_8v;a_46&!3~J(KX*FyVo^ypYhlY0I2vGaOicCfoFB^s%+8R4XrCFpkrjs`9(!`{x(G fnStgoG}P~6*tL^)>usdsp59`&_8LDoQtQCW4?=6}Y2(i0LAZaiRkXm9N?vl6D* d?cfO(hQODchnS4Y{ek8&c)I$ztaD0e0sz9?DUARC literal 0 HcmV?d00001 diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/mag-unshaded-2.png b/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/mag-unshaded-2.png new file mode 100644 index 0000000000000000000000000000000000000000..19f174f53777f9f07cc0878c9a3020320007ff95 GIT binary patch literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}?w&4=ArY;~ z2@L^)>uk#AjQZV>hLzrB$y*9%4o&5Lus&VOjn%*=e4jh*BFO~+Gb fq~RLe)EF2({NQWy3}P<=8p+`4>gTe~DWM4f4ZtZe literal 0 HcmV?d00001 diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/mag-unshaded-3.png b/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/mag-unshaded-3.png new file mode 100644 index 0000000000000000000000000000000000000000..9d3259e367ece8b8646fad8df596047cf0c289d8 GIT binary patch literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}?w&4=ArY;~ z2@L^)>uk=ORsPuTM6e|^pujRmR+OI(Vt)wliU0Rm|mg+J-+n#TDM g)ouqhBxW)&WQhqoS>NO_02;~Q>FVdQ&MBb@0Plb&X#fBK literal 0 HcmV?d00001 diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/mag-unshaded-4.png b/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/mag-unshaded-4.png new file mode 100644 index 0000000000000000000000000000000000000000..fd294f5c4189629a7918413be74e795f5e67485b GIT binary patch literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Zk{fVArY-_ z&lvJDC^9%-OyXqia9}MfD7+kbfXD3AfpbnC9zXIkt+og;Fod7HdfG;}?weMj(+x@S m)04g|zgd0zH#5TnU*^545={F{52OQ4WbkzLb6Mw<&;$UGge_wL literal 0 HcmV?d00001 diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/mag-unshaded-5.png b/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/mag-unshaded-5.png new file mode 100644 index 0000000000000000000000000000000000000000..93bae57e7974fc3f2bf91829d86509547a3fe9b7 GIT binary patch literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}?w&4=ArY;~ z2@L^)>unXfS`>_EoV|NoC%SllqHVWQC4$p4c6j13G7atazg%$Hqq kW)D!Q+d&PGz7!^gS0*xt3Og;20gYtvboFyt=akR{01kyNWdHyG literal 0 HcmV?d00001 diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/meta.json b/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/meta.json index 5924518ad24..385d9486c08 100644 --- a/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/meta.json +++ b/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/meta.json @@ -1,47 +1,83 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Original sprite by META_mahn", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "bolt-open" - }, - { - "name": "mag-0" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "wielded-inhand-left", - "directions": 4 - }, - { - "name": "wielded-inhand-right", - "directions": 4 - }, - { - "name": "equipped-BACKPACK", - "directions": 4 - }, - { - "name": "equipped-SUITSTORAGE", - "directions": 4 - } - ] + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Original sprite by META_mahn. Modified by ASaltySeabass. Scope sprite based on the RMC14 miniscope.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-0" + }, + { + "name": "mag-unshaded-0", + "delays": [ + [ + 0.3, + 0.3 + ] + ] + }, + { + "name": "mag-1" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-2" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-3" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-4" + }, + { + "name": "mag-unshaded-4" + }, + { + "name": "mag-5" + }, + { + "name": "mag-unshaded-5" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] } diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/wielded-inhand-left.png b/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/wielded-inhand-left.png index 583884002e1cdfb1af15126eba04ccba39502aeb..8d9092c7badfe68c2a24369135c80d42a11c373d 100644 GIT binary patch delta 584 zcmV-O0=NCD2JQrqF@GpYL_t(|obB4bYTG~@2k@^-G=zXMTu~?&Fdajw4bIRfxIi<6 z3>mWJ3Hmg7i42}Hbf}g-fk$UF0xQI#H#iV7sBl>#A?r_clI@tl_p=x*-Tm%&Cu#Zp z03sqHA|fKPCxkFU2(#^Vtm;$OfqME6QcCpu{SUnfPTd8iRDW$^T5E)1h+eOk{pO9w z<7{4~lnM6FfYGnoSS1(NMlEg;?4Lm`ZV?25{n&~;-Wp%JpcAw5i3-=r=1u3jJUy{W zL@8x%e*bBlw~kJXsfu4Wey6m6AID8GS`n_}D5cCSoLb#K3#Yg|J%QG`Q@rB(oAN1b zK>GMfDNPhbOMg2ir8EGLBngBNSon81{|k%`e8h45=IJ~>JzFJ^-go~H0{|ZGXO5K8 zcze56(#92!)dOr3Ni2Y-XX(*Kjmq%oN;HogH}R6R|u z>uzKNh=_=Yh=_=Yh=_>D-ZuIK))}*Ne?V#*eFE!@St^d!sp}UQfBlS|*FJ%?43=H9 zEQhs?TZ~zXb8&5K`w^__?d_Jl%%-NlYV2YRofu==kI?u8th-;Jjjpk;&VRzTAHn)` z(%yg~&q4Em*S49oMdIcx_Z42xj7P1FsFSsBhbz*6Nipve7#_fCd)#_W%&ONSaUCpWT{_OX& z=J#{>j72qm25VOSTfnq}*=t?HHiwhE3-ldx8FL#aX)n+XC}OS`_{XaESYnaaEzO1R z-_KlhQ#V0~xAxxVme^g6jI++B$(+hHo6UN8-PJ4u8NSIo&TpTmT3GkT>a3Uy!?&`y zy9exSetGSBuH0JLB&M@uFezdoCGw&1^gP+a)$Ky1t^E$X6 z{rvE8&-*&BhI9Yo5*gX%^VR1cdHc2M~W!i7?*(rPr^h|UxOnrN~|ut|310mN9>k;ZbBDC zRm-^pa_?oB1o?gJY&e;0y1&+5k+Y$2_gy`kh?$3Wf0uuzv_N}aj*Z$@fvNi~>$iV7 z&Dy!I=3?9A`OXgREiwr@9vk&1868^0@y)qZU^Ro;jYVQ7yiYw}m$lWaC?IalQrQXO z9%P+S~;AmxCFlkzqA1kh4SXzF-w0^QrK-pt2F9sm+boFyt=akUIzyJV9&1hQy diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/wielded-inhand-right.png b/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/wielded-inhand-right.png index 8ef525529e305c5b7d7ad9f3ca6a1e3d10543a10..5b461526f6e739d479cf2751f02ed428cd68a576 100644 GIT binary patch delta 527 zcmV+q0`UF!1+)Z^FnBjE6bJBsN;+paxVCu)(NJ1!s0VfE*y&}+ zkSRkxLm{6gUm`=M3>oV0;nfIa0;U?`wZrRD8CgC>XIYIC`2QBe>E8Vhbn%>x3>r%H?e{>Fgyu;+^9Jsv-uC+0!s&;e#3jpBW9;}`he{AQYUR|$A zHK(4xZGF|{*=g`a9M%W&Y=+CT(~Sl6`?t32UNq&z=7;7v=a6T!xDAMisp^w&+k0<6 z4R-tkHXIJkdw*{tVj{9p7aEJ*N0++c=TB?;_SGw}Yi{TMfU14<3iOd1e`R!WZS_0$G=EJEwO)ZVP1nkLxt99ZuTbqz z=qopBQrR<5zn_oo8Hl;pZ_DngEj#LVc%MB3c{cm6IZD%PDHLkV1kt^|0@6h delta 723 zcmV;^0xbQs1os7yFnhio4-+B-u1U+qA{F076tNll}#w0@9(tZ-2BiIjwCbkHv#;YD|TZu5A$1 z_b~t}DOc@S0j^e-ning8O3GC`R)DLOrRK#7pptUcjuqf)WvO|w0;r^1wPOXiT3Kpd ztN&GPrzE{`RvgGdXN%BnsfLG@5LLGuSE8uy*^2CTuTOi7Jl27nW^-BieS3F{H zLOlomVopE@pr1RYK1l%P=`XK20T^;X_1W}k1WZ7k5lADuEDa3+umx?-CKv(8l1S0^ zFo2>}B=2}w0eKTInm<-R(JGR6Jgk7ci5JaZ=@sw;68k_ Date: Thu, 7 May 2026 05:35:55 -0400 Subject: [PATCH 2/4] Updated the expedition case and secvend purchase option. --- Resources/Locale/en-US/_HL/store/SecurityVending.ftl | 4 ++-- Resources/Prototypes/_HL/Catalog/uplink_catalog.yml | 8 ++++---- .../_NF/Catalog/Fills/Items/weapon_cases_expedition.yml | 4 +++- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Resources/Locale/en-US/_HL/store/SecurityVending.ftl b/Resources/Locale/en-US/_HL/store/SecurityVending.ftl index 52e1ffa96c6..e25a87acd69 100644 --- a/Resources/Locale/en-US/_HL/store/SecurityVending.ftl +++ b/Resources/Locale/en-US/_HL/store/SecurityVending.ftl @@ -27,5 +27,5 @@ uplink-security-hardsuit-command-desc = A heavily armored Colsec suit. Space pro uplink-security-Weapons-BigL-name = Big Leady uplink-security-Weapons-BigL-desc = An old yet faithful design, and a favorite among irregular forces on many worlds. -uplink-security-Weapons-railgun-name = NT-88 Peregrine -uplink-security-Weapons-railgun-desc = From NanoTrasen Skunkworks, entrusted to ColComm for field testing. +uplink-security-Weapons-railgun-name = NT-88 Marksman's Kit +uplink-security-Weapons-railgun-desc = A marksman's kit for the NT-88 peregrine, designed by NanoTrasen and entrusted to ColComm for field testing. Contains the railgun, two magazines, and a box of spare ammo. diff --git a/Resources/Prototypes/_HL/Catalog/uplink_catalog.yml b/Resources/Prototypes/_HL/Catalog/uplink_catalog.yml index 30cf6c9e457..0c35cb3cec1 100644 --- a/Resources/Prototypes/_HL/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/_HL/Catalog/uplink_catalog.yml @@ -45,10 +45,10 @@ id: UplinkSecurityRailgun name: uplink-security-Weapons-railgun-name description: uplink-security-Weapons-railgun-desc - productEntity: WeaponRailgunPeregrine + productEntity: WeaponCaseLongRailgunPeregrine icon: { sprite: _HL/Objects/Weapons/Guns/Rifles/peregrine.rsi, state: icon } cost: - FrontierUplinkCoin: 10 + FrontierUplinkCoin: 15 categories: - UplinkSecurityWeapons conditions: @@ -69,7 +69,7 @@ Telecrystal: 8 categories: - UplinkWeaponry - + - type: listing id: UplinkSyndieOmniHandRight name: uplink-syndie-omnihand-right-name @@ -82,7 +82,7 @@ Telecrystal: 6 categories: - UplinkCybernetics - + - type: listing id: UplinkSyndieOmniHandLeft name: uplink-syndie-omnihand-left-name diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml index f8ee85a9b5d..c1c040789d0 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml @@ -700,7 +700,9 @@ - id: WeaponRailgunPeregrine amount: 1 - id: MagazineRailgunPeregrine - amount: 2 + amount: 1 + - id: AmmoBox15mmSabot + amount: 1 - type: entity parent: WeaponCaseFlammable From ba0bcc705ef4176233c3c949ab3b82961a132a0d Mon Sep 17 00:00:00 2001 From: ASaltySeabass Date: Thu, 7 May 2026 17:12:01 -0400 Subject: [PATCH 3/4] Removed nonfunctional lathe recipe. --- .../Prototypes/_HL/Recipes/Lathes/security.yml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/Resources/Prototypes/_HL/Recipes/Lathes/security.yml b/Resources/Prototypes/_HL/Recipes/Lathes/security.yml index 6536205e184..d8f27858562 100644 --- a/Resources/Prototypes/_HL/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/_HL/Recipes/Lathes/security.yml @@ -11,19 +11,6 @@ Silver: 50 Gold: 50 -- type: latheRecipe - parent: BaseAmmoBoxRecipe - id: MagazineBoxRailgunPeregrine - result: MagazineRailgunPeregrineEmpty - completetime: 10 - materials: - Plasteel: 500 - Plastic: 500 - Steel: 500 - Glass: 200 - Silver: 50 - Gold: 50 - # Security Borg limbs - type: latheRecipe From 0fbddebe8363b5595dee529ab6e032ba346b80e4 Mon Sep 17 00:00:00 2001 From: ASaltySeabass Date: Thu, 14 May 2026 16:35:43 -0400 Subject: [PATCH 4/4] Fixed merge conflict --- .../AdminCharacterBundles/cyn182_colcomm.yml | 113 +++++++++++++++++- 1 file changed, 111 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_HL/Admeme/AdminCharacterBundles/cyn182_colcomm.yml b/Resources/Prototypes/_HL/Admeme/AdminCharacterBundles/cyn182_colcomm.yml index 59346ed0be5..86cffd2cdc7 100644 --- a/Resources/Prototypes/_HL/Admeme/AdminCharacterBundles/cyn182_colcomm.yml +++ b/Resources/Prototypes/_HL/Admeme/AdminCharacterBundles/cyn182_colcomm.yml @@ -160,7 +160,7 @@ - type: entity id: JetpackBlackLiquidNitrogen parent: JetpackBlack - name: Jetpack + name: Jetpack suffix: CYN182, Admin categories: [ HideSpawnMenu ] components: @@ -251,6 +251,115 @@ suffix: CYN182, Filled categories: [ HideSpawnMenu ] components: + - type: Storage # Shutting up the fucking test. + maxItemSize: Small + grid: + - 0,0,5,3 + whitelist: + components: + - Handcuff + tags: + - Magazine9x19mmSpecial + - Magazine762x39mmSubsonic + - Magazine127x99mm + - HLMagazineCaselessRifle + - HLMagazineCaselessRifleShort + - HLMagazinePistolCaselessRifle + - NFMagazineRifle20 + - MagazinePistolSubMachineGun + - NFMagazinePistol45 + - NFMagazineSubMachineGunTopMountedPistol35 + - NFMagazineSubMachineGunPistol45 + - NFMagazinePistol35 + - NFMagazineHighCapacityPistol35 + - NFMagazineSubMachineGunPistol35 + - NFMagazineClipRifle20 + - NFMagazineRifle30 + - NFMagazineLowCapacityRifle30 + - NFMagazineDrumRifle20 + - NFMagazineSubMachineGunnTopMountedPistol35 + - MagazineShotgun + - NFMagazineBoxRifle30 + - MagazineMagnum + - MagazineMagnumSubMachineGun + - MagazineGrenade + - MagazinePistolSubMachineGunTopMounted + - MagazinePistol + - MagazinePistolHighCapacity + - MagazinePistolSubMachineGunn + - MagazineLightRifleBox + - MagazineLightRifle + - MagazineLightRiflePan + - MagazineCaselessRifle + - MagazinePistolCaselessRifle + - MagazineRifle + - MagazineNovaliteC1 + - NFMagazineRi20 + - NFMagazineBoRifle30 + - NFMagazineCrifle20 + - NFMagazineDrRifle20 + - NFMagazinePi35 + - NFMagazineHiCaPistol35 + - NFMagazineSuMaGunPistol35 + - MagazineAMR + - MagazineRailgunPeregrine + - Magazine75Bolt + - MagazineRiotGun + - MagazineEsar550Tag + - ForgedRifleMagazine + - Magazine762x51mmFMJ + - Magazine762x51mmLowCapacityFMJ + - Magazine762x51mmBox + - Magazine762x54mmRFMJ + - Magazine762x54mmRBox + - Magazine556x45mmFMJ + - Magazine556x45mmBox + - Magazine762x39mmFMJ + - Magazine762x39mmLowCapacityFMJ + - Magazine762x39mmBox + - Magazine46x30mmPistolFMJ + - Magazine46x30mmPistolHighCapacityFMJ + - Magazine46x30mmSubMachineGunFMJ + - Magazine46x30mmSubMachineGunTopMountedFMJ + - Magazine46x30mmFMJBox + - Magazine45_ACPPistolFMJ + - Magazine45_ACPPistolHighCapacityFMJ + - Magazine45_ACPSubMachineGunFMJ + - Magazine45_ACPSubMachineGunTopMountedFMJ + - Magazine45_ACPFMJBox + - Magazine45_magnumPistolFMJ + - Magazine9x19mm + - Magazine9x19mmImprovised + - Magazine9x19mmSMGImprovised + - Magazine9x19mmPistolFMJ + - Magazine9x19mmPistolHighCapacityFMJ + - Magazine9x19mmSubMachineGunFMJ + - Magazine9x19mmSubMachineGunTopMountedFMJ + - Magazine9x19mmFMJBox + - Magazine57x28mmPistolFMJ + - Magazine57x28mmPistolHighCapacityFMJ + - Magazine57x28mmSubMachineGunFMJ + - Magazine57x28mmSubMachineGunTopMountedFMJ + - Magazine57x28mmFMJBox + - MagazineDP29 + - Magazine8x65mmSKR + - MagazineBox8x65mmSKR + - Magazine12_gaugeBuckshot + - MagazineDMR + - MagazineAsmgt + - MagazineBattery + - MagazinePistolDP + - MagazineRifleM52 + - MagazineSMGPPSH + - MagazineSMGUzi + - MagazineCalico + - Magazine635x40mmCaseless + - Magazine762x39mmPan + - Magazine635x40mmCaselessPistol + - Magazine12_gaugeBuckshot + - Magazine45_magnumSubMachineGunFMJ + - Magazine8x65mmSKR # mono + - Magazine40mm - type: Tag tags: - Admin @@ -584,4 +693,4 @@ maxVol: 20 reagents: - ReagentId: Tricordrazine - Quantity: 20 \ No newline at end of file + Quantity: 20