Skip to content

Sneaky Hijack Edgecase + Transmute Fixes#12480

Open
Drulikar wants to merge 7 commits into
cmss13-devs:masterfrom
Drulikar:stealth_hijack
Open

Sneaky Hijack Edgecase + Transmute Fixes#12480
Drulikar wants to merge 7 commits into
cmss13-devs:masterfrom
Drulikar:stealth_hijack

Conversation

@Drulikar

@Drulikar Drulikar commented Jun 20, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

About the pull request

This PR does several things:

  • Makes it where a hostile queen that is on a shuttle that's arriving normally will trigger a hijack crash (with little warning)
  • Fixes some logic errors in Queen Mother now reward hijacking xenos with Adaptability (Transmute Ability) #10238 where the loop would end on the first xeno that is a king or already has the ability (rather than continuing on to the next xeno)
  • Transmute is no longer given to queen on purchase
  • Moves some hijack effects around (namely evilution changes, ovi reset, queen maturity into /datum/hive_status/proc/bless_on_hijack(); and hijack round status+ stat tracking into /datum/controller/subsystem/hijack/proc/on_call_shuttle())
  • Standardizes the defines for game modes (some did it this way, many not)
  • Transmute needs to be a proc verb (or if a verb verb it needs additional ability checks to see if the ability is granted). Ultimately I messed with transmute because of the weird issue with the loop early returning incorrectly where I wanted to move logic to

Technically a xeno evolving as queen on the Almayer could still be in this scenario, but I think it even less likely to occur and unlikely for them to succeed enough that warrants needing to put the game into a hijack state.

Explain why it's good for the game

Presently admins have been sort of having to intervene whenever a queen sneaks onto the dropship, but since hijack effects are kinda all over the place its difficult for them to do all changes nor in a way that really thematically can work. Now its as if the dropship has its autopilot disabled shortly before docking procedures and ends up crashing into the ship (because the queen is a bad driver).

Testing Photographs and Procedure

Screenshots & Videos

Normal hijack + transmute testing: https://youtu.be/CuSb9vs2NiQ

Stealth hijack as marine: https://youtu.be/mL4UUED1mqA

Stealth hijack as xeno: https://youtu.be/u05M-Y6q32E

Changelog

🆑 Drathek
balance: A hostile queen that sneaks on a shuttle will now trigger a hijack automatically just before arrival
fix: Fixed grant transmute on hijack buff loop stopping early if it encounters a king or xeno with the ability already
fix: Hive buff purchase for transmute no longer is applied to queen
/:cl:

@Drulikar Drulikar added Balance Approved This PR has had its balance and gameplay-affecting aspects approved. Cry to the Head-maint about it. Needs Testing Need to test it on the guinea pigs (production server) labels Jun 20, 2026
@github-project-automation github-project-automation Bot moved this to Awaiting Review in Review Backlog Jun 20, 2026
@cmss13-ci cmss13-ci Bot added Balance You need to be a professional veteran game maintainer to comprehend what is being done here. Fix Fix one bug, make ten more Refactor Make the code harder to read size/L Denotes a PR that changes 200-799 lines, ignoring generated files. labels Jun 20, 2026
@Drulikar Drulikar removed the Refactor Make the code harder to read label Jun 20, 2026
@cmss13-ci

cmss13-ci Bot commented Jun 28, 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 Jun 28, 2026
@Drulikar Drulikar added Stale Exempt PR can't go stale and removed Stale beg a maintainer to review your PR labels Jul 3, 2026
@cm13-github

cm13-github commented Jul 3, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Test merge deployment history:

Test Merge Deployed @ 07/03/2026 04:25:24 +00:00:
Server Instance

CM13 Live

Revision

Origin: 6fcc629
Pull Request: c050928
Server: 5cc5540

Test Merge Updated @ 07/03/2026 05:47:46 +00:00:
Server Instance

CM13 Live

Revision

Origin: c46d658
Pull Request: c050928
Server: 1314284be0772b3898f23e9a311f9ba2689512bd

Test Merge Updated @ 07/03/2026 06:31:30 +00:00:
Server Instance

CM13 Live

Revision

Origin: c46d658
Pull Request: c050928
Server: c5f638b

Test Merge Updated @ 07/03/2026 07:18:14 +00:00:
Server Instance

CM13 Live

Revision

Origin: c46d658
Pull Request: c050928
Server: bad4ec5

Test Merge Updated @ 07/04/2026 00:53:24 +00:00:
Server Instance

CM13 Live

Revision

Origin: 37c049f
Pull Request: c050928
Server: 8011e8f7a77e656fbd26ed09fc88ab985e75a352

Test Merge Updated @ 07/04/2026 03:13:06 +00:00:
Server Instance

CM13 Live

Revision

Origin: 37c049f
Pull Request: c050928
Server: 5ef7c4f

Test Merge Updated @ 07/04/2026 03:24:45 +00:00:
Server Instance

CM13 Live

Revision

Origin: 82f219f
Pull Request: c050928
Server: 7331e71b0b432648028b2d8abf7a17bbc2ce499e

Test Merge Updated @ 07/04/2026 03:55:33 +00:00:
Server Instance

CM13 Live

Revision

Origin: bb16ac6
Pull Request: c050928
Server: b2128be42e0b24ea824c93f0fa4102b0f61bff91

Test Merge Updated @ 07/04/2026 05:26:35 +00:00:
Server Instance

CM13 Live

Revision

Origin: 6668a9e
Pull Request: c050928
Server: 8e82186

Test Merge Updated @ 07/04/2026 05:46:46 +00:00:
Server Instance

CM13 Live

Revision

Origin: 6668a9e
Pull Request: c050928
Server: 7bb46f9

Test Merge Updated @ 07/04/2026 06:57:35 +00:00:
Server Instance

CM13 Live

Revision

Origin: 30f0449
Pull Request: c050928
Server: d93cd41

Test Merge Updated @ 07/04/2026 07:14:57 +00:00:
Server Instance

CM13 Live

Revision

Origin: 30f0449
Pull Request: c050928
Server: d19887a

Test Merge Updated @ 07/04/2026 09:15:58 +00:00:
Server Instance

CM13 Live

Revision

Origin: 30f0449
Pull Request: c050928
Server: 734871a

Test Merge Updated @ 07/04/2026 09:58:55 +00:00:
Server Instance

CM13 Live

Revision

Origin: 30f0449
Pull Request: c050928
Server: 686c169

Test Merge Updated @ 07/04/2026 10:59:50 +00:00:
Server Instance

CM13 Live

Revision

Origin: 30f0449
Pull Request: c050928
Server: 73ab40c

Test Merge Updated @ 07/04/2026 11:22:52 +00:00:
Server Instance

CM13 Live

Revision

Origin: 30f0449
Pull Request: c050928
Server: 94bfdaf

Test Merge Updated @ 07/04/2026 11:30:54 +00:00:
Server Instance

CM13 Live

Revision

Origin: 30f0449
Pull Request: c050928
Server: 312cc77

Test Merge Updated @ 07/04/2026 20:33:37 +00:00:
Server Instance

CM13 Live

Revision

Origin: 30f0449
Pull Request: c050928
Server: 9b49176

Test Merge Updated @ 07/05/2026 02:05:47 +00:00:
Server Instance

CM13 Live

Revision

Origin: f4cbe98
Pull Request: c050928
Server: 108b137a251249fb24c121e53f56549a0d1a4d0d

Test Merge Updated @ 07/05/2026 02:36:47 +00:00:
Server Instance

CM13 Live

Revision

Origin: 83b7e7a
Pull Request: c050928
Server: 2fbfe8d2152d29e88da3f520d4d19f20ae510164

Test Merge Updated @ 07/05/2026 04:07:50 +00:00:
Server Instance

CM13 Live

Revision

Origin: 584ce29
Pull Request: c050928
Server: 83b86abcc89dffce97601008fb9e6c79f8a04e63

Test Merge Updated @ 07/05/2026 06:16:15 +00:00:
Server Instance

CM13 Live

Revision

Origin: 584ce29
Pull Request: c050928
Server: 4f94099

Test Merge Updated @ 07/05/2026 12:55:23 +00:00:
Server Instance

CM13 Live

Revision

Origin: 584ce29
Pull Request: c050928
Server: 5ebefe2

Test Merge Updated @ 07/05/2026 16:41:39 +00:00:
Server Instance

CM13 Live

Revision

Origin: 584ce29
Pull Request: c050928
Server: 3a17141

Test Merge Updated @ 07/06/2026 06:28:52 +00:00:
Server Instance

CM13 Live

Revision

Origin: 584ce29
Pull Request: c050928
Server: 8d3c922

Test Merge Updated @ 07/07/2026 01:35:04 +00:00:
Server Instance

CM13 Live

Revision

Origin: 584ce29
Pull Request: c050928
Server: 21140e5

Test Merge Updated @ 07/07/2026 02:36:09 +00:00:
Server Instance

CM13 Live

Revision

Origin: 584ce29
Pull Request: c050928
Server: 57b8713

Test Merge Updated @ 07/07/2026 06:31:51 +00:00:
Server Instance

CM13 Live

Revision

Origin: 584ce29
Pull Request: d76bf37
Server: c190f7c

Test Merge Updated @ 07/07/2026 07:33:29 +00:00:
Server Instance

CM13 Live

Revision

Origin: 584ce29
Pull Request: d76bf37
Server: f7e63eb

Test Merge Updated @ 07/07/2026 08:38:32 +00:00:
Server Instance

CM13 Live

Revision

Origin: 2644306
Pull Request: d76bf37
Server: da3d2af691548fe6415cf145bc5740cfd704b499

Test Merge Updated @ 07/07/2026 14:40:57 +00:00:
Server Instance

CM13 Live

Revision

Origin: 2644306
Pull Request: d76bf37
Server: 77ce48f

Test Merge Updated @ 07/08/2026 00:44:17 +00:00:
Server Instance

CM13 Live

Revision

Origin: e6156c0
Pull Request: d76bf37
Server: aa4bf91ff03b5d2437aae3fca2e92a0c273b89e8

Test Merge Updated @ 07/08/2026 03:15:42 +00:00:
Server Instance

CM13 Live

Revision

Origin: b2f9af8
Pull Request: d76bf37
Server: 91fdb7d516237f1882d76aa6260a1d0c4ce7ab56

Test Merge Updated @ 07/08/2026 04:16:39 +00:00:
Server Instance

CM13 Live

Revision

Origin: 728eca0
Pull Request: d76bf37
Server: cd4162b056ee847f8145dbdc83cb5b523e8098c0

Test Merge Updated @ 07/09/2026 03:53:42 +00:00:
Server Instance

CM13 Live

Revision

Origin: 5f144e8
Pull Request: d76bf37
Server: 8a4173f1e6508d05b916d6001b4da644d0f14f5b

Test Merge Updated @ 07/10/2026 00:59:49 +00:00:
Server Instance

CM13 Live

Revision

Origin: 75a4120
Pull Request: d76bf37
Server: 5407eab5cc7006c419c1734f8f42e65639252313

Test Merge Updated @ 07/10/2026 01:29:25 +00:00:
Server Instance

CM13 Live

Revision

Origin: 75a4120
Pull Request: d76bf37
Server: 0a5a494

Test Merge Updated @ 07/10/2026 04:01:19 +00:00:
Server Instance

CM13 Live

Revision

Origin: 4535454
Pull Request: d76bf37
Server: 6e53782386c48e724dcf10a0990245ce55c527c4

Test Merge Updated @ 07/11/2026 06:48:36 +00:00:
Server Instance

CM13 Live

Revision

Origin: 4535454
Pull Request: d76bf37
Server: 36f093e

Test Merge Updated @ 07/11/2026 10:09:08 +00:00:
Server Instance

CM13 Live

Revision

Origin: 4535454
Pull Request: d76bf37
Server: 98b7720

Test Merge Updated @ 07/11/2026 13:10:31 +00:00:
Server Instance

CM13 Live

Revision

Origin: 4535454
Pull Request: d76bf37
Server: 9ea4007

Test Merge Updated @ 07/12/2026 02:14:18 +00:00:
Server Instance

CM13 Live

Revision

Origin: 0b1ea87
Pull Request: d76bf37
Server: 067f0598f2cedb705f089800573856045adbd609

Test Merge Updated @ 07/12/2026 14:29:31 +00:00:
Server Instance

CM13 Live

Revision

Origin: a7286eb
Pull Request: d76bf37
Server: 3e2503c

Test Merge Updated @ 07/13/2026 03:51:05 +00:00:
Server Instance

CM13 Live

Revision

Origin: f13ad67
Pull Request: d76bf37
Server: 86f527ec67832df2274e76d6ce736e080058ae87

Test Merge Updated @ 07/13/2026 12:53:38 +00:00:
Server Instance

CM13 Live

Revision

Origin: f13ad67
Pull Request: d76bf37
Server: 1b07c7a

Test Merge Updated @ 07/13/2026 22:56:43 +00:00:
Server Instance

CM13 Live

Revision

Origin: bc766ac
Pull Request: d76bf37
Server: 8ba2aa436044d50e4164e7ab5429939b3d01e48a

Test Merge Updated @ 07/14/2026 00:57:57 +00:00:
Server Instance

CM13 Live

Revision

Origin: 81ef6b1
Pull Request: d76bf37
Server: 0fe9c1ef382e605e28e59deb1b4bea378193c157

Test Merge Updated @ 07/14/2026 01:28:51 +00:00:
Server Instance

CM13 Live

Revision

Origin: 81ef6b1
Pull Request: d76bf37
Server: d1845c9

Test Merge Updated @ 07/14/2026 02:59:53 +00:00:
Server Instance

CM13 Live

Revision

Origin: b98bd5e
Pull Request: d76bf37
Server: b3bf76c928111139dff83e2d7fec28778776400d

Test Merge Updated @ 07/14/2026 06:01:21 +00:00:
Server Instance

CM13 Live

Revision

Origin: 6032ee8
Pull Request: d76bf37
Server: 9cd98972ae6fcee0e947c15a7db1e251f3e7f76d

Test Merge Updated @ 07/14/2026 12:07:49 +00:00:
Server Instance

CM13 Live

Revision

Origin: 6032ee8
Pull Request: d76bf37
Server: 38e1f20

Test Merge Updated @ 07/14/2026 13:03:53 +00:00:
Server Instance

CM13 Live

Revision

Origin: 75d6fba
Pull Request: d76bf37
Server: bd852761806b8662cf3444fe7c075d61d08300d6

hry-gh
hry-gh previously approved these changes Jul 3, 2026
View reviewed changes
@github-project-automation github-project-automation Bot moved this from Awaiting Review to Partially Approved / Mergeable in Review Backlog Jul 3, 2026
@Drulikar Drulikar removed the Needs Testing Need to test it on the guinea pigs (production server) label Jul 3, 2026
This was referenced Jul 3, 2026
Open
Open
Open
Closed
realforest2001
realforest2001 previously requested changes Jul 6, 2026
View reviewed changes

@realforest2001 realforest2001 left a comment

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.

#12593

@github-project-automation github-project-automation Bot moved this from Partially Approved / Mergeable to Changes Requested in Review Backlog Jul 6, 2026
@cm13-issue-bot cm13-issue-bot mentioned this pull request Jul 6, 2026
Closed
@Drulikar Drulikar changed the title Sneaky Hijack Edgecase Sneaky Hijack Edgecase + Transmute Fixes Jul 7, 2026
@Drulikar Drulikar removed the Stale Exempt PR can't go stale label Jul 7, 2026
This was referenced Jul 7, 2026
Closed
Open
Open
@Sietchi Sietchi mentioned this pull request Jul 12, 2026
Open
3 tasks
This was referenced Jul 12, 2026
Closed
Open
Open
Open
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@realforest2001 realforest2001 realforest2001 left review comments
@hry-gh hry-gh hry-gh left review comments

At least 1 approving review is required to merge this pull request.

Assignees

No one assigned

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/L Denotes a PR that changes 200-799 lines, ignoring generated files.

Projects

Review Backlog
Status: Changes Requested

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@Drulikar @cm13-github @realforest2001 @hry-gh