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

small pr to make firemode code easier | or, how firemode code was so fucking terrible that this pr touches like 20-30 files #3061

Merged
merged 16 commits into from
Jun 6, 2024

Conversation

rye-rice
Copy link
Member

@rye-rice rye-rice commented Jun 2, 2024

About The Pull Request

Wanted to add pride flags for pride month, but had to get this 'small pr' out the way. Oops.

tldr; as a player, this should not affect you. Like at all. Move along

This changes firemodes to not be fucking terrible codewise and to touch as a developer. Yes, i HAD to touch gun.dm that much. That was how deep rooted the rot was.

Also get's rid of the 0.4 second hardcoded fire delay, now pistols and revolvers shoot as fast as they were intended. Great. This meant that i had to touch a bunch of numbers i set to 0 out of frustration at it not working, being completely unaware of the hardcoded fire delay.

This also fixes the E-40 to have laser full auto and to have an ammo counter. I wasn't even trying to fix the E-40, but by unshittifying firemode code i got it to work. Wow.

Why It's Good For The Game

This should make the 3 upcoming gun expansions less ass to add.

Changelog

🆑
add: Changing firemodes on guns now have new sprites
fix: The E-40 now works as intended!
add: The E-40 now has an ammo counter
balance: The P16 shoots slightly faster.
balance: .299 Eoehoma caseless has gotten a slight nerf, while the E-40 shoots slightly faster.
balance: Two E-40s max are obtainable from the black market should it spawn. Blank market price cap of the E-40 has also increased

/:cl:

@rye-rice rye-rice requested a review from a team as a code owner June 2, 2024 00:59
@github-actions github-actions bot added Sprites A bikeshed full of soulless bikes. Code change Watch something violently break. labels Jun 2, 2024
Copy link
Contributor

github-actions bot commented Jun 2, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Jun 2, 2024
Copy link
Member

@FalloutFalcon FalloutFalcon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will review properly at some point,, gun.dm is annyoing to read cause of the shuffled procs..
on first skim looks good
would be nice to see all the random balance changes as its own pr..

///BASICALLY: the little button you select firing modes from? this is jsut the prefix of the icon state of that. For example, if we set it as "laser", the fire select will use "laser_single" and so on.
var/fire_select_icon_state_prefix = ""
///If true, we put "safety_" before fire_select_icon_state_prefix's prefix. ex. "safety_laser_single"
var/adjust_fire_select_icon_state_on_safety = FALSE
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is a wordy var but shrug

@github-actions github-actions bot requested a review from FalloutFalcon June 2, 2024 22:00
@github-actions github-actions bot added Merge Conflict Use Git Hooks, you're welcome. and removed Merge Conflict Use Git Hooks, you're welcome. labels Jun 2, 2024
Copy link
Contributor

github-actions bot commented Jun 2, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Jun 3, 2024
Copy link
Member

@Sun-Soaked Sun-Soaked left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Worked in testmerge, superficial look seems good.

it's on me if this breaks somehow

@Sun-Soaked Sun-Soaked added this pull request to the merge queue Jun 6, 2024
Merged via the queue into shiptest-ss13:master with commit c586916 Jun 6, 2024
14 checks passed
MrCat15352 pushed a commit to MrCat15352/MrCat that referenced this pull request Jun 22, 2024
…fucking terrible that this pr touches like 20-30 files (shiptest-ss13#3061)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

Wanted to add pride flags for pride month, but had to get this 'small
pr' out the way. Oops.

tldr; as a player, this should not affect you. Like at all. Move along

This changes firemodes to not be fucking terrible codewise and to touch
as a developer. Yes, i HAD to touch gun.dm that much. That was how deep
rooted the rot was.

Also get's rid of the 0.4 second hardcoded fire delay, now pistols and
revolvers shoot as fast as they were intended. Great. This meant that i
had to touch a bunch of numbers i set to 0 out of frustration at it not
working, being completely unaware of the hardcoded fire delay.

This also fixes the E-40 to have laser full auto and to have an ammo
counter. I wasn't even trying to fix the E-40, but by unshittifying
firemode code i got it to work. Wow.

This should make the 3 upcoming gun expansions less ass to add.

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

:cl:
add: Changing firemodes on guns now have new sprites
fix: The E-40 now works as intended!
add: The E-40 now has an ammo counter
balance: The P16 shoots slightly faster.
balance: .299 Eoehoma caseless has gotten a slight nerf, while the E-40
shoots slightly faster.
balance: Two E-40s max are obtainable from the black market should it
spawn. Blank market price cap of the E-40 has also increased

/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Co-authored-by: retlaw34 <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code change Watch something violently break. Sprites A bikeshed full of soulless bikes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants