Skip to content

Sharp Resharpening: Safety PR Split - #12748

Open
MPhonks wants to merge 20 commits into
cmss13-devs:masterfrom
MPhonks:sharp-safety
Open

Sharp Resharpening: Safety PR Split#12748
MPhonks wants to merge 20 commits into
cmss13-devs:masterfrom
MPhonks:sharp-safety

Conversation

@MPhonks

@MPhonks MPhonks commented Jul 27, 2026

Copy link
Copy Markdown
Contributor

About the pull request

This is a split of #11698 containing the safety-logic and QOL improvements to the P9 Sonic Harpoon Artillery Remote Projectile (SHARP) Rifle. It replaces the different firemode timers (2.5s, 5s, defaults to 2.5s) with a mine-safety toggle ("SAFE" mode).

Of the QOL changes are included:

  • The ability to rearm previously disarmed mines (1s) as the SHARP specialist with a multitool
  • The inability of mines to blow up to small xenomorph (facehuggers, lesser drones)
  • The ability to see whether a mine has safety, and how long the mine lasts before being disarmed (specialist only)
  • Automatic magazine ejection

Outside of the original PR, two new changes were were added:

  • A square flameshape for level 2+ incendiary mines. (This made it possible to just copy-paste the safety logic, also introduces a new flameshape which is a neat bonus).
  • The proposed bugfix from Explosion Waves: Visual update and Backend rewrite #12793, making SHARP mines deal their intended explosion damage in adjacent tiles.
  • The bugfix inadvertedly made explosions one tile larger, which (with already large radii at levels 1+) counteracts the new safety feature. This is solved by clamping down SHARP mine explosions to mine_level tiles.

Explain why it's good for the game

As it stands right now, the SHARP contains fundamental design flaws. SHARP has been stamped off as a "xenoagent" role in the game which does more harm to the marine force than good. This PR does not aim to handhold the kit into becoming "the new meta", but rather addresses scenarios where the usage of the SHARP would be more helpful to aliens than to the marine force.

With SAFE mode, placing mines directly where marines walk and push becomes a reliable tool of both securing the backline and ensuring that marines do not suffer fatalities to the mines when pushed back. The mines refuse to detonate when anyone with IFF can be hurt by them, at the cost of potentially fizzling out when hitting xenomorphs directly, or missing out on kills from the potentially obtained stun they cause.

Testing Photographs and Procedure

Screenshots & Videos See #11698 .

Changelog

🆑 MarpleJones
del: SHARP timer modes (5s, 2.5s) removed, default at 2.5s
add: adds SHARP safety mode, which has greater IFF logic and prevents the mine from detonating when near friendlies.
add: you can now rearm SHARP mines as the SHARP specialist with a security access tuner (multitool)
add: adds a security access tuner to the specialist kit
add: small xenomorph no longer trigger sharp mines
add: square fireshape
balance: incendiary mines are now strictly square
balance: bugfix to explosion wave calculation; intended damage is now dealt to adjacent tiles
balance: clamps mine explosions to mine_level
qol: firemodes as a specialist ability, extended description for mine timers and modes, magazine autoejection
/:cl:

@github-project-automation github-project-automation Bot moved this to Awaiting Review in Review Backlog Jul 27, 2026
@cmss13-ci cmss13-ci Bot added Sprites Remove the soul from the game. Removal snap Feature Feature coder badge Balance You need to be a professional veteran game maintainer to comprehend what is being done here. Quality of Life Make the game harder to play size/L Denotes a PR that changes 200-799 lines, ignoring generated files. labels Jul 27, 2026
@Detective-Google Detective-Google added the Balance Approved This PR has had its balance and gameplay-affecting aspects approved. Cry to the Head-maint about it. label Jul 27, 2026
@cmss13-ci

cmss13-ci Bot commented Aug 5, 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 5, 2026
@Detective-Google Detective-Google removed the Stale beg a maintainer to review your PR label Aug 5, 2026
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Aug 6, 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 cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Aug 7, 2026
@cm13-github

Copy link
Copy Markdown
Contributor

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

Comment thread code/modules/projectiles/guns/flamer/flameshape.dm Outdated
Comment thread code/game/objects/items/explosives/mine.dm Outdated
for(var/turf/T in range(radius, source_turf))
if(T == source_turf)
continue
if(istype(T, /turf/open/space))

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I assume you meant /turf/open_space rather than /turf/open/space, both are very different things!

@MPhonks MPhonks Aug 15, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Copied it from the other flameshape codes. :P (Could change it if it's an issue, although I didn't notice any impact)

Comment thread code/modules/projectiles/guns/flamer/flameshape.dm
Comment thread code/game/objects/items/explosives/mine.dm
@github-project-automation github-project-automation Bot moved this from Awaiting Review to Changes Requested in Review Backlog Aug 15, 2026
@MPhonks
MPhonks requested a review from fira August 15, 2026 14:19
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. Feature Feature coder badge Quality of Life Make the game harder to play Removal snap size/L Denotes a PR that changes 200-799 lines, ignoring generated files. Sprites Remove the soul from the game.

Projects

Status: Changes Requested

Development

Successfully merging this pull request may close these issues.

4 participants