Skip to content

Praetorian Acid Grenade changes - #12617

Merged
Drulikar merged 8 commits into
cmss13-devs:masterfrom
Venuska1117:nu2-grenade
Aug 14, 2026
Merged

Praetorian Acid Grenade changes#12617
Drulikar merged 8 commits into
cmss13-devs:masterfrom
Venuska1117:nu2-grenade

Conversation

@Venuska1117

@Venuska1117 Venuska1117 commented Jul 10, 2026

Copy link
Copy Markdown
Contributor

Feedback:

https://discord.com/channels/150315577943130112/1464087612796174501

Detached from: #12601

About the pull request

Increases acid grenade speed by one tier and changes launch_type to "HIGH_LAUNCH"

Explain why it's good for the game

Prae acid grenades are at wierd spot, they are partially dependant on RNG mechanic, but this PR is not about RNG issue, it is more about "time dilation" that you can experience in game, when throwing grenade it sometimes can travel slower than observed on private instance (most of time when server start to lag or slow down by some code issues), and in general this skill is not as fast as it should be.

With this change acid grenades travel slightly faster and can travel over obstacles such as handrails, racks or closets, of course in exchange for speed increase and better throwing of acid grenades your fuze time of acid grenade is increased from 1s to 1.25s

Testing Videos

▶️ Acid grenade BEFORE changes
2026-07-10.12-04-53.mp4
▶️ Acid grenade AFTER changes
2026-07-10.11-57-00.mp4

Changelog

🆑 Venuska1117
balance: Praetorian acid grenade got increased throwing speed and launch_type changed to "HIGH_LAUNCH", allowing it to throw over more obstacles such as railings or closets, but in exchange "explosion" time is increased from 1s to 1.25s
fix: Fixed cades that got unwired not getting back their pass_flags.
/:cl:

@github-project-automation github-project-automation Bot moved this to Awaiting Review in Review Backlog Jul 10, 2026
@cmss13-ci cmss13-ci Bot added Balance You need to be a professional veteran game maintainer to comprehend what is being done here. size/XS Denotes a PR that changes 0-19 lines, ignoring generated files. labels Jul 10, 2026
@cmss13-ci

cmss13-ci Bot commented Jul 18, 2026

Copy link
Copy Markdown
Contributor

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

@cmss13-ci cmss13-ci Bot added the Stale beg a maintainer to review your PR label Jul 18, 2026
@github-project-automation github-project-automation Bot moved this from Awaiting Review to Partially Approved / Mergeable in Review Backlog Jul 22, 2026

@Drulikar Drulikar left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Needs to not go over blocking cades

@github-project-automation github-project-automation Bot moved this from Partially Approved / Mergeable to Changes Requested in Review Backlog Jul 22, 2026
@Drulikar Drulikar removed the Stale beg a maintainer to review your PR label Jul 22, 2026
@Drulikar
Drulikar marked this pull request as draft July 22, 2026 02:54
@Venuska1117
Venuska1117 marked this pull request as ready for review July 25, 2026 17:04
@cmss13-ci cmss13-ci Bot added the Sound Blast 5 minutes of bass boosted music to our players label Jul 25, 2026
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Jul 26, 2026
@cm13-github

Copy link
Copy Markdown
Contributor

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

@cm13-github

Copy link
Copy Markdown
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Jul 26, 2026
@cmss13-ci

cmss13-ci Bot commented Aug 3, 2026

Copy link
Copy Markdown
Contributor

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

@cmss13-ci cmss13-ci Bot added the Stale beg a maintainer to review your PR label Aug 3, 2026
@Venuska1117
Venuska1117 marked this pull request as draft August 4, 2026 00:32
@cmss13-ci cmss13-ci Bot removed the Stale beg a maintainer to review your PR label Aug 4, 2026
@Venuska1117
Venuska1117 marked this pull request as ready for review August 8, 2026 00:18
@cmss13-ci cmss13-ci Bot added size/S Denotes a PR that changes 19-49 lines, ignoring generated files. Fix Fix one bug, make ten more and removed size/XS Denotes a PR that changes 0-19 lines, ignoring generated files. labels Aug 8, 2026
Comment thread code/game/objects/structures/barricade/barricade.dm Outdated
Comment thread code/game/objects/structures/barricade/barricade.dm Outdated
@Drulikar Drulikar added the Balance Approved This PR has had its balance and gameplay-affecting aspects approved. Cry to the Head-maint about it. label Aug 13, 2026
@Drulikar
Drulikar marked this pull request as draft August 13, 2026 05:12
PASS_ACID_GRENADE is inside PASS_OVER, no need to add it to initialize unless adding it to PASS_OVER was bad idea.
@Venuska1117
Venuska1117 marked this pull request as ready for review August 13, 2026 11:17
@Drulikar Drulikar removed the Sound Blast 5 minutes of bass boosted music to our players label Aug 14, 2026
Comment on lines +292 to +293
flags_can_pass_front_temp |= PASS_OVER_THROW_MOB|PASS_ACID_GRENADE
flags_can_pass_behind_temp |= PASS_OVER_THROW_MOB|PASS_ACID_GRENADE

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Still funky IMO that temps will have only PASS_OVER_THROW_MOB

/obj/structure/barricade/initialize_pass_flags(datum/pass_flags_container/pass_flags)
..()
if(pass_flags)
pass_flags.flags_can_pass_all = NONE
pass_flags.flags_can_pass_front = NONE
pass_flags.flags_can_pass_behind = PASS_OVER^(PASS_OVER_ACID_SPRAY|PASS_OVER_THROW_MOB)
flags_can_pass_front_temp = PASS_OVER_THROW_MOB
flags_can_pass_behind_temp = PASS_OVER_THROW_MOB

But after unwiring the temps will have PASS_OVER_THROW_MOB|PASS_ACID_GRENADE but it ultimately doesn't change behavior because yes you have it in PASS_OVER

@github-project-automation github-project-automation Bot moved this from Changes Requested to Partially Approved / Mergeable in Review Backlog Aug 14, 2026
@Drulikar
Drulikar added this pull request to the merge queue Aug 14, 2026
Merged via the queue into cmss13-devs:master with commit 015baf7 Aug 14, 2026
28 checks passed
@github-project-automation github-project-automation Bot moved this from Partially Approved / Mergeable to Merged in Review Backlog Aug 14, 2026
cmss13-ci Bot added a commit that referenced this pull request Aug 14, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Balance Approved This PR has had its balance and gameplay-affecting aspects approved. Cry to the Head-maint about it. Balance You need to be a professional veteran game maintainer to comprehend what is being done here. Fix Fix one bug, make ten more size/S Denotes a PR that changes 19-49 lines, ignoring generated files.

Projects

Status: Merged

Development

Successfully merging this pull request may close these issues.

3 participants