From d7cb1af8e408fb6b372587399f9befcfc6f2dfde Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Thu, 15 Jan 2026 12:50:35 -0600 Subject: [PATCH 01/54] Makes most Battery Guns have alot more ammo, their dmg is fine but need more shots. --- .../Objects/Weapons/Guns/Battery/battery_guns.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 e9c302959ec..0589e87e646 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -518,7 +518,7 @@ - SemiAuto - type: HitscanBatteryAmmoProvider proto: RedLaser - fireCost: 62.5 + fireCost: 25 # Omu more shots # Goobstation - type: Item size: Large @@ -699,7 +699,7 @@ path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg - type: HitscanBatteryAmmoProvider proto: RedHeavyLaser - fireCost: 100 + fireCost: 62.5 - type: Tag tags: - TurretCompatibleWeapon @@ -769,7 +769,7 @@ path: /Audio/Weapons/Guns/Gunshots/laser3.ogg - type: HitscanBatteryAmmoProvider proto: XrayLaser - fireCost: 100 + fireCost: 62.5 - type: MagazineVisuals magState: mag steps: 5 @@ -1242,11 +1242,11 @@ - type: EnergyGun # Omu fireModes: - proto: BulletTemperatureCold - fireCost: 100 + fireCost: 62.5 name: cooling # Omu state: cooling # Omu - proto: BulletTemperatureHot - fireCost: 100 + fireCost: 62.5 name: heating # Omu state: heating # Omu - type: Battery From 284a187100dda90c03f45ca264939508af4f886d Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Thu, 15 Jan 2026 12:57:58 -0600 Subject: [PATCH 02/54] dmg buff for mag lasers Increased damage values for various hitscan laser projectiles. --- .../Weapons/Guns/Projectiles/hitscan.yml | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml index e73621d47b4..e476ceacbae 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml @@ -7,7 +7,7 @@ id: SmallRedLaser damage: types: - Heat: 7 + Heat: 12 muzzleFlash: sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi state: muzzle_beam_light @@ -22,7 +22,7 @@ id: SmallIonLaser damage: types: - Ion: 10 + Ion: 15 muzzleFlash: sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi state: muzzle_beam_light_ion @@ -37,8 +37,8 @@ id: SmallXrayLaser damage: types: - Heat: 3 - Radiation: 4 + Heat: 5 + Radiation: 7 muzzleFlash: sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi state: muzzle_beam_light_xray @@ -54,7 +54,7 @@ fireStacks: 0.4 damage: types: - Heat: 10 + Heat: 12 muzzleFlash: sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi state: muzzle_beam_light_overcharged @@ -69,7 +69,7 @@ id: SmallPulseLaser damage: types: - Heat: 12 + Heat: 17 muzzleFlash: sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi state: muzzle_beam_light_pulse @@ -84,7 +84,7 @@ id: MediumRedLaser damage: types: - Heat: 10 + Heat: 14 muzzleFlash: sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi state: muzzle_beam_light @@ -99,7 +99,7 @@ id: MediumIonLaser damage: types: - Ion: 14 + Ion: 18 muzzleFlash: sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi state: muzzle_beam_light_ion @@ -114,8 +114,8 @@ id: MediumXrayLaser damage: types: - Heat: 5 - Radiation: 5 + Heat: 7 + Radiation: 7 muzzleFlash: sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi state: muzzle_beam_light_xray @@ -131,7 +131,7 @@ fireStacks: 0.7 damage: types: - Heat: 14 + Heat: 18 muzzleFlash: sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi state: muzzle_beam_light_overcharged @@ -146,7 +146,7 @@ id: MediumPulseLaser damage: types: - Heat: 17 + Heat: 21 muzzleFlash: sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi state: muzzle_beam_light_pulse @@ -161,7 +161,7 @@ id: HeavyRedLaser damage: types: - Heat: 17 + Heat: 19 Shock: 4 muzzleFlash: sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi From 3b0bbcea3b1a223cbe296d10643615b7978d4e6b Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Thu, 15 Jan 2026 13:02:18 -0600 Subject: [PATCH 03/54] Adjust fireCost for battery gun ammo providers --- .../Entities/Objects/Weapons/Guns/Battery/battery_guns.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 0589e87e646..38f8e0d72ea 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -480,7 +480,7 @@ - SemiAuto - type: HitscanBatteryAmmoProvider proto: RedLaserPractice - fireCost: 62.5 + fireCost: 33.3 - type: StaticPrice price: 300 - type: PacifismAllowedGun @@ -518,7 +518,7 @@ - SemiAuto - type: HitscanBatteryAmmoProvider proto: RedLaser - fireCost: 25 # Omu more shots + fireCost: 33.3 # Omu more shots # Goobstation - type: Item size: Large From 61b749fa01cf43ee03cffe9db30b476f7644b9b3 Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Thu, 15 Jan 2026 13:03:06 -0600 Subject: [PATCH 04/54] Aren't these suppose to be good? --- .../Objects/Weapons/Guns/Battery/x-00-weapons.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/x-00-weapons.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/x-00-weapons.yml index bdc2c0eced8..c24e00aa1dd 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/x-00-weapons.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/x-00-weapons.yml @@ -33,7 +33,7 @@ defaultDirection: 1, 0 - type: HitscanBatteryAmmoProvider proto: RedMediumSplitLaser - fireCost: 80 + fireCost: 33.3 - type: StaticPrice price: 2500 @@ -71,7 +71,7 @@ defaultDirection: 1, 0 - type: ProjectileBatteryAmmoProvider proto: BulletLaserHeavy - fireCost: 33 + fireCost: 15 - type: StaticPrice price: 2500 @@ -102,7 +102,7 @@ - type: GunRequiresWield #remove when inaccuracy on spreads is fixed - type: ProjectileBatteryAmmoProvider proto: BulletLaserSpreadHeavy - fireCost: 125 + fireCost: 100 - type: StaticPrice price: 2500 @@ -133,7 +133,7 @@ - type: GunRequiresWield - type: HitscanBatteryAmmoProvider proto: LaserSniper - fireCost: 100 + fireCost: 62.5 - type: SpeedModifiedOnWield walkModifier: 0.80 sprintModifier: 0.80 From 34cd1e158b9b854575adb1fd8b221adca1020872 Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Thu, 15 Jan 2026 13:05:38 -0600 Subject: [PATCH 05/54] Update fire cost and recharge pause time in battery guns --- .../Entities/Objects/Weapons/Guns/Battery/battery_guns.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 426e2c0d507..97ffe2e9fd0 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -277,7 +277,7 @@ - Belt - type: ProjectileBatteryAmmoProvider proto: BulletDisabler - fireCost: 50 + fireCost: 62.5 - type: PacifismAllowedGun - type: BatterySelfRecharger autoRecharge: true @@ -479,7 +479,7 @@ autoRecharge: true autoRechargeRate: 50 autoRechargePause: true - autoRechargePauseTime: 40 + autoRechargePauseTime: 20 - type: entity name: ion rifle From a3f42f4fcedede7c271164dbc4c8b200cc76584f Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Thu, 15 Jan 2026 13:06:19 -0600 Subject: [PATCH 06/54] Update justice.yml --- .../_Goobstation/Entities/Objects/Weapons/Melee/justice.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Melee/justice.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Melee/justice.yml index 8331428c521..d6105f38d02 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Melee/justice.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Melee/justice.yml @@ -29,7 +29,7 @@ autoRecharge: true autoRechargeRate: 50 autoRechargePause: true - autoRechargePauseTime: 40 + autoRechargePauseTime: 20 # same as lawbringer - type: DisarmMalus - type: Tag tags: From 95f9f7243cfd0fb3c12bb15a7a7661a076152fcb Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Thu, 15 Jan 2026 13:09:53 -0600 Subject: [PATCH 07/54] Slight battery change --- .../Guns/Ammunition/Magazines/battery_cell.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Ammunition/Magazines/battery_cell.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Ammunition/Magazines/battery_cell.yml index 62d25317fe2..db74d8a50f0 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Ammunition/Magazines/battery_cell.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Ammunition/Magazines/battery_cell.yml @@ -76,7 +76,7 @@ sprite: _Goobstation/Objects/Weapons/Guns/Ammunition/Magazine/energy_cell_pistol_lethal.rsi - type: HitscanBatteryAmmoProvider proto: SmallRedLaser - fireCost: 50 + fireCost: 40 - type: entity name: x-ray SMG power cell @@ -89,7 +89,7 @@ sprite: _Goobstation/Objects/Weapons/Guns/Ammunition/Magazine/energy_cell_pistol_xray.rsi - type: HitscanBatteryAmmoProvider proto: SmallXrayLaser - fireCost: 50 + fireCost: 40 - type: entity name: overclocked SMG power cell @@ -102,7 +102,7 @@ sprite: _Goobstation/Objects/Weapons/Guns/Ammunition/Magazine/energy_cell_pistol_overcharge.rsi - type: HitscanBatteryAmmoProvider proto: SmallOverchargedLaser - fireCost: 100 + fireCost: 80 - type: entity name: pulse SMG power cell @@ -115,7 +115,7 @@ sprite: _Goobstation/Objects/Weapons/Guns/Ammunition/Magazine/energy_cell_pistol_pulse.rsi - type: HitscanBatteryAmmoProvider proto: SmallPulseLaser - fireCost: 50 + fireCost: 40 - type: entity name: ion SMG power cell @@ -128,7 +128,7 @@ sprite: _Goobstation/Objects/Weapons/Guns/Ammunition/Magazine/energy_cell_pistol_ion.rsi - type: HitscanBatteryAmmoProvider proto: SmallIonLaser - fireCost: 50 + fireCost: 40 - type: entity @@ -330,7 +330,7 @@ shader: null - type: HitscanBatteryAmmoProvider proto: MediumOverchargedLaser - fireCost: 125 + fireCost: 120 - type: entity name: pulse revolver power cell From 24655130c5a442d1f2a45529f9ce03cfb10e691d Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Thu, 15 Jan 2026 13:20:13 -0600 Subject: [PATCH 08/54] Add comments to fireCost in battery_guns.yml Added comments to fireCost values for clarity. --- .../Objects/Weapons/Guns/Battery/battery_guns.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 38f8e0d72ea..d50b58f6fe1 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -480,7 +480,7 @@ - SemiAuto - type: HitscanBatteryAmmoProvider proto: RedLaserPractice - fireCost: 33.3 + fireCost: 33.3 # Omu - type: StaticPrice price: 300 - type: PacifismAllowedGun @@ -699,7 +699,7 @@ path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg - type: HitscanBatteryAmmoProvider proto: RedHeavyLaser - fireCost: 62.5 + fireCost: 62.5 # Omu - type: Tag tags: - TurretCompatibleWeapon @@ -769,7 +769,7 @@ path: /Audio/Weapons/Guns/Gunshots/laser3.ogg - type: HitscanBatteryAmmoProvider proto: XrayLaser - fireCost: 62.5 + fireCost: 62.5 # Omu - type: MagazineVisuals magState: mag steps: 5 @@ -1242,11 +1242,11 @@ - type: EnergyGun # Omu fireModes: - proto: BulletTemperatureCold - fireCost: 62.5 + fireCost: 62.5 # Omu name: cooling # Omu state: cooling # Omu - proto: BulletTemperatureHot - fireCost: 62.5 + fireCost: 62.5 # Omu name: heating # Omu state: heating # Omu - type: Battery From baa6be7fb3ff6c9162de48c49d9ab1cdaa27878a Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Thu, 15 Jan 2026 13:20:52 -0600 Subject: [PATCH 09/54] Update battery_cell.yml --- .../Weapons/Guns/Ammunition/Magazines/battery_cell.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Ammunition/Magazines/battery_cell.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Ammunition/Magazines/battery_cell.yml index db74d8a50f0..6ab4c528a4d 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Ammunition/Magazines/battery_cell.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Ammunition/Magazines/battery_cell.yml @@ -76,7 +76,7 @@ sprite: _Goobstation/Objects/Weapons/Guns/Ammunition/Magazine/energy_cell_pistol_lethal.rsi - type: HitscanBatteryAmmoProvider proto: SmallRedLaser - fireCost: 40 + fireCost: 40 # Omu - type: entity name: x-ray SMG power cell @@ -89,7 +89,7 @@ sprite: _Goobstation/Objects/Weapons/Guns/Ammunition/Magazine/energy_cell_pistol_xray.rsi - type: HitscanBatteryAmmoProvider proto: SmallXrayLaser - fireCost: 40 + fireCost: 40 # Omu - type: entity name: overclocked SMG power cell @@ -102,7 +102,7 @@ sprite: _Goobstation/Objects/Weapons/Guns/Ammunition/Magazine/energy_cell_pistol_overcharge.rsi - type: HitscanBatteryAmmoProvider proto: SmallOverchargedLaser - fireCost: 80 + fireCost: 80 # Omu - type: entity name: pulse SMG power cell @@ -115,7 +115,7 @@ sprite: _Goobstation/Objects/Weapons/Guns/Ammunition/Magazine/energy_cell_pistol_pulse.rsi - type: HitscanBatteryAmmoProvider proto: SmallPulseLaser - fireCost: 40 + fireCost: 40 # Omu - type: entity name: ion SMG power cell @@ -128,7 +128,7 @@ sprite: _Goobstation/Objects/Weapons/Guns/Ammunition/Magazine/energy_cell_pistol_ion.rsi - type: HitscanBatteryAmmoProvider proto: SmallIonLaser - fireCost: 40 + fireCost: 40 # Omu - type: entity From 1a13642a273b30850b8baf3028d61d9fbd0a3b84 Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Thu, 15 Jan 2026 13:22:09 -0600 Subject: [PATCH 10/54] Update battery_cell.yml --- .../Objects/Weapons/Guns/Ammunition/Magazines/battery_cell.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Ammunition/Magazines/battery_cell.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Ammunition/Magazines/battery_cell.yml index 6ab4c528a4d..33099382dee 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Ammunition/Magazines/battery_cell.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Ammunition/Magazines/battery_cell.yml @@ -330,7 +330,7 @@ shader: null - type: HitscanBatteryAmmoProvider proto: MediumOverchargedLaser - fireCost: 120 + fireCost: 125 - type: entity name: pulse revolver power cell From 781c0f6148cb41613398b02d6a75b7ef327d952a Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Thu, 15 Jan 2026 13:23:40 -0600 Subject: [PATCH 11/54] Update battery_guns.yml --- .../Objects/Weapons/Guns/Battery/battery_guns.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 97ffe2e9fd0..118a7e183d5 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -277,7 +277,7 @@ - Belt - type: ProjectileBatteryAmmoProvider proto: BulletDisabler - fireCost: 62.5 + fireCost: 62.5 # Omu - type: PacifismAllowedGun - type: BatterySelfRecharger autoRecharge: true @@ -477,9 +477,9 @@ repeatable: true - type: BatterySelfRecharger autoRecharge: true - autoRechargeRate: 50 - autoRechargePause: true - autoRechargePauseTime: 20 + autoRechargeRate: 20 # Omu +#Omu autoRechargePause: true +#Omu autoRechargePauseTime: 20 - type: entity name: ion rifle From 96716f81ae25e241fcc9807e8bb2fa4af807d56d Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Thu, 15 Jan 2026 13:24:16 -0600 Subject: [PATCH 12/54] Update justice.yml --- .../_Goobstation/Entities/Objects/Weapons/Melee/justice.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Melee/justice.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Melee/justice.yml index d6105f38d02..55833bf553c 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Melee/justice.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Melee/justice.yml @@ -27,9 +27,9 @@ startingCharge: 1000 - type: BatterySelfRecharger autoRecharge: true - autoRechargeRate: 50 - autoRechargePause: true - autoRechargePauseTime: 20 # same as lawbringer + autoRechargeRate: 20 # Omu +# autoRechargePause: true +# autoRechargePauseTime: 20 # same as lawbringer - type: DisarmMalus - type: Tag tags: From 3424e5d30f3d8bb80d10e6a03251100ae450c045 Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Thu, 15 Jan 2026 13:25:26 -0600 Subject: [PATCH 13/54] Add comments to fireCost values in weapons YAML --- .../Objects/Weapons/Guns/Battery/x-00-weapons.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/x-00-weapons.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/x-00-weapons.yml index c24e00aa1dd..5f3ad6d80fc 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/x-00-weapons.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/x-00-weapons.yml @@ -33,7 +33,7 @@ defaultDirection: 1, 0 - type: HitscanBatteryAmmoProvider proto: RedMediumSplitLaser - fireCost: 33.3 + fireCost: 33.3 # Omu - type: StaticPrice price: 2500 @@ -71,7 +71,7 @@ defaultDirection: 1, 0 - type: ProjectileBatteryAmmoProvider proto: BulletLaserHeavy - fireCost: 15 + fireCost: 15 # Omu - type: StaticPrice price: 2500 @@ -102,7 +102,7 @@ - type: GunRequiresWield #remove when inaccuracy on spreads is fixed - type: ProjectileBatteryAmmoProvider proto: BulletLaserSpreadHeavy - fireCost: 100 + fireCost: 100 # Omu - type: StaticPrice price: 2500 @@ -133,7 +133,7 @@ - type: GunRequiresWield - type: HitscanBatteryAmmoProvider proto: LaserSniper - fireCost: 62.5 + fireCost: 100 - type: SpeedModifiedOnWield walkModifier: 0.80 sprintModifier: 0.80 From 2bdb62a71a464a60f071c40c01020c96e845d252 Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Thu, 15 Jan 2026 13:26:46 -0600 Subject: [PATCH 14/54] Refactor hitscan damage values with comments Updated damage values for various hitscan lasers, adding comments for clarity. --- .../Weapons/Guns/Projectiles/hitscan.yml | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml index e476ceacbae..9a7be4cab2b 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml @@ -7,7 +7,7 @@ id: SmallRedLaser damage: types: - Heat: 12 + Heat: 12 # Omu muzzleFlash: sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi state: muzzle_beam_light @@ -22,7 +22,7 @@ id: SmallIonLaser damage: types: - Ion: 15 + Ion: 15 # Omu muzzleFlash: sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi state: muzzle_beam_light_ion @@ -37,8 +37,8 @@ id: SmallXrayLaser damage: types: - Heat: 5 - Radiation: 7 + Heat: 5 # Omu + Radiation: 7 # Omu muzzleFlash: sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi state: muzzle_beam_light_xray @@ -54,7 +54,7 @@ fireStacks: 0.4 damage: types: - Heat: 12 + Heat: 12 # Omu muzzleFlash: sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi state: muzzle_beam_light_overcharged @@ -69,7 +69,7 @@ id: SmallPulseLaser damage: types: - Heat: 17 + Heat: 17 # Omu muzzleFlash: sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi state: muzzle_beam_light_pulse @@ -84,7 +84,7 @@ id: MediumRedLaser damage: types: - Heat: 14 + Heat: 14 # Omu muzzleFlash: sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi state: muzzle_beam_light @@ -99,7 +99,7 @@ id: MediumIonLaser damage: types: - Ion: 18 + Ion: 18 # Omu muzzleFlash: sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi state: muzzle_beam_light_ion @@ -114,8 +114,8 @@ id: MediumXrayLaser damage: types: - Heat: 7 - Radiation: 7 + Heat: 7 # Omu + Radiation: 7 # Omu muzzleFlash: sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi state: muzzle_beam_light_xray @@ -131,7 +131,7 @@ fireStacks: 0.7 damage: types: - Heat: 18 + Heat: 18 # Omu muzzleFlash: sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi state: muzzle_beam_light_overcharged @@ -146,7 +146,7 @@ id: MediumPulseLaser damage: types: - Heat: 21 + Heat: 21 # Omu muzzleFlash: sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi state: muzzle_beam_light_pulse @@ -161,8 +161,8 @@ id: HeavyRedLaser damage: types: - Heat: 19 - Shock: 4 + Heat: 18 # Omu + Shock: 5 # Omu muzzleFlash: sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi state: muzzle_beam_heavy From f12f872a10c5389deaa19e6449162c7459237209 Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Thu, 15 Jan 2026 13:31:42 -0600 Subject: [PATCH 15/54] Update hitscan.yml --- .../Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml index 9a7be4cab2b..47c8951bf28 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml @@ -54,7 +54,7 @@ fireStacks: 0.4 damage: types: - Heat: 12 # Omu + Heat: 15 # Omu muzzleFlash: sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi state: muzzle_beam_light_overcharged From 62c99ed274082fa4366ca75429b0da46ec7787ec Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Thu, 15 Jan 2026 13:34:04 -0600 Subject: [PATCH 16/54] Update hitscan.yml --- .../Weapons/Guns/Projectiles/hitscan.yml | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml index 47c8951bf28..b02359930ae 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml @@ -7,7 +7,7 @@ id: SmallRedLaser damage: types: - Heat: 12 # Omu + Heat: 11 # Omu muzzleFlash: sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi state: muzzle_beam_light @@ -22,7 +22,7 @@ id: SmallIonLaser damage: types: - Ion: 15 # Omu + Ion: 14 # Omu muzzleFlash: sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi state: muzzle_beam_light_ion @@ -38,7 +38,7 @@ damage: types: Heat: 5 # Omu - Radiation: 7 # Omu + Radiation: 6 # Omu muzzleFlash: sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi state: muzzle_beam_light_xray @@ -54,7 +54,7 @@ fireStacks: 0.4 damage: types: - Heat: 15 # Omu + Heat: 14 # Omu muzzleFlash: sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi state: muzzle_beam_light_overcharged @@ -69,7 +69,7 @@ id: SmallPulseLaser damage: types: - Heat: 17 # Omu + Heat: 16 # Omu muzzleFlash: sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi state: muzzle_beam_light_pulse @@ -84,7 +84,7 @@ id: MediumRedLaser damage: types: - Heat: 14 # Omu + Heat: 13 # Omu muzzleFlash: sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi state: muzzle_beam_light @@ -99,7 +99,7 @@ id: MediumIonLaser damage: types: - Ion: 18 # Omu + Ion: 17 # Omu muzzleFlash: sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi state: muzzle_beam_light_ion @@ -114,7 +114,7 @@ id: MediumXrayLaser damage: types: - Heat: 7 # Omu + Heat: 6 # Omu Radiation: 7 # Omu muzzleFlash: sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi @@ -131,7 +131,7 @@ fireStacks: 0.7 damage: types: - Heat: 18 # Omu + Heat: 17 # Omu muzzleFlash: sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi state: muzzle_beam_light_overcharged @@ -146,7 +146,7 @@ id: MediumPulseLaser damage: types: - Heat: 21 # Omu + Heat: 20 # Omu muzzleFlash: sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi state: muzzle_beam_light_pulse @@ -162,7 +162,7 @@ damage: types: Heat: 18 # Omu - Shock: 5 # Omu + Shock: 4 # Omu muzzleFlash: sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi state: muzzle_beam_heavy From dfc2f471229cec7e43541662c572b6b1c892625a Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Thu, 15 Jan 2026 13:36:17 -0600 Subject: [PATCH 17/54] Update projectiles.yml --- .../Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 0ad50034d2f..bb8173eac13 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -229,7 +229,7 @@ impactEffect: BulletImpactEffectOrangeDisabler damage: types: - Heat: 8 + Heat: 11 # Omu - type: entity name: heavy laser bolt From b247d14eead3620a986b8aa973e3a923db5546e5 Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Thu, 15 Jan 2026 13:43:09 -0600 Subject: [PATCH 18/54] Update x-00-weapons.yml --- .../Entities/Objects/Weapons/Guns/Battery/x-00-weapons.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/x-00-weapons.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/x-00-weapons.yml index 5f3ad6d80fc..c56c5663d67 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/x-00-weapons.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/x-00-weapons.yml @@ -33,7 +33,7 @@ defaultDirection: 1, 0 - type: HitscanBatteryAmmoProvider proto: RedMediumSplitLaser - fireCost: 33.3 # Omu + fireCost: 40 # Omu - type: StaticPrice price: 2500 From d0dd86a4a66d5c7d6e6575dff8f9b21296b22e4e Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Thu, 15 Jan 2026 13:43:42 -0600 Subject: [PATCH 19/54] Update battery_guns.yml --- .../Entities/Objects/Weapons/Guns/Battery/battery_guns.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 d50b58f6fe1..1717958b7fc 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -480,7 +480,7 @@ - SemiAuto - type: HitscanBatteryAmmoProvider proto: RedLaserPractice - fireCost: 33.3 # Omu + fireCost: 40 # Omu - type: StaticPrice price: 300 - type: PacifismAllowedGun @@ -518,7 +518,7 @@ - SemiAuto - type: HitscanBatteryAmmoProvider proto: RedLaser - fireCost: 33.3 # Omu more shots + fireCost: 40 # Omu more shots # Goobstation - type: Item size: Large From 0366ce3c56413415ee9b08dd4a7b13ab90395b2e Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Thu, 15 Jan 2026 13:50:57 -0600 Subject: [PATCH 20/54] Update x-00-weapons.yml --- .../Entities/Objects/Weapons/Guns/Battery/x-00-weapons.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/x-00-weapons.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/x-00-weapons.yml index c56c5663d67..a41658cc962 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/x-00-weapons.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/x-00-weapons.yml @@ -71,7 +71,7 @@ defaultDirection: 1, 0 - type: ProjectileBatteryAmmoProvider proto: BulletLaserHeavy - fireCost: 15 # Omu + fireCost: 20 # Omu - type: StaticPrice price: 2500 From 18cb7b5c587ebe59b7804f1403ae43f3aa5a79fd Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Thu, 15 Jan 2026 13:51:39 -0600 Subject: [PATCH 21/54] Update x-00-weapons.yml --- .../Entities/Objects/Weapons/Guns/Battery/x-00-weapons.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/x-00-weapons.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/x-00-weapons.yml index a41658cc962..eeba88215a3 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/x-00-weapons.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/x-00-weapons.yml @@ -102,7 +102,7 @@ - type: GunRequiresWield #remove when inaccuracy on spreads is fixed - type: ProjectileBatteryAmmoProvider proto: BulletLaserSpreadHeavy - fireCost: 100 # Omu + fireCost: 80 # Omu - type: StaticPrice price: 2500 From ce51fa32318a16beb0b01b865ac1b7637878ce7c Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Thu, 15 Jan 2026 13:54:34 -0600 Subject: [PATCH 22/54] Update battery_guns.yml --- .../Entities/Objects/Weapons/Guns/Battery/battery_guns.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 118a7e183d5..911516efe22 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -477,9 +477,9 @@ repeatable: true - type: BatterySelfRecharger autoRecharge: true - autoRechargeRate: 20 # Omu -#Omu autoRechargePause: true -#Omu autoRechargePauseTime: 20 + autoRechargeRate: 40 + autoRechargePause: true + autoRechargePauseTime: 20 #Omu - type: entity name: ion rifle From b541cef881dbd7070460edfd7b924d7e4f11d685 Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Thu, 15 Jan 2026 13:55:00 -0600 Subject: [PATCH 23/54] Update justice.yml --- .../_Goobstation/Entities/Objects/Weapons/Melee/justice.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Melee/justice.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Melee/justice.yml index 55833bf553c..a2468bab260 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Melee/justice.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Melee/justice.yml @@ -27,9 +27,9 @@ startingCharge: 1000 - type: BatterySelfRecharger autoRecharge: true - autoRechargeRate: 20 # Omu -# autoRechargePause: true -# autoRechargePauseTime: 20 # same as lawbringer + autoRechargeRate: 40 #Omu + autoRechargePause: true + autoRechargePauseTime: 20 #Omu - type: DisarmMalus - type: Tag tags: From 54d59284869150bb82b92f4324a2ac455f5e5068 Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Thu, 15 Jan 2026 15:58:34 -0600 Subject: [PATCH 24/54] Adjust fire costs for battery guns Updated fire costs for various HitscanBatteryAmmoProvider types in battery_guns.yml. --- .../Objects/Weapons/Guns/Battery/battery_guns.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 1717958b7fc..7389da781ed 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -480,7 +480,7 @@ - SemiAuto - type: HitscanBatteryAmmoProvider proto: RedLaserPractice - fireCost: 40 # Omu + fireCost: 50 # Omu - type: StaticPrice price: 300 - type: PacifismAllowedGun @@ -518,7 +518,7 @@ - SemiAuto - type: HitscanBatteryAmmoProvider proto: RedLaser - fireCost: 40 # Omu more shots + fireCost: 50 # Omu more shots # Goobstation - type: Item size: Large @@ -699,7 +699,7 @@ path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg - type: HitscanBatteryAmmoProvider proto: RedHeavyLaser - fireCost: 62.5 # Omu + fireCost: 83.3 # Omu - type: Tag tags: - TurretCompatibleWeapon @@ -769,7 +769,7 @@ path: /Audio/Weapons/Guns/Gunshots/laser3.ogg - type: HitscanBatteryAmmoProvider proto: XrayLaser - fireCost: 62.5 # Omu + fireCost: 83.3 # Omu - type: MagazineVisuals magState: mag steps: 5 From 546125e01ecc4291d41fb7182710bc31b7258e89 Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Thu, 15 Jan 2026 16:01:26 -0600 Subject: [PATCH 25/54] Adjust fireCost for SMG power cells Updated fireCost values for various SMG power cells to improve balance. --- .../Weapons/Guns/Ammunition/Magazines/battery_cell.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Ammunition/Magazines/battery_cell.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Ammunition/Magazines/battery_cell.yml index 33099382dee..873e1c8ffce 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Ammunition/Magazines/battery_cell.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Ammunition/Magazines/battery_cell.yml @@ -76,7 +76,7 @@ sprite: _Goobstation/Objects/Weapons/Guns/Ammunition/Magazine/energy_cell_pistol_lethal.rsi - type: HitscanBatteryAmmoProvider proto: SmallRedLaser - fireCost: 40 # Omu + fireCost: 33.3 # Omu - type: entity name: x-ray SMG power cell @@ -89,7 +89,7 @@ sprite: _Goobstation/Objects/Weapons/Guns/Ammunition/Magazine/energy_cell_pistol_xray.rsi - type: HitscanBatteryAmmoProvider proto: SmallXrayLaser - fireCost: 40 # Omu + fireCost: 33.3 # Omu - type: entity name: overclocked SMG power cell @@ -102,7 +102,7 @@ sprite: _Goobstation/Objects/Weapons/Guns/Ammunition/Magazine/energy_cell_pistol_overcharge.rsi - type: HitscanBatteryAmmoProvider proto: SmallOverchargedLaser - fireCost: 80 # Omu + fireCost: 66.6 # Omu - type: entity name: pulse SMG power cell @@ -115,7 +115,7 @@ sprite: _Goobstation/Objects/Weapons/Guns/Ammunition/Magazine/energy_cell_pistol_pulse.rsi - type: HitscanBatteryAmmoProvider proto: SmallPulseLaser - fireCost: 40 # Omu + fireCost: 33.3 # Omu - type: entity name: ion SMG power cell @@ -128,7 +128,7 @@ sprite: _Goobstation/Objects/Weapons/Guns/Ammunition/Magazine/energy_cell_pistol_ion.rsi - type: HitscanBatteryAmmoProvider proto: SmallIonLaser - fireCost: 40 # Omu + fireCost: 33.3 # Omu - type: entity From 5c78f552bd3683a6919a632a7f3870a5c1e1f295 Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Thu, 15 Jan 2026 16:04:07 -0600 Subject: [PATCH 26/54] Adjust fireCost for SMG power cells Updated fireCost values for various SMG power cells. --- .../Weapons/Guns/Ammunition/Magazines/battery_cell.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Ammunition/Magazines/battery_cell.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Ammunition/Magazines/battery_cell.yml index 873e1c8ffce..33099382dee 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Ammunition/Magazines/battery_cell.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Ammunition/Magazines/battery_cell.yml @@ -76,7 +76,7 @@ sprite: _Goobstation/Objects/Weapons/Guns/Ammunition/Magazine/energy_cell_pistol_lethal.rsi - type: HitscanBatteryAmmoProvider proto: SmallRedLaser - fireCost: 33.3 # Omu + fireCost: 40 # Omu - type: entity name: x-ray SMG power cell @@ -89,7 +89,7 @@ sprite: _Goobstation/Objects/Weapons/Guns/Ammunition/Magazine/energy_cell_pistol_xray.rsi - type: HitscanBatteryAmmoProvider proto: SmallXrayLaser - fireCost: 33.3 # Omu + fireCost: 40 # Omu - type: entity name: overclocked SMG power cell @@ -102,7 +102,7 @@ sprite: _Goobstation/Objects/Weapons/Guns/Ammunition/Magazine/energy_cell_pistol_overcharge.rsi - type: HitscanBatteryAmmoProvider proto: SmallOverchargedLaser - fireCost: 66.6 # Omu + fireCost: 80 # Omu - type: entity name: pulse SMG power cell @@ -115,7 +115,7 @@ sprite: _Goobstation/Objects/Weapons/Guns/Ammunition/Magazine/energy_cell_pistol_pulse.rsi - type: HitscanBatteryAmmoProvider proto: SmallPulseLaser - fireCost: 33.3 # Omu + fireCost: 40 # Omu - type: entity name: ion SMG power cell @@ -128,7 +128,7 @@ sprite: _Goobstation/Objects/Weapons/Guns/Ammunition/Magazine/energy_cell_pistol_ion.rsi - type: HitscanBatteryAmmoProvider proto: SmallIonLaser - fireCost: 33.3 # Omu + fireCost: 40 # Omu - type: entity From 7441c0f54e318d5e6dd5245d2a01f570b73d4e1b Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Thu, 15 Jan 2026 16:05:35 -0600 Subject: [PATCH 27/54] Update fireStacks for Small and Medium Overcharged Lasers --- .../Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml index b02359930ae..52e2f91e0c2 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml @@ -51,7 +51,7 @@ - type: hitscan id: SmallOverchargedLaser - fireStacks: 0.4 + fireStacks: 0.6 # Omu damage: types: Heat: 14 # Omu @@ -128,7 +128,7 @@ - type: hitscan id: MediumOverchargedLaser - fireStacks: 0.7 + fireStacks: 1 # Omu damage: types: Heat: 17 # Omu From 89a29f9bbbb33dfd8b1a1fff755278d7a00e3c94 Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Thu, 15 Jan 2026 16:20:34 -0600 Subject: [PATCH 28/54] Adjust fireCost for LaserSniper ammo provider --- .../Entities/Objects/Weapons/Guns/Battery/x-00-weapons.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/x-00-weapons.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/x-00-weapons.yml index eeba88215a3..ab2d8a44e05 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/x-00-weapons.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/x-00-weapons.yml @@ -133,7 +133,7 @@ - type: GunRequiresWield - type: HitscanBatteryAmmoProvider proto: LaserSniper - fireCost: 100 + fireCost: 83.3 - type: SpeedModifiedOnWield walkModifier: 0.80 sprintModifier: 0.80 From c209fd574b71ea7356afdbe1525b98f43df155bd Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Thu, 15 Jan 2026 16:21:42 -0600 Subject: [PATCH 29/54] Add Shock damage type to projectile definitions --- .../Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index bb8173eac13..5abc81931d3 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -230,6 +230,7 @@ damage: types: Heat: 11 # Omu + Shock: 1 # Omu - type: entity name: heavy laser bolt @@ -242,6 +243,7 @@ damage: types: Heat: 12 + Shock: 1 # Omu Structural: 10 - type: entity From 94612132c6740ae704bf060927fa82805f5c0a78 Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Thu, 15 Jan 2026 16:26:03 -0600 Subject: [PATCH 30/54] Update battery_cell.yml --- .../Ammunition/Magazines/battery_cell.yml | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Ammunition/Magazines/battery_cell.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Ammunition/Magazines/battery_cell.yml index 33099382dee..aa930ac06f8 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Ammunition/Magazines/battery_cell.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Ammunition/Magazines/battery_cell.yml @@ -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 @@ -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 @@ -198,7 +198,7 @@ sprite: _Goobstation/Objects/Weapons/Guns/Ammunition/Magazine/energy_cell_rifle_overcharge.rsi - type: HitscanBatteryAmmoProvider proto: MediumOverchargedLaser - fireCost: 200 + fireCost: 140 # Omu - type: entity name: pulse sniper power cell @@ -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 @@ -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 @@ -278,7 +278,7 @@ shader: null - type: HitscanBatteryAmmoProvider proto: MediumRedLaser - fireCost: 62.5 + fireCost: 50 # Omu - type: entity name: x-ray revolver power cell @@ -304,7 +304,7 @@ shader: null - type: HitscanBatteryAmmoProvider proto: MediumXrayLaser - fireCost: 62.5 + fireCost: 50 # Omu - type: entity name: overclocked revolver power cell @@ -330,7 +330,7 @@ shader: null - type: HitscanBatteryAmmoProvider proto: MediumOverchargedLaser - fireCost: 125 + fireCost: 100 # Omu - type: entity name: pulse revolver power cell @@ -356,7 +356,7 @@ shader: null - type: HitscanBatteryAmmoProvider proto: MediumPulseLaser - fireCost: 62.5 + fireCost: 50 # Omu - type: entity name: ion revolver power cell @@ -382,7 +382,7 @@ shader: null - type: HitscanBatteryAmmoProvider proto: MediumIonLaser - fireCost: 62.5 + fireCost: 50 # Omu - type: entity From 8c28f9f7e779b0f292ffd63d534fbae06b53e13a Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Thu, 15 Jan 2026 16:36:42 -0600 Subject: [PATCH 31/54] Adjust heat damage value for projectile --- .../Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 5abc81931d3..a2c884dc485 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -229,7 +229,7 @@ impactEffect: BulletImpactEffectOrangeDisabler damage: types: - Heat: 11 # Omu + Heat: 10 # Omu Shock: 1 # Omu - type: entity From 9ce20aea5d6f1f1377ad459c619adf86845cc8ae Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Thu, 15 Jan 2026 16:37:47 -0600 Subject: [PATCH 32/54] Update projectiles.yml --- .../Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index a2c884dc485..5abc81931d3 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -229,7 +229,7 @@ impactEffect: BulletImpactEffectOrangeDisabler damage: types: - Heat: 10 # Omu + Heat: 11 # Omu Shock: 1 # Omu - type: entity From 82ea328b243119cc829e2fadd5c78aae44d4a4e0 Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Thu, 15 Jan 2026 16:38:36 -0600 Subject: [PATCH 33/54] Update hitscan.yml --- .../Objects/Weapons/Guns/Projectiles/hitscan.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml index 52e2f91e0c2..526c18081a3 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml @@ -7,7 +7,7 @@ id: SmallRedLaser damage: types: - Heat: 11 # Omu + Heat: 10 # Omu muzzleFlash: sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi state: muzzle_beam_light @@ -22,7 +22,7 @@ id: SmallIonLaser damage: types: - Ion: 14 # Omu + Ion: 13 # Omu muzzleFlash: sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi state: muzzle_beam_light_ion @@ -38,7 +38,7 @@ damage: types: Heat: 5 # Omu - Radiation: 6 # Omu + Radiation: 5 # Omu muzzleFlash: sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi state: muzzle_beam_light_xray @@ -54,7 +54,7 @@ fireStacks: 0.6 # Omu damage: types: - Heat: 14 # Omu + Heat: 13 # Omu muzzleFlash: sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi state: muzzle_beam_light_overcharged @@ -69,7 +69,7 @@ id: SmallPulseLaser damage: types: - Heat: 16 # Omu + Heat: 15 # Omu muzzleFlash: sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi state: muzzle_beam_light_pulse From 0f8e53479811a8fe9ac139d2b200c55b9e68afda Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Thu, 15 Jan 2026 16:48:46 -0600 Subject: [PATCH 34/54] Increase fireCost for RedMediumSplitLaser ammo --- .../Entities/Objects/Weapons/Guns/Battery/x-00-weapons.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/x-00-weapons.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/x-00-weapons.yml index ab2d8a44e05..cc2bea0df04 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/x-00-weapons.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/x-00-weapons.yml @@ -33,7 +33,7 @@ defaultDirection: 1, 0 - type: HitscanBatteryAmmoProvider proto: RedMediumSplitLaser - fireCost: 40 # Omu + fireCost: 50 # Omu - type: StaticPrice price: 2500 From 917c5a7b757a6fda18d890ee218ef7aec6e4edcf Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Thu, 15 Jan 2026 16:51:41 -0600 Subject: [PATCH 35/54] Update x-00-weapons.yml --- .../Entities/Objects/Weapons/Guns/Battery/x-00-weapons.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/x-00-weapons.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/x-00-weapons.yml index cc2bea0df04..ab2d8a44e05 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/x-00-weapons.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/x-00-weapons.yml @@ -33,7 +33,7 @@ defaultDirection: 1, 0 - type: HitscanBatteryAmmoProvider proto: RedMediumSplitLaser - fireCost: 50 # Omu + fireCost: 40 # Omu - type: StaticPrice price: 2500 From 8bf80f108ba85ae44365a240c0f810ebe4e12cdf Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Thu, 15 Jan 2026 17:03:26 -0600 Subject: [PATCH 36/54] Update battery_cell.yml --- .../Weapons/Guns/Ammunition/Magazines/battery_cell.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Ammunition/Magazines/battery_cell.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Ammunition/Magazines/battery_cell.yml index aa930ac06f8..92c24c57467 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Ammunition/Magazines/battery_cell.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Ammunition/Magazines/battery_cell.yml @@ -172,7 +172,7 @@ sprite: _Goobstation/Objects/Weapons/Guns/Ammunition/Magazine/energy_cell_rifle_lethal.rsi - type: HitscanBatteryAmmoProvider proto: MediumRedLaser - fireCost: 66.6 # Omu + fireCost: 80 # Omu - type: entity name: x-ray sniper power cell @@ -185,7 +185,7 @@ sprite: _Goobstation/Objects/Weapons/Guns/Ammunition/Magazine/energy_cell_rifle_xray.rsi - type: HitscanBatteryAmmoProvider proto: MediumXrayLaser - fireCost: 66.6 # Omu + fireCost: 80 # Omu - type: entity name: overclocked sniper power cell @@ -198,7 +198,7 @@ sprite: _Goobstation/Objects/Weapons/Guns/Ammunition/Magazine/energy_cell_rifle_overcharge.rsi - type: HitscanBatteryAmmoProvider proto: MediumOverchargedLaser - fireCost: 140 # Omu + fireCost: 160 # Omu - type: entity name: pulse sniper power cell @@ -211,7 +211,7 @@ sprite: _Goobstation/Objects/Weapons/Guns/Ammunition/Magazine/energy_cell_rifle_pulse.rsi - type: HitscanBatteryAmmoProvider proto: MediumPulseLaser - fireCost: 66.6 # Omu + fireCost: 80 # Omu - type: entity name: ion sniper power cell @@ -224,7 +224,7 @@ sprite: _Goobstation/Objects/Weapons/Guns/Ammunition/Magazine/energy_cell_rifle_ion.rsi - type: HitscanBatteryAmmoProvider proto: MediumIonLaser - fireCost: 66.6 # Omu + fireCost: 80 # Omu - type: entity From b22c171b89c97cbcd505e54f87574b2aa4ea5b20 Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Thu, 15 Jan 2026 17:06:10 -0600 Subject: [PATCH 37/54] Update x-00-weapons.yml --- .../Entities/Objects/Weapons/Guns/Battery/x-00-weapons.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/x-00-weapons.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/x-00-weapons.yml index ab2d8a44e05..401301023a3 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/x-00-weapons.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/x-00-weapons.yml @@ -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 From 47bf5695b4dd5f52cd8ef04740ce9185e0e25d15 Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Thu, 15 Jan 2026 17:10:59 -0600 Subject: [PATCH 38/54] Update projectiles.yml --- .../Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 6787d2fd9f6..c0328a56292 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -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 From 1205b6fda5a784d431465cf10cb972feb6fd5d7d Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Thu, 15 Jan 2026 21:40:52 -0600 Subject: [PATCH 39/54] Update battery_cell.yml --- .../Weapons/Guns/Ammunition/Magazines/battery_cell.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Ammunition/Magazines/battery_cell.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Ammunition/Magazines/battery_cell.yml index 92c24c57467..a2ac01a14ef 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Ammunition/Magazines/battery_cell.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Ammunition/Magazines/battery_cell.yml @@ -172,7 +172,7 @@ sprite: _Goobstation/Objects/Weapons/Guns/Ammunition/Magazine/energy_cell_rifle_lethal.rsi - type: HitscanBatteryAmmoProvider proto: MediumRedLaser - fireCost: 80 # Omu + fireCost: 66.6 # Omu - type: entity name: x-ray sniper power cell @@ -185,7 +185,7 @@ sprite: _Goobstation/Objects/Weapons/Guns/Ammunition/Magazine/energy_cell_rifle_xray.rsi - type: HitscanBatteryAmmoProvider proto: MediumXrayLaser - fireCost: 80 # Omu + fireCost: 66.6 # Omu - type: entity name: overclocked sniper power cell @@ -198,7 +198,7 @@ sprite: _Goobstation/Objects/Weapons/Guns/Ammunition/Magazine/energy_cell_rifle_overcharge.rsi - type: HitscanBatteryAmmoProvider proto: MediumOverchargedLaser - fireCost: 160 # Omu + fireCost: 133.3 # Omu - type: entity name: pulse sniper power cell @@ -211,7 +211,7 @@ sprite: _Goobstation/Objects/Weapons/Guns/Ammunition/Magazine/energy_cell_rifle_pulse.rsi - type: HitscanBatteryAmmoProvider proto: MediumPulseLaser - fireCost: 80 # Omu + fireCost: 66.6 # Omu - type: entity name: ion sniper power cell @@ -224,7 +224,7 @@ sprite: _Goobstation/Objects/Weapons/Guns/Ammunition/Magazine/energy_cell_rifle_ion.rsi - type: HitscanBatteryAmmoProvider proto: MediumIonLaser - fireCost: 80 # Omu + fireCost: 66.6 # Omu - type: entity From 5ee54c748430f7fd75b1f63b6c669e166d8e9622 Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Thu, 15 Jan 2026 21:42:25 -0600 Subject: [PATCH 40/54] Update battery_guns.yml --- .../Entities/Objects/Weapons/Guns/Battery/battery_guns.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 7389da781ed..0c1a245e4eb 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -699,7 +699,7 @@ path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg - type: HitscanBatteryAmmoProvider proto: RedHeavyLaser - fireCost: 83.3 # Omu + fireCost: 71.4 # Omu - type: Tag tags: - TurretCompatibleWeapon @@ -769,7 +769,7 @@ path: /Audio/Weapons/Guns/Gunshots/laser3.ogg - type: HitscanBatteryAmmoProvider proto: XrayLaser - fireCost: 83.3 # Omu + fireCost: 62.5 # Omu - type: MagazineVisuals magState: mag steps: 5 From baec976675939a163fff455b0d333f80e679019c Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Thu, 15 Jan 2026 21:48:17 -0600 Subject: [PATCH 41/54] Increase heat damage for overcharged lasers --- .../Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml index 526c18081a3..b37e9627acf 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml @@ -54,7 +54,7 @@ fireStacks: 0.6 # Omu damage: types: - Heat: 13 # Omu + Heat: 15 # Omu muzzleFlash: sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi state: muzzle_beam_light_overcharged @@ -131,7 +131,7 @@ fireStacks: 1 # Omu damage: types: - Heat: 17 # Omu + Heat: 19 # Omu muzzleFlash: sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi state: muzzle_beam_light_overcharged From 1d1cb5cc440ea67034a2d024cdf5ad8e68bcd619 Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Thu, 15 Jan 2026 22:04:48 -0600 Subject: [PATCH 42/54] Update hitscan.yml --- .../Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml index b37e9627acf..3f61dbcb275 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml @@ -54,7 +54,7 @@ fireStacks: 0.6 # Omu damage: types: - Heat: 15 # Omu + Heat: 14 # Omu muzzleFlash: sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi state: muzzle_beam_light_overcharged @@ -131,7 +131,7 @@ fireStacks: 1 # Omu damage: types: - Heat: 19 # Omu + Heat: 18 # Omu muzzleFlash: sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi state: muzzle_beam_light_overcharged From a51e15788da58dc3ede1558a64323722cc061f53 Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Fri, 16 Jan 2026 10:26:41 -0600 Subject: [PATCH 43/54] Update magfed_lasers.yml --- .../Entities/Objects/Weapons/Guns/Battery/magfed_lasers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/magfed_lasers.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/magfed_lasers.yml index b2148b96549..4473de47e4e 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/magfed_lasers.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/magfed_lasers.yml @@ -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 From 93e832999adc9e07beaeb7d094b6add2d5d3727e Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Fri, 16 Jan 2026 10:33:09 -0600 Subject: [PATCH 44/54] Update x-00-weapons.yml --- .../Entities/Objects/Weapons/Guns/Battery/x-00-weapons.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/x-00-weapons.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/x-00-weapons.yml index 401301023a3..ce70a58f284 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/x-00-weapons.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/x-00-weapons.yml @@ -102,7 +102,7 @@ - type: GunRequiresWield #remove when inaccuracy on spreads is fixed - type: ProjectileBatteryAmmoProvider proto: BulletLaserSpreadHeavy - fireCost: 80 # Omu + fireCost: 83.3 # Omu - type: StaticPrice price: 2500 @@ -133,7 +133,7 @@ - type: GunRequiresWield - type: HitscanBatteryAmmoProvider proto: LaserSniper - fireCost: 83.3 + fireCost: 83.3 # Omu - type: SpeedModifiedOnWield walkModifier: 0.80 sprintModifier: 0.80 From 6ce44497af57123eda7c59e2cf6ce561adb99355 Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Fri, 16 Jan 2026 10:34:34 -0600 Subject: [PATCH 45/54] Update projectiles.yml --- .../Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 5abc81931d3..593b74ce6c1 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -244,7 +244,7 @@ types: Heat: 12 Shock: 1 # Omu - Structural: 10 + Structural: 20 # Omu - type: entity name: heavy laser barrage From 382e5edfe232a824ad566c7461180a9b93cb74c3 Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Fri, 16 Jan 2026 10:35:31 -0600 Subject: [PATCH 46/54] revert --- .../Entities/Objects/Weapons/Guns/Battery/battery_guns.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 911516efe22..2e88a59ee6c 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -477,7 +477,7 @@ repeatable: true - type: BatterySelfRecharger autoRecharge: true - autoRechargeRate: 40 + autoRechargeRate: 50 autoRechargePause: true autoRechargePauseTime: 20 #Omu From e217731665a31ed9a7116daf93ed292c2a7b19e7 Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Fri, 16 Jan 2026 10:36:24 -0600 Subject: [PATCH 47/54] Update battery_guns.yml --- .../Entities/Objects/Weapons/Guns/Battery/battery_guns.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 2e88a59ee6c..b5b402d0bac 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -477,7 +477,7 @@ repeatable: true - type: BatterySelfRecharger autoRecharge: true - autoRechargeRate: 50 + autoRechargeRate: 40 #Omu autoRechargePause: true autoRechargePauseTime: 20 #Omu From f8772398ccf992d1f118ea3d92a588aa810e51d3 Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Fri, 16 Jan 2026 11:20:27 -0600 Subject: [PATCH 48/54] Dmg+1 --- .../Objects/Weapons/Guns/Projectiles/hitscan.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml index 3f61dbcb275..44f30314cf6 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml @@ -84,7 +84,7 @@ id: MediumRedLaser damage: types: - Heat: 13 # Omu + Heat: 14 # Omu muzzleFlash: sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi state: muzzle_beam_light @@ -99,7 +99,7 @@ id: MediumIonLaser damage: types: - Ion: 17 # Omu + Ion: 18 # Omu muzzleFlash: sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi state: muzzle_beam_light_ion @@ -114,7 +114,7 @@ id: MediumXrayLaser damage: types: - Heat: 6 # Omu + Heat: 7 # Omu Radiation: 7 # Omu muzzleFlash: sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi @@ -131,7 +131,7 @@ fireStacks: 1 # Omu damage: types: - Heat: 18 # Omu + Heat: 19 # Omu muzzleFlash: sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi state: muzzle_beam_light_overcharged @@ -146,7 +146,7 @@ id: MediumPulseLaser damage: types: - Heat: 20 # Omu + Heat: 21 # Omu muzzleFlash: sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi state: muzzle_beam_light_pulse From 4546dd1605c5c2ac59c7b47808611cf5f5b971c0 Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Fri, 16 Jan 2026 11:22:41 -0600 Subject: [PATCH 49/54] ooops --- .../Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml index 44f30314cf6..006b46de32a 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml @@ -131,7 +131,7 @@ fireStacks: 1 # Omu damage: types: - Heat: 19 # Omu + Heat: 18 # Omu muzzleFlash: sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi state: muzzle_beam_light_overcharged @@ -146,7 +146,7 @@ id: MediumPulseLaser damage: types: - Heat: 21 # Omu + Heat: 20 # Omu muzzleFlash: sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi state: muzzle_beam_light_pulse From be55b6fdd6a54c96680179298a0d5e89200b3617 Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Fri, 16 Jan 2026 11:24:20 -0600 Subject: [PATCH 50/54] actually 13's more than enough --- .../Objects/Weapons/Guns/Projectiles/hitscan.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml index 006b46de32a..ee73a963be0 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml @@ -84,7 +84,7 @@ id: MediumRedLaser damage: types: - Heat: 14 # Omu + Heat: 13 # Omu muzzleFlash: sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi state: muzzle_beam_light @@ -99,7 +99,7 @@ id: MediumIonLaser damage: types: - Ion: 18 # Omu + Ion: 17 # Omu muzzleFlash: sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi state: muzzle_beam_light_ion @@ -114,8 +114,8 @@ id: MediumXrayLaser damage: types: - Heat: 7 # Omu - Radiation: 7 # Omu + Heat: 6.5 # Omu + Radiation: 6.5 # Omu muzzleFlash: sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi state: muzzle_beam_light_xray @@ -131,7 +131,7 @@ fireStacks: 1 # Omu damage: types: - Heat: 18 # Omu + Heat: 17 # Omu muzzleFlash: sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi state: muzzle_beam_light_overcharged @@ -146,7 +146,7 @@ id: MediumPulseLaser damage: types: - Heat: 20 # Omu + Heat: 19 # Omu muzzleFlash: sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi state: muzzle_beam_light_pulse From afc5248ddf22848368968421bb071c90873120d4 Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Fri, 16 Jan 2026 11:25:39 -0600 Subject: [PATCH 51/54] pulse dmg was wrong --- .../Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml index ee73a963be0..0f93912b5bd 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml @@ -146,7 +146,7 @@ id: MediumPulseLaser damage: types: - Heat: 19 # Omu + Heat: 20 # Omu muzzleFlash: sprite: _Goobstation/Objects/Weapons/Guns/Projectiles/small_laser.rsi state: muzzle_beam_light_pulse From 63dfa1ad8919166b423119adf996a1e4f7d401c5 Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Fri, 16 Jan 2026 11:26:26 -0600 Subject: [PATCH 52/54] Update hitscan.yml --- .../Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml index 0f93912b5bd..af16088193d 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml @@ -162,7 +162,7 @@ damage: types: Heat: 18 # Omu - Shock: 4 # Omu + Shock: 4 muzzleFlash: sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi state: muzzle_beam_heavy From d84d6a1471104dc655fe4636449c11403e8137ee Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Fri, 16 Jan 2026 11:41:16 -0600 Subject: [PATCH 53/54] no need for shock --- .../Objects/Weapons/Guns/Projectiles/projectiles.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 593b74ce6c1..82c18f33ad0 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -229,8 +229,8 @@ impactEffect: BulletImpactEffectOrangeDisabler damage: types: - Heat: 11 # Omu - Shock: 1 # Omu + Heat: 12 # Omu + - type: entity name: heavy laser bolt @@ -242,8 +242,7 @@ impactEffect: BulletImpactEffectOrangeDisabler damage: types: - Heat: 12 - Shock: 1 # Omu + Heat: 13 # Omu Structural: 20 # Omu - type: entity From 2ed44d99edfddf52ef4bddedde127fc36b6f7718 Mon Sep 17 00:00:00 2001 From: WazuraWasTaken Date: Fri, 16 Jan 2026 17:22:52 -0600 Subject: [PATCH 54/54] Adjust fire cost and battery charge values --- .../Objects/Weapons/Guns/Battery/battery_guns.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 0c1a245e4eb..3a2ce538367 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -1242,16 +1242,16 @@ - type: EnergyGun # Omu fireModes: - proto: BulletTemperatureCold - fireCost: 62.5 # Omu + fireCost: 40 # Omu name: cooling # Omu state: cooling # Omu - proto: BulletTemperatureHot - fireCost: 62.5 # Omu + 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