Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Energy Shotgun Fix #471

Merged
merged 7 commits into from
Jan 10, 2025
Merged
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1042,9 +1042,21 @@
soundHit:
collection: MeatLaserImpact

- type: entity
name: energy bolt
id: BulletEnergyGun
parent: BulletEnergyGunLaser
noSpawn: true
components:
- type: Projectile
impactEffect: BulletImpactEffectRedDisabler
damage:
types:
Heat: 5 # Slightly more damage than the 17heat from the Captain's Hitscan lasgun

- type: entity
name: wide laser barrage
id: BulletLaserSpread
categories: [ HideSpawnMenu ]
parent: BulletEnergyGunLaser
parent: BulletEnergyGun

Original file line number Diff line number Diff line change
@@ -76,7 +76,7 @@
- state: icon-Advmeasures
- type: ItemBorgModule
items:
- WeaponEnergyShotgun
- WeaponBorgEnergyShotgun
- BorgWeaponXrayCannon

- type: entity
42 changes: 35 additions & 7 deletions Resources/Prototypes/Floof/Entities/Objects/Weapons/guns.yml
Original file line number Diff line number Diff line change
@@ -99,7 +99,7 @@

- type: entity
name: energy shotgun
parent: BaseWeaponBattery
parent: [BaseWeaponBattery, BaseGunWieldable]
id: WeaponEnergyShotgun
description: A one-of-a-kind prototype energy weapon that uses various shotgun configurations. It offers the possibility of both lethal and non-lethal shots, making it a versatile weapon.
components:
@@ -120,12 +120,6 @@
- type: ProjectileBatteryAmmoProvider
proto: eShellShotgun
fireCost: 150
- type: BatteryWeaponFireModes
fireModes:
- proto: eShellShotgun
fireCost: 150
- proto: BulletDisablerSmg
fireCost: 120
- type: Item
size: Large
shape:
@@ -138,6 +132,40 @@
- type: StealTarget
stealGroup: WeaponEnergyShotgun
- type: GunRequiresWield #remove when inaccuracy on spreads is fixed
- type: Battery
maxCharge: 1200
startingCharge: 1200
- type: BatterySelfRecharger
autoRecharge: true
autoRechargeRate: 24

- type: entity
name: borg energy shotgun
parent: BaseWeaponBattery
id: WeaponBorgEnergyShotgun
description: A one-of-a-kind prototype energy weapon that uses various shotgun configurations. It offers the possibility of both lethal and non-lethal shots, making it a versatile weapon.
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Battery/energy_shotgun.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-unshaded-4
map: ["enum.GunVisualLayers.MagUnshaded"]
shader: unshaded
- type: Gun
fireRate: 2
soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg
- type: ProjectileBatteryAmmoProvider
proto: eShellShotgun
fireCost: 150
- type: Item
size: Large
shape:
- 0,0,3,1
sprite: Objects/Weapons/Guns/Battery/inhands_64x.rsi
heldPrefix: energy
- type: Battery
maxCharge: 1200
startingCharge: 1200
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Energy Shotgun inhands made by Boaz1111 based on the energy shotgun icon sprite made by Papermaker48 for SS14",
"size": {
"x": 64,
"y": 64
},
"states": [
{
"name": "energy-inhand-left",
"directions": 4
},
{
"name": "energy-inhand-right",
"directions": 4
},
{
"name": "wielded-inhand-left",
"directions": 4
},
{
"name": "wielded-inhand-right",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.