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

Gun Rebalancing Pt. 2 - Literally Everything Else (I Think) #28

Merged
merged 3 commits into from
Jan 6, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
damage:
types:
Piercing: 40
Structural: 30
Structural: 150 # Goob Station MRP - buff damage
- type: StaminaDamageOnCollide
damage: 35
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
- type: Projectile
damage:
types:
Piercing: 19
# least minigun still exists
Piercing: 24 # Goob Station MRP - buff damage

- type: entity
id: BulletMinigun
name: minigun bullet (.10 rifle)
Expand All @@ -19,4 +19,4 @@
- type: Projectile
damage:
types:
Piercing: 5
Piercing: 24 # Goob Station MRP - buff damage
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
- type: Projectile
damage:
types:
Piercing: 24
Piercing: 24 # Goob Station MRP - buff damage

- type: entity
id: BulletLightRiflePractice
Expand Down Expand Up @@ -41,8 +41,8 @@
- type: Projectile
damage:
types:
Blunt: 5
Heat: 19
Blunt: 4 # Goob Station MRP - buff Blunt/Heat damage
Heat: 20

- type: entity
id: BulletLightRifleUranium
Expand All @@ -55,4 +55,4 @@
types:
Radiation: 10
Piercing: 5
ignoreResistances: true
ignoreResistances: true # Goob Station MRP - ignore resistances
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
- type: Projectile
damage:
types:
Piercing: 16
Piercing: 20 # Goob Station MRP - buff damage

- type: entity
id: BulletPistolPractice
Expand Down Expand Up @@ -41,16 +41,17 @@
damage:
types:
Blunt: 2
Heat: 14
Heat: 18 # Goob Station MRP - buff damage

- type: entity
id: BulletPistolUranium
parent: BaseBulletUranium
name: bullet (.35 auto uranium)
categories: [ HideSpawnMenu ]
components:
- type: Projectile
- type: Projectile # Goob Station - ignore resistances
damage:
types:
Radiation: 6
Radiation: 5
Piercing: 10
ignoreResistances: true
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
- type: Projectile
damage:
types:
Piercing: 24
Piercing: 24 # Goob Station MRP - buff damage

- type: entity
id: BulletRiflePractice
Expand Down Expand Up @@ -38,7 +38,7 @@
categories: [ HideSpawnMenu ]
components:
- type: Projectile
damage:
damage: # Goob Station MRP - buff damage
types:
Blunt: 4
Heat: 20
Expand All @@ -49,7 +49,7 @@
name: bullet (0.20 rifle uranium)
categories: [ HideSpawnMenu ]
components:
- type: Projectile
- type: Projectile # Goob Station MRP - ignore resistances
damage:
types:
Radiation: 10
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
- type: Projectile
damage:
types:
Piercing: 28
Piercing: 40 # Goob Station MRP - buff damage

- type: entity
id: PelletShotgunBeanbag
Expand Down Expand Up @@ -50,7 +50,7 @@
- type: ProjectileSpread
proto: PelletShotgun
count: 6
spread: 15
spread: 10 # Goob Station MRP - tighten up the spread

- type: entity
id: PelletShotgunIncendiary
Expand All @@ -77,7 +77,7 @@
- type: ProjectileSpread
proto: PelletShotgunIncendiary
count: 6
spread: 15
spread: 10 # Goob Station MRP - tighten up the spread

- type: entity
id: PelletShotgunPractice
Expand All @@ -101,7 +101,7 @@
- type: ProjectileSpread
proto: PelletShotgunPractice
count: 6
spread: 15
spread: 10 # Goob Station MRP - tighten up the spread

- type: entity
id: PelletShotgunImprovised
Expand Down Expand Up @@ -211,11 +211,12 @@
- type: Sprite
sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
state: depleted-uranium
- type: Projectile
- type: Projectile # Goob Station - ignore resistances
damage:
types:
Radiation: 5
Piercing: 5
Piercing: 2.5
ignoreResistances: true

- type: entity
id: PelletShotgunUraniumSpread
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
id: RedLaser
damage:
types:
Heat: 14
Heat: 20 # Goob Station MRP - buff damage
muzzleFlash:
sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
state: muzzle_laser
Expand Down Expand Up @@ -50,7 +50,7 @@
id: RedMediumLaser
damage:
types:
Heat: 17
Heat: 24 # Goob Station MRP - buff damage
muzzleFlash:
sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
state: muzzle_laser
Expand Down Expand Up @@ -81,7 +81,7 @@
damage:
types:
Heat: 10
Radiation: 10
Radiation: 15 # Goob Station MRP - buff damage
muzzleFlash:
sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
state: muzzle_xray
Expand All @@ -96,7 +96,7 @@
id: RedHeavyLaser
damage:
types:
Heat: 28
Heat: 30 # Goob Station MRP - buff damage
muzzleFlash:
sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
state: muzzle_beam_heavy
Expand All @@ -111,7 +111,7 @@
id: Pulse
damage:
types:
Heat: 35
Heat: 45 # Goob Station MRP - buff damage
muzzleFlash:
sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
state: muzzle_blue
Expand Down
Loading