Made big XM88 boxes behave like other handful boxes #6693
Merged
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
Merged
|
This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself |
Drulikar
approved these changes
Jul 21, 2024
cm13-github
added a commit
that referenced
this pull request
Jul 21, 2024
github-merge-queue bot
pushed a commit
that referenced
this pull request
Aug 22, 2024
# About the pull request Pr contains a lot of req related tweaks that are just too minor and too numerous, and touch the same files, so i just combined them all into one pr. **Adds to ASRS store:** - HIDP, AGM-I grenade boxes - Fragmentation mortar shells **Adds to req vendors:** - External webbings - XM88 ammo packets - XM88 ammo box (will start working when #6693 gets merged) - HPDP WP nade packets - HIDP, AMG-F, AGM-I grenade boxes - Metal foam grenade packets - Flashlight box - 16g breaching slugs packet Chance of ingridients crate to be sent by asrs have been lowered, because it is too annoyingly common, and it's not needed by MST in that quantity. Req clothing vendor now has different backpacks, boots, uniforms. M4A3 HP mags are now in ASRS rotation, with the same chance as M4A3 AP. Added qm fluff locker to qm's office, as well some decor to it as well. Added some paper bins to req area. Tweaked xm88 packet from 90 to 100 rounds. Tweaked hpr holo ammo price in asrs from 3000 to 2000 (normal ammo costs 2000) Package wrapper now has wider selection of crate skins to chose from. Added megaphone use sound and inhand sprites. Made QM's jacket a subtype of marine jacket, which solves numerous inconsistencies between them. Added slightly edited [Quartermaster Creed](https://quartermaster.army.mil/qm_creed.html) plaque to the QM's office, with unique sprite. HPDP nades exist in weak and strong variants, which look the same and have the same name, i made them into CCDP and WPDP, to easily differ them between one another. Combat flashlights now have unique sprites, added combat flashlight ammo box, also tweaked combat flashlight desc. Added QM beret from #6701 Added req vendor animations and sounds. <details> https://github.com/user-attachments/assets/cf0044af-dd51-426f-b268-4db3bdc28d41 </details> Fixed incorrect wall smoothing near req vendors. <details> Before  After  </details> All new sprites by me. # Explain why it's good for the game Just overall fixes, qol and tweaks About xm88, it is the only weapon kit in req vendor that doesn't have its ammo in the ammo vendor, i corrected that About external webbings, it has the same stats as hazard vests, and overall it's literally resprite of it, added it by popular demand. # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary>      https://github.com/user-attachments/assets/627f87d4-639f-498e-b7dc-5bc13df2aef4   </details> # Changelog :cl: add: HPDP strong and weak are now CCDP and WPDP, CCDP now has unique packet sprite and nade sprite (no balance changes) add: added combat flashlight box and also combat flashlight unique sprite, tweaked desc to better convey that add: added frag mortar shells to req asrs store add: added qm fluff/spare items locker with some niche things add: xm88 ammo packets and ammo box to req ammo vendor add: added external webbings to req equipment vendor add: added quartermaster beret to qm vendor add: package wrapper now has more crate skins add: metal foal grenade packets add: req vendors now play small animation and sound, also they have small vend delay to fit animation framing add: added flashlight box to req vendor add: m4a3 hp ammo boxes to asrs pool add: HIDP, AGM-I, AGM-F grenade boxes to req vendor and asrs store add: req clothing vendor now has different: uniforms, boots, backpacks add: megaphone use sounds and inhands icons add: Added flat icon support to spritesheets for boxes, ammo boxes, and reagent containers so they display their overlays in vendors qol: remade list in req clothing vendor qol: lowered chance of ingridients crate to be sent by asrs qol: qm jacket is now identical in stats and capabilities to service jacket balance: changed XM88 packets capacity from 90 to 100 (is it needed for correct ammo box calculations) balance: ASRS price of HPR holo target ammo is now the same as the normal ammo fix: fixed HPDP packets not being vendable by req equipment vendor fix: fixed HPR ASRS ammo crate having incorrect sprite fix: breaching slugs packets can now be refilled into req vendor refactor: nade boxes icons refactor maptweak: added some chairs, qm locker, lamp to qm's office maptweak: added paper bins and some pens to main req area maptweak: added some rack kits to req storage maptweak: fixed incorrect wall smoothing near req vendor /:cl: --------- Co-authored-by: Drulikar <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
Recently Blundir mentioned the XM88 boxes don't behave like the shotgun handful boxes for the purpose of restocking them in Requisitions. It was due to them referencing the handful ammo rather than the box of ammo. I made them consistent with how the shotgun ammo boxes are handled. Tested and the boxes behave properly.
Explain why it's good for the game
More uniform code is good. Plus with this change the XM88 ammo can be almost added to Requisitions vendors if needed (can't do it without re-balancing the ammo boxes though since they are 90 vs 300 ammo pieces, so they don't divide neatly. Will probably need to lower the big box to 270 and then everything will work well).
Testing Photographs and Procedure
Spawn the XM88
/obj/item/ammo_box/magazine/lever_action/xm88and/obj/item/ammo_magazine/lever_action/xm88and make sure they behave as expected.Screenshots & Videos
NA
Changelog
🆑 ThePiachu
refactor: Made XM88 box code more uniform with other handful boxes.
/:cl: