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 920ceca65e6..00000000000 Binary files a/Resources/Audio/_HL/Weapons/Guns/Rifles/peregrineShoot.ogg and /dev/null differ 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/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/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/Admeme/AdminCharacterBundles/cyn182_colcomm.yml b/Resources/Prototypes/_HL/Admeme/AdminCharacterBundles/cyn182_colcomm.yml index 7573fc38e42..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: @@ -302,7 +302,7 @@ - NFMagazineHiCaPistol35 - NFMagazineSuMaGunPistol35 - MagazineAMR - - MagazineRailgunTag + - MagazineRailgunPeregrine - Magazine75Bolt - MagazineRiotGun - MagazineEsar550Tag 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/_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..d8f27858562 100644 --- a/Resources/Prototypes/_HL/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/_HL/Recipes/Lathes/security.yml @@ -1,12 +1,15 @@ - 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 - Plasma: 500 # Security Borg limbs diff --git a/Resources/Prototypes/_HL/tags.yml b/Resources/Prototypes/_HL/tags.yml index 7964b15724a..633fc6877eb 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 fad0b77486c..b0da2c805aa 100644 --- a/Resources/Prototypes/_Mono/Recipes/Lathes/Packs/ammo.yml +++ b/Resources/Prototypes/_Mono/Recipes/Lathes/Packs/ammo.yml @@ -374,7 +374,8 @@ - AmmoBox23x75mmSlug - AmmoBox23x75mmDozd # HL - - MagRailgun + - MagazineRailgunPeregrine + - AmmoBox15mmSabot - AmmoBox46x30mmBig - AmmoBox556x45mmBigFMJ - AmmoBox635x40mmCaselessBig @@ -626,7 +627,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..c1c040789d0 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml @@ -699,8 +699,10 @@ contents: - id: WeaponRailgunPeregrine amount: 1 - - id: MagazineRailgun - amount: 2 + - id: MagazineRailgunPeregrine + amount: 1 + - id: AmmoBox15mmSabot + amount: 1 - type: entity parent: WeaponCaseFlammable 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 00000000000..507b1558f5c Binary files /dev/null and b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Boxes/15mm_sabot.rsi/base.png differ diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Boxes/15mm_sabot.rsi/mag-1.png b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Boxes/15mm_sabot.rsi/mag-1.png new file mode 100644 index 00000000000..c3746f4ea0c Binary files /dev/null and b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Boxes/15mm_sabot.rsi/mag-1.png differ diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Boxes/15mm_sabot.rsi/mag-2.png b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Boxes/15mm_sabot.rsi/mag-2.png new file mode 100644 index 00000000000..c38ffa37b8e Binary files /dev/null and b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Boxes/15mm_sabot.rsi/mag-2.png differ 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 00000000000..84c8142325c Binary files /dev/null and b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Boxes/15mm_sabot.rsi/mag-3.png differ 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 00000000000..02f5a6b25fb Binary files /dev/null and b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Casings/15mm_casing.rsi/base.png differ 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 00000000000..ef5e8935e1b Binary files /dev/null and b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Casings/15mm_casing.rsi/improvised.png differ diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Casings/15mm_casing.rsi/meta.json b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Casings/15mm_casing.rsi/meta.json new file mode 100644 index 00000000000..20fc1eef1e0 --- /dev/null +++ b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Casings/15mm_casing.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Based on the railgun_slug sprite from NSV-13. Modified by ASaltySeabass", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "improvised" + } + ] +} diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag.rsi/base.png b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag.rsi/base.png new file mode 100644 index 00000000000..56e308a2d67 Binary files /dev/null and b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag.rsi/base.png differ 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 00000000000..6386cc1a0df Binary files /dev/null and b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag.rsi/mag-1.png differ 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 00000000000..6386cc1a0df Binary files /dev/null and b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag.rsi/mag-2.png differ 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 00000000000..6386cc1a0df Binary files /dev/null and b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag.rsi/mag-3.png differ 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 00000000000..6386cc1a0df Binary files /dev/null and b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag.rsi/mag-4.png differ 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 00000000000..6386cc1a0df Binary files /dev/null and b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag.rsi/mag-5.png differ 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 00000000000..8d05b9c07d2 Binary files /dev/null and b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag.rsi/mag-unshaded-1.png differ 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 00000000000..ad209bfd7b2 Binary files /dev/null and b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag.rsi/mag-unshaded-2.png differ 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 00000000000..ee89b7e20b3 Binary files /dev/null and b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag.rsi/mag-unshaded-3.png differ 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 00000000000..2cf0f214414 Binary files /dev/null and b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag.rsi/mag-unshaded-4.png differ 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 00000000000..9fde0fbeeb3 Binary files /dev/null and b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag.rsi/mag-unshaded-5.png differ 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 00000000000..d3830b28a12 Binary files /dev/null and b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag_improvised.rsi/base.png differ diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag_improvised.rsi/mag-1.png b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag_improvised.rsi/mag-1.png new file mode 100644 index 00000000000..0fbed29ea51 Binary files /dev/null and b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag_improvised.rsi/mag-1.png differ diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag_improvised.rsi/mag-2.png b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag_improvised.rsi/mag-2.png new file mode 100644 index 00000000000..f4808c352eb Binary files /dev/null and b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag_improvised.rsi/mag-2.png differ 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 00000000000..dc6fa04e075 Binary files /dev/null and b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Magazine/Peregrine/peregrine_mag_improvised.rsi/mag-3.png differ 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 1504260c911..00000000000 Binary files a/Resources/Textures/_HL/Objects/Weapons/Guns/Projectiles/railgun.rsi/impact_railgun.png and /dev/null differ 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 b62f6654aa9..00000000000 Binary files a/Resources/Textures/_HL/Objects/Weapons/Guns/Projectiles/railgun.rsi/muzzle_railgun.png and /dev/null differ 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 b62175fe374..00000000000 Binary files a/Resources/Textures/_HL/Objects/Weapons/Guns/Projectiles/railgun.rsi/railgun.png and /dev/null differ 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 00000000000..51108919991 Binary files /dev/null and b/Resources/Textures/_HL/Objects/Weapons/Guns/Projectiles/railgunprojectiles.rsi/dart.png differ diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Projectiles/railgunprojectiles.rsi/meta.json b/Resources/Textures/_HL/Objects/Weapons/Guns/Projectiles/railgunprojectiles.rsi/meta.json new file mode 100644 index 00000000000..a4cb453d18b --- /dev/null +++ b/Resources/Textures/_HL/Objects/Weapons/Guns/Projectiles/railgunprojectiles.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Just a slightly tweaked variant of the default projectile sprite. Modified by ASaltySeabass", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dart" + } + ] +} diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/base.png b/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/base.png index e471e91ab2e..7ef3facb460 100644 Binary files a/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/base.png and b/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/base.png differ 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 11d37d7bc1b..00000000000 Binary files a/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/bolt-open.png and /dev/null differ diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/equipped-BACKPACK.png b/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/equipped-BACKPACK.png index 888e4220bda..ac855d3340d 100644 Binary files a/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/equipped-BACKPACK.png and b/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/equipped-BACKPACK.png differ 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 888e4220bda..ac855d3340d 100644 Binary files a/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/equipped-SUITSTORAGE.png and b/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/equipped-SUITSTORAGE.png differ 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 58d6974a644..d4145947458 100644 Binary files a/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/icon.png and b/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/icon.png differ 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 2156ebcb262..158eb157d46 100644 Binary files a/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/inhand-left.png and b/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/inhand-left.png differ diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/inhand-right.png b/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/inhand-right.png index 585680331ce..edf334daceb 100644 Binary files a/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/inhand-right.png and b/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/inhand-right.png differ 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 e3b62418def..0cd2b39382d 100644 Binary files a/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/mag-0.png and b/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/mag-0.png differ diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/mag-1.png b/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/mag-1.png new file mode 100644 index 00000000000..0cd2b39382d Binary files /dev/null and b/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/mag-1.png differ 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 00000000000..0cd2b39382d Binary files /dev/null and b/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/mag-2.png differ 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 00000000000..0cd2b39382d Binary files /dev/null and b/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/mag-3.png differ 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 00000000000..0cd2b39382d Binary files /dev/null and b/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/mag-4.png differ 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 00000000000..0cd2b39382d Binary files /dev/null and b/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/mag-5.png differ 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 00000000000..bf63059c873 Binary files /dev/null and b/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/mag-unshaded-0.png differ diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/mag-unshaded-1.png b/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/mag-unshaded-1.png new file mode 100644 index 00000000000..afc47fc8b6d Binary files /dev/null and b/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/mag-unshaded-1.png differ 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 00000000000..19f174f5377 Binary files /dev/null and b/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/mag-unshaded-2.png differ 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 00000000000..9d3259e367e Binary files /dev/null and b/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/mag-unshaded-3.png differ 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 00000000000..fd294f5c418 Binary files /dev/null and b/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/mag-unshaded-4.png differ 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 00000000000..93bae57e797 Binary files /dev/null and b/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/mag-unshaded-5.png differ 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 583884002e1..8d9092c7bad 100644 Binary files a/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/wielded-inhand-left.png and b/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/wielded-inhand-left.png differ 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 8ef525529e3..5b461526f6e 100644 Binary files a/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/wielded-inhand-right.png and b/Resources/Textures/_HL/Objects/Weapons/Guns/Rifles/peregrine.rsi/wielded-inhand-right.png differ