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

Beam Cannon #2221

Closed
wants to merge 17 commits into from
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -261,3 +261,37 @@
steps: 5
zeroVisible: true
- type: Appearance

- type: entity
name: Beam Cannon
parent: [BaseWeaponBattery, BaseGunWieldable, BaseSecurityContraband]
id: WeaponBeamCannon
description: "For when a single shot just isn't enough"
components:
- type: Sprite
sprite: DeltaV/Objects/Weapons/Guns/Battery/beam_cannon.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-unshaded-0
map: ["enum.GunVisualLayers.MagUnshaded"]
shader: unshaded
- type: Clothing
sprite: DeltaV/Objects/Weapons/Guns/Battery/beam_cannon.rsi
- type: Gun
soundGunshot:
path: /Audio/DeltaV/Weapons/Guns/Gunshots/beamcannon.ogg
selectedMode: FullAuto
fireRate: 15
availableModes: FullAuto
- type: Battery
maxCharge: 3000
startingCharge: 3000
- type: HitscanBatteryAmmoProvider
proto: BeamLaser
fireCost: 10
- type: MagazineVisuals
magState: mag
steps: 5
zeroVisible: true
- type: Appearance
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,18 @@
impactFlash:
sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
state: impact_omni

- type: hitscan
id: BeamLaser
damage:
types:
Heat: 2
muzzleFlash:
sprite: DeltaV/Objects/Weapons/Guns/Projectiles/projectiles.rsi
state: muzzle_laser
travelFlash:
sprite: DeltaV/Objects/Weapons/Guns/Projectiles/projectiles.rsi
state: beam
impactFlash:
sprite: DeltaV/Objects/Weapons/Guns/Projectiles/projectiles.rsi
state: impact_laser
10 changes: 10 additions & 0 deletions Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -224,3 +224,13 @@
Steel: 1000
Plastic: 800

- type: latheRecipe
parent: BaseWeaponRecipeLong
id: WeaponBeamCannon
result: WeaponBeamCannon
materials:
Steel: 2000
Glass: 1000
Plastic: 500
Gold: 250
Plasma: 500
2 changes: 2 additions & 0 deletions Resources/Prototypes/Entities/Structures/Machines/lathe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -438,6 +438,7 @@
- AdvancedTruncheon
- LauncherSyringe
- MiniSyringe
- WeaponBeamCannon
# End DeltaV additions

- type: entity
Expand Down Expand Up @@ -943,6 +944,7 @@
- ClothingOuterHardsuitSyndieReverseEngineered
- ClothingShoesBootsSecurityMagboots
- AdvancedTruncheon
- WeaponBeamCannon
# End DeltaV additions
- type: MaterialStorage
whitelist:
Expand Down
3 changes: 3 additions & 0 deletions Resources/Prototypes/Research/arsenal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,9 @@
recipeUnlocks:
- WeaponLaserCannon
- WeaponXrayCannon
# DeltaV - Adds Beam cannon
- WeaponBeamCannon
# End of modified code

# DeltaV: merged with concentrated laser weaponry
#- type: technology
Expand Down
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.
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.
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.
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.
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.
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,62 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/167a810bc8534a56c74ffa8f1373acd3b1ac70ee/icons/obj/guns/energy/xray.dmi, backpack sprite by peptide, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244, Edited for DeltaV by Stop_Sign",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "base"
},
{
"name": "mag-unshaded-0",
"delays": [
[
0.3,
0.3
]
]
},
{
"name": "mag-unshaded-1"
},
{
"name": "mag-unshaded-2"
},
{
"name": "mag-unshaded-3"
},
{
"name": "mag-unshaded-4"
},
{
"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
}
]
}
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.
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,59 @@
{
"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",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "muzzle_laser",
"delays": [
[
0.01,
0.01,
0.01,
0.02,
0.03,
0.02,
0.02,
0.02,
0.2
]
]
},
{
"name": "beam",
"delays": [
[
0.01,
0.01,
0.01,
0.02,
0.03,
0.02,
0.02,
0.02,
0.2
]
]
},
{
"name": "impact_laser",
"delays": [
[
0.01,
0.01,
0.01,
0.02,
0.03,
0.02,
0.02,
0.02,
0.2
]
]
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading