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.

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

Increase the damage of rubber bullet projectiles #1014

Closed
wants to merge 8 commits into from
Closed

Increase the damage of rubber bullet projectiles #1014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
33b3146
Increase the damage of rubber bullet projectiles
Samsterious Mar 27, 2024
7c267f5
Increase blunt damage of the Mantis' rubber bullets as well
Samsterious Mar 27, 2024
f9ec836
Merge branch 'master' into tweak-rubber-bullets
Samsterious Mar 28, 2024
58b8f4a
Merge branch 'master' into tweak-rubber-bullets
Samsterious Mar 29, 2024
fb9dd12
Merge branch 'master' into tweak-rubber-bullets
Samsterious Mar 30, 2024
3d54304
Merge branch 'master' into tweak-rubber-bullets
Samsterious Apr 2, 2024
67cfb2c
Merge branch 'master' into tweak-rubber-bullets
Samsterious Apr 3, 2024
7a40bed
Merge branch 'DeltaV-Station:master' into tweak-rubber-bullets
Samsterious Apr 11, 2024
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
2 changes: 1 addition & 1 deletion Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/special.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
- type: Projectile
damage:
types:
Blunt: 3
Blunt: 6
- type: StaminaDamageOnCollide
damage: 30

Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@
- type: Projectile
damage:
types:
Blunt: 3
Blunt: 5 # Delta-V: Previously 3. Rubber bullets are otherwise a direct upgrade to disablers.
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
- type: Projectile
damage:
types:
Blunt: 3
Blunt: 5 # Delta-V: Previously 3. Rubber bullets are otherwise a direct upgrade to disablers.

- type: entity
id: BulletLightRifleIncendiary
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
- type: Projectile
damage:
types:
Blunt: 3
Blunt: 9 # Delta-V: Previously 3. Rubber bullets are otherwise a direct upgrade to disablers. More cuz revolver, as below.
- type: StaminaDamageOnCollide
damage: 35 # 3 hits to stun cuz revolver

Expand All @@ -44,7 +44,7 @@
types:
Blunt: 3
Heat: 32

- type: entity
id: BulletMagnumAP
name: bullet (.45 magnum armor-piercing)
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
- type: Projectile
damage:
types:
Blunt: 3
Blunt: 5 # Delta-V: Previously 3. Rubber bullets are otherwise a direct upgrade to disablers.

- type: entity
id: BulletPistolIncendiary
Expand Down
6 changes: 3 additions & 3 deletions Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
- type: Projectile
damage:
types:
Blunt: 3
Blunt: 5 # Delta-V: Previously 3. Rubber bullets are otherwise a direct upgrade to disablers.

- type: entity
id: BulletRifleIncendiary
Expand All @@ -42,7 +42,7 @@
types:
Blunt: 2
Heat: 15

- type: entity
id: BulletRifleUranium
parent: BaseBulletUranium
Expand All @@ -54,4 +54,4 @@
types:
Radiation: 7
Piercing: 8

2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
- type: Projectile
damage:
types:
Blunt: 3
Blunt: 5 # Delta-V: Previously 3. Rubber bullets are otherwise a direct upgrade to disablers.
soundHit:
path: /Audio/Weapons/Guns/Hits/snap.ogg
- type: StaminaDamageOnCollide
Expand Down
Loading