diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml index 0ebfdc56909..071c2403dc1 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml @@ -44,6 +44,29 @@ - type: Appearance - type: AmmoCounter +- type: entity + id: WeaponMechCombatHeavyRifle + name: Mounted Heavy Rifle Gun + description: A gun for battlemechs, firing Antimaterial bullet. + suffix: Mech Weapon, Gun, Combat, Anti + parent: [ BaseMechWeaponRange, CombatMechEquipment ] + components: + - type: Sprite + sprite: Objects/Specific/Mech/mecha_equipment.rsi + state: mecha_antimatrifle + - type: Gun + fireRate: 2 + selectedMode: FullAuto + availableModes: + - FullAuto + soundGunshot: + path: /Audio/_Sunrise/Weapons/Guns/Snipers/Bauer127/bauer127_shot.ogg + - type: ProjectileBatteryAmmoProvider + proto: CartridgeAntiMateriel + fireCost: 45 + - type: Appearance + - type: AmmoCounter + - type: entity id: WeaponMechCombatSolarisLaser name: CH-LC "Solaris" laser cannon diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml index 88cfbb011a4..77dce0315fe 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml @@ -50,7 +50,7 @@ - type: entity id: WeaponMechCombatPirateCannon name: Mounted PirateCannon - description: An ancient heavy machine gun given new life as a mech-mounted gun + description: An ancient heavy gun given new life as a mech-mounted gun suffix: Mech Weapon, Gun, Combat, Pirate parent: [ BaseMechWeaponRange, CombatMechEquipment ] components: @@ -75,7 +75,7 @@ - type: entity id: WeaponMechCombatPirateGrapeshot name: Mounted PirateGrapeshot - description: An ancient heavy machine gun given new life as a mech-mounted gun + description: An ancient heavy gun given new life as a mech-mounted gun suffix: Mech Weapon, Gun, Combat, Pirate parent: [ BaseMechWeaponRange, CombatMechEquipment ] components: @@ -100,7 +100,7 @@ - type: entity id: WeaponMechCombatPirateGlassshot name: Mounted PirateGlassshot - description: An ancient heavy machine gun given new life as a mech-mounted gun + description: An ancient heavy gun given new life as a mech-mounted gun suffix: Mech Weapon, Gun, Combat, Pirate parent: [ BaseMechWeaponRange, CombatMechEquipment ] components: @@ -150,3 +150,26 @@ fireCost: 6 - type: Appearance - type: AmmoCounter + +- type: entity + id: WeaponMechCombatDuster + name: Mounted EXP-220 Duster + description: An heavy Auto Cannon as a mech-mounted gun with Frag ammo + suffix: Mech Weapon, Gun, Combat + parent: [ BaseMechWeaponRange, CombatMechEquipment ] + components: + - type: Sprite + sprite: Objects/Specific/Mech/mecha_equipment.rsi + state: mecha_autocannon + - type: Gun + fireRate: 0.35 + selectedMode: FullAuto + availableModes: + - FullAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/ship_duster.ogg + - type: ProjectileBatteryAmmoProvider + proto: GrenadeFrag + fireCost: 140 + - type: Appearance + - type: AmmoCounter diff --git a/Resources/Textures/Objects/Specific/Mech/mecha_equipment.rsi/mecha_antimatrifle.png b/Resources/Textures/Objects/Specific/Mech/mecha_equipment.rsi/mecha_antimatrifle.png new file mode 100644 index 00000000000..3495a1e2439 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/mecha_equipment.rsi/mecha_antimatrifle.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha_equipment.rsi/mecha_autocannon.png b/Resources/Textures/Objects/Specific/Mech/mecha_equipment.rsi/mecha_autocannon.png new file mode 100644 index 00000000000..c371a069081 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/mecha_equipment.rsi/mecha_autocannon.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha_equipment.rsi/meta.json b/Resources/Textures/Objects/Specific/Mech/mecha_equipment.rsi/meta.json index 404ed5db463..3e29d643ec4 100644 --- a/Resources/Textures/Objects/Specific/Mech/mecha_equipment.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Mech/mecha_equipment.rsi/meta.json @@ -223,6 +223,25 @@ ] ] }, + { + "name": "mecha_antimatrifle", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, { "name": "mecha_solaris", "delays": [ @@ -249,6 +268,32 @@ ] ] }, + { + "name": "mecha_autocannon", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, { "name": "mecha_firedart" }, diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Projectiles/hitscan_tracer.rsi/grenade.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Projectiles/hitscan_tracer.rsi/grenade.png new file mode 100644 index 00000000000..56a8a191fc3 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Projectiles/hitscan_tracer.rsi/grenade.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Projectiles/hitscan_tracer.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Projectiles/hitscan_tracer.rsi/meta.json index 25cd862a24e..dd1824c4272 100644 --- a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Projectiles/hitscan_tracer.rsi/meta.json +++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Projectiles/hitscan_tracer.rsi/meta.json @@ -22,6 +22,9 @@ { "name": "piercing" }, + { + "name": "grenade" + }, { "name": "rubber" },