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
Some ammo rack fixes/tweaks #2639
Open
benbot16
wants to merge
10
commits into
BeeStation:master
Choose a base branch
from
benbot16:loadrack
base: master
Could not load branches
Branch not found: {{ refName }}
Could not load tags
Nothing to show
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
+395
−368
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Bokkiewokkie
added
Fix
Tweak
Munitions
Issues and pull requests related to munitions.
labels
May 5, 2024
Bokkiewokkie
previously approved these changes
May 5, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just some suggestions, the code is fine
nsv13/code/modules/munitions/ship_weapons/ballistic_weapons/revision2/ammo_rack.dm
Outdated
Show resolved
Hide resolved
nsv13/code/modules/munitions/ship_weapons/ballistic_weapons/revision2/ammo_rack.dm
Show resolved
Hide resolved
Bokkiewokkie
previously approved these changes
May 6, 2024
Bokkiewokkie
approved these changes
May 10, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About The Pull Request
This PR improves the code for ammo racks a bit, allows for loading ammo racks via attackby, adds some sanity checks to ammunition exiting ammo racks, and adjusts jamming SFX to only play when the ammo rack first jams. It also adjusts the to_chat messages to hopefully be a bit clearer.
It also moves ammo rack code into its own DM file, moves the circuits into the NSV circuit file, and organizes the code a bit.
Why It's Good For The Game
This fixes a couple of edge cases with racks (such as getting nulls in the ammo list, oil sometimes not fully repairing racks). It also removes the SFX-spam capability of jammed ammo racks, and hopefully cuts down on accidentally disassembling racks while trying to unjam them.
Testing Photographs and Procedure
Screenshots&Videos
![image](https://github.com/BeeStation/NSV13/assets/9423435/7c691e50-9bde-4811-8295-2af85c338d04)Changelog
🆑
add: Ammo racks may now be loaded by attacking them with ammunition
tweak: Jam SFX now plays on jam instead of on load attempt
fix: Fixes a few ammo rack-related edge cases
/:cl: