diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 8e8e5a96c2..45b6c53870 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -980,6 +980,8 @@ id: WeaponLaserGunXenoborg name: xenoborg laser gun components: + - type: BatteryAmmoProvider + proto: XenoborgLaser - type: Sprite sprite: Objects/Weapons/Guns/Battery/xenoborg_laser_gun.rsi layers: @@ -993,8 +995,18 @@ id: WeaponLaserCannonXenoborg name: xenoborg laser cannon components: + - type: BatteryAmmoProvider + proto: XenoborgHeavyLaser + fireCost: 100 + - type: Sprite + sprite: Objects/Weapons/Guns/Battery/xenoborg_laser_cannon.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-unshaded-4 + map: [ "enum.GunVisualLayers.MagUnshaded" ] - type: BatterySelfRecharger - autoRechargeRate: 30 + autoRechargeRate: 50 # "remove" wield bonus and penalty so borgs can use it - type: GunWieldBonus minAngle: 0 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml index 4911d514a4..02fdf9bc72 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml @@ -77,6 +77,27 @@ types: Heat: 17 +- type: entity + parent: LaserHitscanBase + id: XenoborgLaser + name: blue amplified laser ray + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + damage: + types: + Heat: 17 + - type: HitscanBasicVisuals + muzzleFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: muzzle_beam_xenoborg + travelFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: beam_xenoborg + impactFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: impact_beam_xenoborg + - type: entity parent: LaserHitscanBase id: RedHeavyLaser @@ -121,6 +142,27 @@ - type: HitscanIgnite igniteChance: 0.75 +- type: entity + parent: LaserHitscanBase + id: XenoborgHeavyLaser + name: blue high-energy laser ray + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + damage: + types: + Heat: 25 + - type: HitscanBasicVisuals + muzzleFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: muzzle_beam_xenoborg_heavy + travelFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: beam_xenoborg_heavy + impactFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: impact_beam_xenoborg_heavy + - type: entity parent: LaserHitscanBase id: RedLaserPractice diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/xenoborg_laser_cannon.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/xenoborg_laser_cannon.rsi/base.png new file mode 100644 index 0000000000..7432ea9ff4 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/xenoborg_laser_cannon.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/xenoborg_laser_cannon.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Battery/xenoborg_laser_cannon.rsi/icon.png new file mode 100644 index 0000000000..5e7a417ffd Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/xenoborg_laser_cannon.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/xenoborg_laser_cannon.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/xenoborg_laser_cannon.rsi/mag-unshaded-1.png new file mode 100644 index 0000000000..ecca80e70a Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/xenoborg_laser_cannon.rsi/mag-unshaded-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/xenoborg_laser_cannon.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/xenoborg_laser_cannon.rsi/mag-unshaded-2.png new file mode 100644 index 0000000000..9cdf85aa9a Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/xenoborg_laser_cannon.rsi/mag-unshaded-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/xenoborg_laser_cannon.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/xenoborg_laser_cannon.rsi/mag-unshaded-3.png new file mode 100644 index 0000000000..64ef3efd48 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/xenoborg_laser_cannon.rsi/mag-unshaded-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/xenoborg_laser_cannon.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/xenoborg_laser_cannon.rsi/mag-unshaded-4.png new file mode 100644 index 0000000000..de5f40c90a Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/xenoborg_laser_cannon.rsi/mag-unshaded-4.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/xenoborg_laser_cannon.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/xenoborg_laser_cannon.rsi/meta.json new file mode 100644 index 0000000000..f2acef0235 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Battery/xenoborg_laser_cannon.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Made by Samuka-C (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-unshaded-4" + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/beam_xenoborg.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/beam_xenoborg.png new file mode 100644 index 0000000000..ce47e62d83 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/beam_xenoborg.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/beam_xenoborg_heavy.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/beam_xenoborg_heavy.png new file mode 100644 index 0000000000..bd9c2a7592 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/beam_xenoborg_heavy.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/impact_beam_xenoborg.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/impact_beam_xenoborg.png new file mode 100644 index 0000000000..57175d7eb3 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/impact_beam_xenoborg.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/impact_beam_xenoborg_heavy.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/impact_beam_xenoborg_heavy.png new file mode 100644 index 0000000000..f3c7f23635 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/impact_beam_xenoborg_heavy.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/meta.json index 07d5d17fd4..19f9ac4f4e 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken and modified from cev-eris at https://github.com/discordia-space/CEV-Eris/tree/7ff8f28ea4de734f3cc3cb70f2d4e4b4263a988d, debug sprites by slarticodefast(GitHub), _xeno_fire sprites by august-sun(Github)", + "copyright": "Taken and modified from cev-eris at https://github.com/discordia-space/CEV-Eris/tree/7ff8f28ea4de734f3cc3cb70f2d4e4b4263a988d, debug sprites by slarticodefast(GitHub), _xeno_fire sprites by august-sun(Github), xenoborg sprites recolored by Samuka-C (github)", "size": { "x": 32, "y": 32 @@ -97,6 +97,36 @@ ] ] }, + { + "name": "muzzle_beam_xenoborg", + "delays": [ + [ + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002 + ] + ] + }, + { + "name": "muzzle_beam_xenoborg_heavy", + "delays": [ + [ + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002 + ] + ] + }, { "name": "beam_heavy2", "delays": [ @@ -127,6 +157,36 @@ ] ] }, + { + "name": "beam_xenoborg", + "delays": [ + [ + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002 + ] + ] + }, + { + "name": "beam_xenoborg_heavy", + "delays": [ + [ + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002 + ] + ] + }, { "name": "impact_beam_heavy", "delays": [ @@ -157,6 +217,36 @@ ] ] }, + { + "name": "impact_beam_xenoborg", + "delays": [ + [ + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002 + ] + ] + }, + { + "name": "impact_beam_xenoborg_heavy", + "delays": [ + [ + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002 + ] + ] + }, { "name": "muzzle_omni", "delays": [ diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/muzzle_beam_xenoborg.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/muzzle_beam_xenoborg.png new file mode 100644 index 0000000000..66a45dab71 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/muzzle_beam_xenoborg.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/muzzle_beam_xenoborg_heavy.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/muzzle_beam_xenoborg_heavy.png new file mode 100644 index 0000000000..8d2948a90a Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/muzzle_beam_xenoborg_heavy.png differ