Skip to content

Laserbuff #525

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.

Sign up for GitHub

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

Open
WazuraWasTaken wants to merge 54 commits into
base: master
Choose a base branch
from
Open

Laserbuff #525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
d7cb1af
Makes most Battery Guns have alot more ammo, their dmg is fine but ne…
WazuraWasTaken Jan 15, 2026
284a187
dmg buff for mag lasers
WazuraWasTaken Jan 15, 2026
3b0bbce
Adjust fireCost for battery gun ammo providers
WazuraWasTaken Jan 15, 2026
61b749f
Aren't these suppose to be good?
WazuraWasTaken Jan 15, 2026
34cd1e1
Update fire cost and recharge pause time in battery guns
WazuraWasTaken Jan 15, 2026
a3f42f4
Update justice.yml
WazuraWasTaken Jan 15, 2026
95f9f72
Slight battery change
WazuraWasTaken Jan 15, 2026
2465513
Add comments to fireCost in battery_guns.yml
WazuraWasTaken Jan 15, 2026
baa6be7
Update battery_cell.yml
WazuraWasTaken Jan 15, 2026
1a13642
Update battery_cell.yml
WazuraWasTaken Jan 15, 2026
781c0f6
Update battery_guns.yml
WazuraWasTaken Jan 15, 2026
96716f8
Update justice.yml
WazuraWasTaken Jan 15, 2026
3424e5d
Add comments to fireCost values in weapons YAML
WazuraWasTaken Jan 15, 2026
2bdb62a
Refactor hitscan damage values with comments
WazuraWasTaken Jan 15, 2026
f12f872
Update hitscan.yml
WazuraWasTaken Jan 15, 2026
62c99ed
Update hitscan.yml
WazuraWasTaken Jan 15, 2026
dfc2f47
Update projectiles.yml
WazuraWasTaken Jan 15, 2026
b247d14
Update x-00-weapons.yml
WazuraWasTaken Jan 15, 2026
d0dd86a
Update battery_guns.yml
WazuraWasTaken Jan 15, 2026
0366ce3
Update x-00-weapons.yml
WazuraWasTaken Jan 15, 2026
18cb7b5
Update x-00-weapons.yml
WazuraWasTaken Jan 15, 2026
ce51fa3
Update battery_guns.yml
WazuraWasTaken Jan 15, 2026
b541cef
Update justice.yml
WazuraWasTaken Jan 15, 2026
54d5928
Adjust fire costs for battery guns
WazuraWasTaken Jan 15, 2026
546125e
Adjust fireCost for SMG power cells
WazuraWasTaken Jan 15, 2026
5c78f55
Adjust fireCost for SMG power cells
WazuraWasTaken Jan 15, 2026
7441c0f
Update fireStacks for Small and Medium Overcharged Lasers
WazuraWasTaken Jan 15, 2026
89a29f9
Adjust fireCost for LaserSniper ammo provider
WazuraWasTaken Jan 15, 2026
c209fd5
Add Shock damage type to projectile definitions
WazuraWasTaken Jan 15, 2026
9461213
Update battery_cell.yml
WazuraWasTaken Jan 15, 2026
8c28f9f
Adjust heat damage value for projectile
WazuraWasTaken Jan 15, 2026
9ce20ae
Update projectiles.yml
WazuraWasTaken Jan 15, 2026
82ea328
Update hitscan.yml
WazuraWasTaken Jan 15, 2026
0f8e534
Increase fireCost for RedMediumSplitLaser ammo
WazuraWasTaken Jan 15, 2026
917c5a7
Update x-00-weapons.yml
WazuraWasTaken Jan 15, 2026
8bf80f1
Update battery_cell.yml
WazuraWasTaken Jan 15, 2026
b22c171
Update x-00-weapons.yml
WazuraWasTaken Jan 15, 2026
47bf569
Update projectiles.yml
WazuraWasTaken Jan 15, 2026
1205b6f
Update battery_cell.yml
WazuraWasTaken Jan 16, 2026
5ee54c7
Update battery_guns.yml
WazuraWasTaken Jan 16, 2026
baec976
Increase heat damage for overcharged lasers
WazuraWasTaken Jan 16, 2026
1d1cb5c
Update hitscan.yml
WazuraWasTaken Jan 16, 2026
a51e157
Update magfed_lasers.yml
WazuraWasTaken Jan 16, 2026
93e8329
Update x-00-weapons.yml
WazuraWasTaken Jan 16, 2026
6ce4449
Update projectiles.yml
WazuraWasTaken Jan 16, 2026
382e5ed
revert
WazuraWasTaken Jan 16, 2026
e217731
Update battery_guns.yml
WazuraWasTaken Jan 16, 2026
f877239
Dmg+1
WazuraWasTaken Jan 16, 2026
4546dd1
ooops
WazuraWasTaken Jan 16, 2026
be55b6f
actually 13's more than enough
WazuraWasTaken Jan 16, 2026
afc5248
pulse dmg was wrong
WazuraWasTaken Jan 16, 2026
63dfa1a
Update hitscan.yml
WazuraWasTaken Jan 16, 2026
d84d6a1
no need for shock
WazuraWasTaken Jan 16, 2026
2ed44d9
Adjust fire cost and battery charge values
WazuraWasTaken Jan 16, 2026
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
16 changes: 8 additions & 8 deletions Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,7 @@
- SemiAuto
- type: HitscanBatteryAmmoProvider
proto: RedLaserPractice
fireCost: 62.5
fireCost: 50 # Omu
- type: StaticPrice
price: 300
- type: PacifismAllowedGun
Expand Down Expand Up @@ -518,7 +518,7 @@
- SemiAuto
- type: HitscanBatteryAmmoProvider
proto: RedLaser
fireCost: 62.5
fireCost: 50 # Omu more shots
# Goobstation
- type: Item
size: Large
Expand Down Expand Up @@ -699,7 +699,7 @@
path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg
- type: HitscanBatteryAmmoProvider
proto: RedHeavyLaser
fireCost: 100
fireCost: 71.4 # Omu
- type: Tag
tags:
- TurretCompatibleWeapon
Expand Down Expand Up @@ -769,7 +769,7 @@
path: /Audio/Weapons/Guns/Gunshots/laser3.ogg
- type: HitscanBatteryAmmoProvider
proto: XrayLaser
fireCost: 100
fireCost: 62.5 # Omu
- type: MagazineVisuals
magState: mag
steps: 5
Expand Down Expand Up @@ -1242,16 +1242,16 @@
- type: EnergyGun # Omu
fireModes:
- proto: BulletTemperatureCold
fireCost: 100
fireCost: 40 # Omu
name: cooling # Omu
state: cooling # Omu
- proto: BulletTemperatureHot
fireCost: 100
fireCost: 40 # Omu
name: heating # Omu
state: heating # Omu
- type: Battery
maxCharge: 2500 # Goobstation - 1000 -> 2500
startingCharge: 2500 # 1000 -> 2500
maxCharge: 1000 # Omu
startingCharge: 1000 # Omu
- type: StaticPrice
price: 100
- type: GenericVisualizer # Goobstation
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
impactEffect: BulletImpactEffectRedDisabler
damage:
types:
Heat: 15 # Slightly more damage than the 17heat from the Captain's Hitscan lasgun - Goobstation: Nerfed to 15 damage, to keep it less powerful than caps Lasgun
Heat: 20 # Omu: No recharge and currently unobtainable, might add later
soundHit:
collection: MeatLaserImpact

Expand Down
30 changes: 15 additions & 15 deletions ...ototypes/_Goobstation/Entities/Objects/Weapons/Guns/Ammunition/Magazines/battery_cell.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
sprite: _Goobstation/Objects/Weapons/Guns/Ammunition/Magazine/energy_cell_pistol_lethal.rsi
- type: HitscanBatteryAmmoProvider
proto: SmallRedLaser
fireCost: 50
fireCost: 40 # Omu

- type: entity
name: x-ray SMG power cell
Expand All @@ -89,7 +89,7 @@
sprite: _Goobstation/Objects/Weapons/Guns/Ammunition/Magazine/energy_cell_pistol_xray.rsi
- type: HitscanBatteryAmmoProvider
proto: SmallXrayLaser
fireCost: 50
fireCost: 40 # Omu

- type: entity
name: overclocked SMG power cell
Expand All @@ -102,7 +102,7 @@
sprite: _Goobstation/Objects/Weapons/Guns/Ammunition/Magazine/energy_cell_pistol_overcharge.rsi
- type: HitscanBatteryAmmoProvider
proto: SmallOverchargedLaser
fireCost: 100
fireCost: 80 # Omu

- type: entity
name: pulse SMG power cell
Expand All @@ -115,7 +115,7 @@
sprite: _Goobstation/Objects/Weapons/Guns/Ammunition/Magazine/energy_cell_pistol_pulse.rsi
- type: HitscanBatteryAmmoProvider
proto: SmallPulseLaser
fireCost: 50
fireCost: 40 # Omu

- type: entity
name: ion SMG power cell
Expand All @@ -128,7 +128,7 @@
sprite: _Goobstation/Objects/Weapons/Guns/Ammunition/Magazine/energy_cell_pistol_ion.rsi
- type: HitscanBatteryAmmoProvider
proto: SmallIonLaser
fireCost: 50
fireCost: 40 # Omu


- type: entity
Expand Down Expand Up @@ -172,7 +172,7 @@
sprite: _Goobstation/Objects/Weapons/Guns/Ammunition/Magazine/energy_cell_rifle_lethal.rsi
- type: HitscanBatteryAmmoProvider
proto: MediumRedLaser
fireCost: 100
fireCost: 66.6 # Omu

- type: entity
name: x-ray sniper power cell
Expand All @@ -185,7 +185,7 @@
sprite: _Goobstation/Objects/Weapons/Guns/Ammunition/Magazine/energy_cell_rifle_xray.rsi
- type: HitscanBatteryAmmoProvider
proto: MediumXrayLaser
fireCost: 100
fireCost: 66.6 # Omu

- type: entity
name: overclocked sniper power cell
Expand All @@ -198,7 +198,7 @@
sprite: _Goobstation/Objects/Weapons/Guns/Ammunition/Magazine/energy_cell_rifle_overcharge.rsi
- type: HitscanBatteryAmmoProvider
proto: MediumOverchargedLaser
fireCost: 200
fireCost: 133.3 # Omu

- type: entity
name: pulse sniper power cell
Expand All @@ -211,7 +211,7 @@
sprite: _Goobstation/Objects/Weapons/Guns/Ammunition/Magazine/energy_cell_rifle_pulse.rsi
- type: HitscanBatteryAmmoProvider
proto: MediumPulseLaser
fireCost: 100
fireCost: 66.6 # Omu

- type: entity
name: ion sniper power cell
Expand All @@ -224,7 +224,7 @@
sprite: _Goobstation/Objects/Weapons/Guns/Ammunition/Magazine/energy_cell_rifle_ion.rsi
- type: HitscanBatteryAmmoProvider
proto: MediumIonLaser
fireCost: 100
fireCost: 66.6 # Omu


- type: entity
Expand Down Expand Up @@ -278,7 +278,7 @@
shader: null
- type: HitscanBatteryAmmoProvider
proto: MediumRedLaser
fireCost: 62.5
fireCost: 50 # Omu

- type: entity
name: x-ray revolver power cell
Expand All @@ -304,7 +304,7 @@
shader: null
- type: HitscanBatteryAmmoProvider
proto: MediumXrayLaser
fireCost: 62.5
fireCost: 50 # Omu

- type: entity
name: overclocked revolver power cell
Expand All @@ -330,7 +330,7 @@
shader: null
- type: HitscanBatteryAmmoProvider
proto: MediumOverchargedLaser
fireCost: 125
fireCost: 100 # Omu

- type: entity
name: pulse revolver power cell
Expand All @@ -356,7 +356,7 @@
shader: null
- type: HitscanBatteryAmmoProvider
proto: MediumPulseLaser
fireCost: 62.5
fireCost: 50 # Omu

- type: entity
name: ion revolver power cell
Expand All @@ -382,7 +382,7 @@
shader: null
- type: HitscanBatteryAmmoProvider
proto: MediumIonLaser
fireCost: 62.5
fireCost: 50 # Omu


- type: entity
Expand Down
6 changes: 3 additions & 3 deletions Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@
- Belt
- type: ProjectileBatteryAmmoProvider
proto: BulletDisabler
fireCost: 50
fireCost: 62.5 # Omu
- type: PacifismAllowedGun
- type: BatterySelfRecharger
autoRecharge: true
Expand Down Expand Up @@ -477,9 +477,9 @@
repeatable: true
- type: BatterySelfRecharger
autoRecharge: true
autoRechargeRate: 50
autoRechargeRate: 40 #Omu
autoRechargePause: true
autoRechargePauseTime: 40
autoRechargePauseTime: 20 #Omu

- type: entity
name: ion rifle
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/magfed_lasers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@
maxAngle: -20
- type: Gun
minAngle: 24
maxAngle: 45
maxAngle: 40 # Omu Slight Increase In Accuracy.
angleIncrease: 4
angleDecay: 16
fireRate: 10
Expand Down
10 changes: 5 additions & 5 deletions Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/x-00-weapons.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
defaultDirection: 1, 0
- type: HitscanBatteryAmmoProvider
proto: RedMediumSplitLaser
fireCost: 80
fireCost: 40 # Omu
- type: StaticPrice
price: 2500

Expand All @@ -57,7 +57,7 @@
- 0,0,3,1
- type: Gun
minAngle: 3
maxAngle: 18
maxAngle: 15 # Omu Slight Acuracy Buff
fireRate: 6
burstFireRate: 8
angleIncrease: 4
Expand All @@ -71,7 +71,7 @@
defaultDirection: 1, 0
- type: ProjectileBatteryAmmoProvider
proto: BulletLaserHeavy
fireCost: 33
fireCost: 20 # Omu
- type: StaticPrice
price: 2500

Expand Down Expand Up @@ -102,7 +102,7 @@
- type: GunRequiresWield #remove when inaccuracy on spreads is fixed
- type: ProjectileBatteryAmmoProvider
proto: BulletLaserSpreadHeavy
fireCost: 125
fireCost: 83.3 # Omu
- type: StaticPrice
price: 2500

Expand Down Expand Up @@ -133,7 +133,7 @@
- type: GunRequiresWield
- type: HitscanBatteryAmmoProvider
proto: LaserSniper
fireCost: 100
fireCost: 83.3 # Omu
- type: SpeedModifiedOnWield
walkModifier: 0.80
sprintModifier: 0.80
Expand Down
30 changes: 15 additions & 15 deletions Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
id: SmallRedLaser
damage:
types:
Heat: 7
Heat: 10 # Omu
muzzleFlash:
sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi
state: muzzle_beam_light
Expand All @@ -22,7 +22,7 @@
id: SmallIonLaser
damage:
types:
Ion: 10
Ion: 13 # Omu
muzzleFlash:
sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi
state: muzzle_beam_light_ion
Expand All @@ -37,8 +37,8 @@
id: SmallXrayLaser
damage:
types:
Heat: 3
Radiation: 4
Heat: 5 # Omu
Radiation: 5 # Omu
muzzleFlash:
sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi
state: muzzle_beam_light_xray
Expand All @@ -51,10 +51,10 @@

- type: hitscan
id: SmallOverchargedLaser
fireStacks: 0.4
fireStacks: 0.6 # Omu
damage:
types:
Heat: 10
Heat: 14 # Omu
muzzleFlash:
sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi
state: muzzle_beam_light_overcharged
Expand All @@ -69,7 +69,7 @@
id: SmallPulseLaser
damage:
types:
Heat: 12
Heat: 15 # Omu
muzzleFlash:
sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi
state: muzzle_beam_light_pulse
Expand All @@ -84,7 +84,7 @@
id: MediumRedLaser
damage:
types:
Heat: 10
Heat: 13 # Omu
muzzleFlash:
sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi
state: muzzle_beam_light
Expand All @@ -99,7 +99,7 @@
id: MediumIonLaser
damage:
types:
Ion: 14
Ion: 17 # Omu
muzzleFlash:
sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi
state: muzzle_beam_light_ion
Expand All @@ -114,8 +114,8 @@
id: MediumXrayLaser
damage:
types:
Heat: 5
Radiation: 5
Heat: 6.5 # Omu
Radiation: 6.5 # Omu
muzzleFlash:
sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi
state: muzzle_beam_light_xray
Expand All @@ -128,10 +128,10 @@

- type: hitscan
id: MediumOverchargedLaser
fireStacks: 0.7
fireStacks: 1 # Omu
damage:
types:
Heat: 14
Heat: 17 # Omu
muzzleFlash:
sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi
state: muzzle_beam_light_overcharged
Expand All @@ -146,7 +146,7 @@
id: MediumPulseLaser
damage:
types:
Heat: 17
Heat: 20 # Omu
muzzleFlash:
sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi
state: muzzle_beam_light_pulse
Expand All @@ -161,7 +161,7 @@
id: HeavyRedLaser
damage:
types:
Heat: 17
Heat: 18 # Omu
Shock: 4
muzzleFlash:
sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
Expand Down
Loading
Loading