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

Rework of the Chemical Grenade Starter Kit, additional chemnade convenience #16346

Merged
merged 4 commits into from Oct 29, 2023

Conversation

M-Earthfire
Copy link
Contributor

@M-Earthfire M-Earthfire commented Oct 8, 2023

[game objects][rework][code quality][player actions]

About the PR

This PR replaces the chemical grenade starter kit with a chemical grenade pouch with increased grenade count and reworks how chemical grenades are assembled. It also adds a new feature to chemical grenades in general.

The chemical grenades come now in a chemical grenade pouch with 5 disassembled chemical grenades:
chem grenade rework

Instead of having the fuse seperate from the casing, fuse and casing now come in one item and can be assembled together by using the disassembled chemical grenades in hand.
chem grenade WIP

The rest of the assembly steps are the same like pre-rework. Due to the use of the assembly component, you can hit the grenade with the beakers and vice-versa and it still works.

Now, you can disassemble chemical grenades by using a wrench on them, returning the used beakers and disconnecting the grenade from the fuse again. They are also now mechscanable via a syndicate mechscanner.

Chem grenades in general got a new change as well. You can use a screwdriver on them to change the detonation time in 3 second steps from 3 seconds to 15 seconds.

Last but not least, this PR makes the whole file (grenade.dm) use absolute pathing.

Why's this needed?

chemical grenades are considered a very underwhelming convenience buy because most of their effects can nowadays be achieved by beaker assemblies, save a few exceptions. To make them more appealing to buy and compareable to other grenade packs, a pouch was added and their number increased to 5.

The Chemical Grenade Starter Kit still exists in prefabs, but still only has 3 disassembled chemical grenades.

To enable the increase in number, the fuse and casing were combined. Also, the mess that is their assembly was brought in line via the newly added assembly component.

This enabled some additional convenience changes, like grenade disassembling or adjustment of the explosion time, which is already a thing for other grenades. The time of 15 seconds was used to enable delivery of grenades via mail chutes or delayed traps.

Changelog

(u)Lord_Earthfire
(+)The Chem Grenade Starter Kit was replaced with a chemical grenade pouch with 5 diassembled grenades. The grenade casing are no longer seperated from their fuse and can be simply added together by using the disassembled grenades in your hand.
(+)Non-armed chemical grenades from the chemical grenade pouch can now be disassembled with a wrench.
(+)Chemical grenades, like incendiary grenades or FF-grenades, can have their timer extended with a screwdriver to up to 15 seconds.
(+)Disassembled chemical grenades can be scanned with a syndicate mechscanner.

@keywordlabeler keywordlabeler bot added the A-Game-Objects The point of this PR is to deal with a specific game object label Oct 8, 2023
@boring-cyborg boring-cyborg bot added the A-Mapping A mapping change label Oct 8, 2023
@keywordlabeler keywordlabeler bot added the A-Player-Actions Relating to direct player actions, e.g. emotes, special attacks, abilities label Oct 8, 2023
@boring-cyborg boring-cyborg bot added the C-Sprites Automatically applied on any .dmi or icons folder change label Oct 8, 2023
@keywordlabeler keywordlabeler bot added C-Code-Quality Cleans up code, refactors things to be more readable or intuitive C-Rework Reworks a feature labels Oct 8, 2023
@github-actions github-actions bot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Oct 8, 2023
@M-Earthfire M-Earthfire changed the title Rework of the chemnade assembly, additional chemnade convenience Rework of the Chemical Grenade Starter Kit, additional chemnade convenience Oct 8, 2023
@github-actions
Copy link
Contributor

This PR has been inactive for two weeks, and has been automatically marked as stale. This means it is at risk of being auto closed in another week. Please address any outstanding review items and ensure your PR is finished. If you are auto-staled anyway, ask developers if your PR will be merged. Once you have done any of the previous actions then you should request a developer remove the stale label on your PR, to reset the stale timer. If you feel no developer will respond in that time, you may wish to close this PR youself, while you seek developer comment, as you will then be able to reopen the PR yourself.

@github-actions github-actions bot added the S-Stale An inactive PR that has had no updates in the past two weeks label Oct 23, 2023
@pali6 pali6 removed the S-Stale An inactive PR that has had no updates in the past two weeks label Oct 23, 2023
Copy link
Member

@Tarmunora Tarmunora left a comment

Choose a reason for hiding this comment

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

Hm. Kinda getting the feeling the custom grenade code should be moved to a child type e.g.: obj/item/chem_grenade/custom, and have the parent type only handle arm/detonation/etc. code

@github-actions github-actions bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Oct 29, 2023
@M-Earthfire
Copy link
Contributor Author

I have employed the requested change to a new child-type. This enabled me to make the casings able to be mechscanned with a syndicate mechscanner (maybe someone is lucky enough to find the mechscanner and the chem grenade pouch in a surplus crate).

Above that, since that change made me go through all chem grenades, i made the whole file use absolute paths.

@M-Earthfire
Copy link
Contributor Author

oh god, apparently VSC went through oldmap.dmm and replaced a bunch of needless tabs because i replaced the obj/item/chem_grenade lying around on the map with obj/item/chem_grenade/custom

@Tarmunora Tarmunora merged commit b9ebdad into goonstation:master Oct 29, 2023
22 checks passed
@M-Earthfire M-Earthfire deleted the chemical_grenade_rebalance branch October 29, 2023 21:51
github-actions bot pushed a commit that referenced this pull request Oct 29, 2023
@Studenterhue Studenterhue added the E-Add-To-Wiki A PR that will require changes to the wiki label Oct 30, 2023
@Studenterhue Studenterhue removed the E-Add-To-Wiki A PR that will require changes to the wiki label Nov 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-Game-Objects The point of this PR is to deal with a specific game object A-Mapping A mapping change A-Player-Actions Relating to direct player actions, e.g. emotes, special attacks, abilities C-Code-Quality Cleans up code, refactors things to be more readable or intuitive C-Rework Reworks a feature C-Sprites Automatically applied on any .dmi or icons folder change size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants