Skip to content

Commit

Permalink
Re-ports tweaks from PR Simple-Station#43, Simple-Station#45, Simple-…
Browse files Browse the repository at this point in the history
…Station#34 (Simple-Station#51)

<!-- Please read these guidelines before opening your PR:
https://docs.spacestation14.io/en/getting-started/pr-guideline -->
<!-- The text between the arrows are comments - they will not be visible
on your PR. -->

## About the PR
<!-- What did you change in this PR? -->
Ported tweaks

## Why / Balance
<!-- Why was it changed? Link any discussions or issues here. Please
discuss how this would affect game balance. -->
Tweaks.

## Technical details
<!-- If this is a code change, summarize at high level how your new code
works. This makes it easier to review. -->
Yaml changes.

## Media
<!-- 
PRs which make ingame changes (adding clothing, items, new features,
etc) are required to have media attached that showcase the changes.
Small fixes/refactors are exempt.
Any media may be used in SS14 progress reports, with clear credit given.

If you're unsure whether your PR will require media, ask a maintainer.
-->

## Requirements
<!-- 
Due to influx of PR's we require to ensure that PR's are following the
correct guidelines.

Please take a moment to read these if its your first time.

Check the boxes below to confirm that you have in fact seen these (put
an X in the brackets, like [X]):
-->
- [X] I have read and I am following the [Pull Request
Guidelines](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html).
I understand that not doing so may get my pr closed at maintainer’s
discretion
- [X] I have added screenshots/videos to this PR showcasing its changes
ingame, **or** this PR does not require an ingame showcase

## Breaking changes
<!--
List any breaking changes, including namespace, public
class/method/field changes, prototype renames; and provide instructions
for fixing them. This will be pasted in #codebase-changes.
-->
None, I hope.

**Changelog**
<!--
Make players aware of new features and changes that could affect how
they play the game by adding a Changelog entry. Please read the
Changelog guidelines located at:
https://docs.spacestation14.io/en/getting-started/pr-guideline#changelog
-->

<!--
Make sure to take this Changelog template out of the comment block in
order for it to show up. Changelog must have a 🆑 symbol, so the bot
recognizes the changes and adds them to the game's changelog.-->
🆑 TwoDucksOnnaPlane & TheGreenChkrta
- tweak: Added back damage tweaks
  • Loading branch information
SsalamethVersaach authored Sep 10, 2024
2 parents d338394 + 3f91ada commit fe2af75
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,19 @@
map: ["enum.GunVisualLayers.Base"]
- state: mag-0
map: ["enum.GunVisualLayers.Mag"]
- type: GunWieldBonus
minAngle: -20
maxAngle: -50
- type: Gun
fireRate: 2
minAngle: 21
maxAngle: 54
angleIncrease: 6
angleDecay: 24
fireRate: 6
selectedMode: SemiAuto
availableModes:
- SemiAuto
- Burst
- type: ChamberMagazineAmmoProvider
- type: ItemSlots
slots:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# Used by the Vulcan, L6SAW, Mark 1, Ceremonial, and the AKMS. Unsure if there's more.
- type: entity
id: BulletLightRifle
name: bullet (.20 rifle)
Expand All @@ -7,7 +8,7 @@
- type: Projectile
damage:
types:
Piercing: 19
Piercing: 24

- type: entity
id: BulletLightRiflePractice
Expand Down Expand Up @@ -40,8 +41,8 @@
- type: Projectile
damage:
types:
Blunt: 3
Heat: 16
Blunt: 5
Heat: 19

- type: entity
id: BulletLightRifleUranium
Expand All @@ -52,5 +53,6 @@
- type: Projectile
damage:
types:
Radiation: 9
Piercing: 10
Radiation: 10
Piercing: 5
ignoreResistances: true
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
- type: Projectile
damage:
types:
Piercing: 17
Piercing: 24

- type: entity
id: BulletRiflePractice
Expand Down Expand Up @@ -40,9 +40,9 @@
- type: Projectile
damage:
types:
Blunt: 2
Heat: 15
Blunt: 4
Heat: 20

- type: entity
id: BulletRifleUranium
parent: BaseBulletUranium
Expand All @@ -52,6 +52,7 @@
- type: Projectile
damage:
types:
Radiation: 7
Piercing: 8

Radiation: 10
Piercing: 5
ignoreResistances: true

Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
path: /Audio/SimpleStation14/Weapons/Melee/rapierhit.ogg
damage:
types:
Slash: 17 #cmon, it has to be at least BETTER than the rest.
Slash: 20 #cmon, it has to be at least BETTER than the rest.
heavyRateModifier: 0.8
heavyRangeModifier: 1
heavyDamageBaseModifier: 1
Expand Down

0 comments on commit fe2af75

Please sign in to comment.