-
Notifications
You must be signed in to change notification settings - Fork 112
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
Grenade overhaul part 2, the quest for more havoc #594
Open
BonniePandora
wants to merge
19
commits into
cmss13-devs:master
Choose a base branch
from
BonniePandora:Grenade-improvement-2,-electric-boogaloo
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
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
Grenade overhaul part 2, the quest for more havoc #594
BonniePandora
wants to merge
19
commits into
cmss13-devs:master
from
BonniePandora:Grenade-improvement-2,-electric-boogaloo
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
github-actions
bot
added
Sprites
Feature
Quality of Life
Balance
Grammar and Formatting
labels
Dec 8, 2024
Doubleumc
requested changes
Dec 17, 2024
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Doubleumc
previously approved these changes
Dec 27, 2024
Conflicts have been resolved. A maintainer will review the pull request shortly. |
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
Overhauls the grenade packet icon system, they now share a similar one to how grenade boxes work. Packets once emptied can be folded flat and M40-hull type ones now hold five grenades as standard. Ones that hold M15s, SEBBs, etc etc, retain a capacity of three.
The M60 WPSI & M77 HIAM have both recieved dual-fusing functionality, detonating on impact if fired from a UGL. Beware dinking something in the face with one of those loaded. WPSI now generates flaming shrapnel on detonation to simulate chunks of phosphorus landing on unlucky bastards.
All smoke-producing grenades & the new WP mortar shell have longer-lasting smoke effects.
Two new grenades added, along with corresponding packets. No grenade boxes for either (yet?)
M230 LLRB grenade; a less-than-lethal baton round that will shatter on impact after hitting a target, imparting significant knockback to them and putting them on their arse for a short spell. Mostly blue-plastic body.
M72A2 HIPF starshell grenade; a para-flare grenade for marines to light up areas. Description flavoured as being an advancement on the tech-manual mentioned A1 model and capable of embedding into roofs where it illuminates too. (I did not wish to deal with the jank of roof code and such, ergo this solution). Yellow cap, yellow band on the hull to designate it as launcher-fired only. Available from the gear vendors aboard the Garrow & Rover
Not exactly a grenade, but I did also add a new WP mortar shell for maximum warcrims & Spec Ops The Line LARPing.
Integrates the changes put forth in #597 with permission from Andro too.
Cliff notes of that;
Explain why it's good for the game
Catches the last of the changes I wanted to impliment grenade-wise without feature-creeping the prior grenade overhaul PR.
Packet folding is just... Why wasn't it like that from the get-go when they were added? WHY?
The two new grenade types offer up both a less-than-lethal option & illumination round for marines to use.
Testing Photographs and Procedure
Tested locally, all works as intended. Compiles without issue.
Screenshots & Videos
Changelog
🆑
add: Adds the M230 LLRB & M72A2 HIPF grenades and a WP mortar shell
add: UPP smoke grenades, along with a rifle-mounted grenade launcher & impact rounds for it.
admin: Added the WP mortar rounds to the fire support menu
qol: Grenade packets can be folded flat once emptied
qol: Packet sprites overhauled with overlays & such on a base sprite
balance: The M60 WPSI & M77 HIAM now both have dual-fusing functionality. M60 WPSI generates shrapnel on detonation
balance: Smoke effects from grenades and the new mortar shell linger much longer than they did previously.
spellcheck: 'box of flashlight' -> 'box of flashlights' in gear vendor
imageadd: Sprite for the M72A2 grenade & WP mortar shell
maptweak: The Chapev recieves one rifle-GL per squad along with rounds for it in the vendors, & some boxes of smokes grenades in the cargo bay.
/:cl: