Skip to content

Xeno update icon fixes#12245

Merged
Detective-Google merged 8 commits into
cmss13-devs:masterfrom
Drulikar:xeno_update_icon
May 28, 2026
Merged

Xeno update icon fixes#12245
Detective-Google merged 8 commits into
cmss13-devs:masterfrom
Drulikar:xeno_update_icon

Conversation

@Drulikar
Copy link
Copy Markdown
Contributor

@Drulikar Drulikar commented May 18, 2026

About the pull request

This PR does a few things:

  • Removes duplicate update_wounds calls (update_icons itself will call update_wounds)
  • Simplifies some logic for acid_overlay (namely just an in check that could be done w/ |= instead)
  • Removes some calls to xeno update_icons that seemed pointless
  • Simplifies some calls previously to xeno update_icons that merely wanted the behavior delegate on_update_icons logic
  • Fixes the FIX ME icon state for designer choose design ability due to unnecessary logic adding extra overlays
  • Fixes charger strain not even calling stop_momentum if you simply stop moving. Very goofy to charge, stand still, and then turn/move and suddenly you skid to a halt and finally raise your head. 0.5 seconds is just copied from existing logic so it probably is too lenient (especially since this is checking on Life interval); but also most of the behavior logic shoved into the button ought to be refactored into the behavior delegate instead.

Explain why it's good for the game

  • Hopefully less self cpu time for /mob/living/carbon/xenomorph/update_icons
  • Fixed goofiness with charger
  • Fixed this
image

Testing Photographs and Procedure

Screenshots & Videos

https://youtu.be/lR9WlbwenNE

Changelog

🆑 Drathek
code: Removed/simplified some unnecessary calls to xeno update_icons
fix: Fixed designer button saying FIX ME when first selecting the strain
fix: Fixed charger crusher not ever stopping a charge if you simply stop moving
/:cl:

@github-project-automation github-project-automation Bot moved this to Awaiting Review in Review Backlog May 18, 2026
@cmss13-ci cmss13-ci Bot added Code Improvement Make the code longer Fix Fix one bug, make ten more size/M Denotes a PR that changes 50-199 lines, ignoring generated files. labels May 18, 2026
@Drulikar Drulikar added the Performance the game sucks and this makes it suck less label May 18, 2026
@cm13-github
Copy link
Copy Markdown
Contributor

cm13-github commented May 20, 2026

Test merge deployment history:

Test Merge Deployed @ 05/20/2026 07:24:34 +00:00:
Server Instance

CM13 Live

Revision

Origin: 03d45a3
Pull Request: 431ccbe
Server: db65c06

Test Merge Updated @ 05/20/2026 17:54:17 +00:00:
Server Instance

CM13 Live

Revision

Origin: c95e9b1
Pull Request: 431ccbe
Server: 3280e9154949182c4e51ee27602a16ed75001565

Test Merge Updated @ 05/20/2026 22:56:32 +00:00:
Server Instance

CM13 Live

Revision

Origin: a46fad7
Pull Request: 431ccbe
Server: fb7be4f1bfbd6edaf862a67b770100fb826b4fa6

Test Merge Updated @ 05/20/2026 23:27:20 +00:00:
Server Instance

CM13 Live

Revision

Origin: 3400df7
Pull Request: 431ccbe
Server: b0cf5e6

Test Merge Updated @ 05/20/2026 23:58:08 +00:00:
Server Instance

CM13 Live

Revision

Origin: 05f844d
Pull Request: 431ccbe
Server: e05d3bffb5af57228f87f5ea7e53f0aaf8efcd45

Test Merge Updated @ 05/21/2026 00:28:58 +00:00:
Server Instance

CM13 Live

Revision

Origin: f4f02d0
Pull Request: 431ccbe
Server: 66f94a611a94e93292e3ee078228929c17a40a79

Test Merge Updated @ 05/21/2026 00:59:48 +00:00:
Server Instance

CM13 Live

Revision

Origin: 58fc60a
Pull Request: 431ccbe
Server: 42ff026

Test Merge Updated @ 05/21/2026 01:30:42 +00:00:
Server Instance

CM13 Live

Revision

Origin: 2104086
Pull Request: 431ccbe
Server: 34b682f2ec12fe202bbfed0650de5dd8fdb3d171

Test Merge Updated @ 05/21/2026 04:32:09 +00:00:
Server Instance

CM13 Live

Revision

Origin: 583cbcd
Pull Request: 431ccbe
Server: 8370b689eb8f7a8fc27dec335a12d1e370909568

Test Merge Updated @ 05/22/2026 00:39:01 +00:00:
Server Instance

CM13 Live

Revision

Origin: 583cbcd
Pull Request: 431ccbe
Server: e6ee75c

Test Merge Updated @ 05/22/2026 01:40:04 +00:00:
Server Instance

CM13 Live

Revision

Origin: 579457c
Pull Request: 431ccbe
Server: 5077583f3db971aac04b915045a3e4cff448258b

Test Merge Updated @ 05/22/2026 04:11:23 +00:00:
Server Instance

CM13 Live

Revision

Origin: 776c4a6
Pull Request: 431ccbe
Server: aa6b594cf5f372f9fd261c17b9cc08289e69f3e3

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

CM13 Live

Revision

Origin: 6d8a35f
Pull Request: 431ccbe
Server: f32a9a785e7b27a2c504f88b437161b3b6568e2a

Test Merge Updated @ 05/22/2026 14:45:49 +00:00:
Server Instance

CM13 Live

Revision

Origin: 7cd9b89
Pull Request: 431ccbe
Server: 432c8f6af683f307ca5e93d52e80d1107d620c53

Test Merge Updated @ 05/22/2026 22:18:38 +00:00:
Server Instance

CM13 Live

Revision

Origin: 7cd9b89
Pull Request: 431ccbe
Server: 753f1f6

Test Merge Updated @ 05/23/2026 03:50:39 +00:00:
Server Instance

CM13 Live

Revision

Origin: 4412c87
Pull Request: 431ccbe
Server: f93494153429cf9e2fd1691a41e3701ac63e9908

Test Merge Updated @ 05/23/2026 04:51:36 +00:00:
Server Instance

CM13 Live

Revision

Origin: 4412c87
Pull Request: 431ccbe
Server: 27cfb8a

Test Merge Updated @ 05/23/2026 16:14:49 +00:00:
Server Instance

CM13 Live

Revision

Origin: 4412c87
Pull Request: 431ccbe
Server: 3156670

Test Merge Updated @ 05/23/2026 16:25:09 +00:00:
Server Instance

CM13 Live

Revision

Origin: 3d558ec
Pull Request: 431ccbe
Server: f9f92f73e48de6d52d3be8c3efda2f16b4ec271b

Test Merge Updated @ 05/23/2026 16:54:29 +00:00:
Server Instance

CM13 Live

Revision

Origin: 3d558ec
Pull Request: 431ccbe
Server: 1107c0538fa970ab344b805080dede1e0cb50114

Test Merge Updated @ 05/23/2026 23:57:15 +00:00:
Server Instance

CM13 Live

Revision

Origin: a7e8c2a
Pull Request: 431ccbe
Server: f3dd2ce

Test Merge Updated @ 05/24/2026 00:27:19 +00:00:
Server Instance

CM13 Live

Revision

Origin: b8fcfd6
Pull Request: 431ccbe
Server: a369ff9

Test Merge Updated @ 05/24/2026 02:28:27 +00:00:
Server Instance

CM13 Live

Revision

Origin: b8fcfd6
Pull Request: 431ccbe
Server: c6143156b0b0ecd8ca9138420175cce2034dcece

Test Merge Updated @ 05/24/2026 04:29:29 +00:00:
Server Instance

CM13 Live

Revision

Origin: bdde9e6
Pull Request: 431ccbe
Server: 9780bf869a152e3fb1e408c6b2941338cceaad88

Test Merge Updated @ 05/24/2026 13:01:51 +00:00:
Server Instance

CM13 Live

Revision

Origin: 1318bb3
Pull Request: 431ccbe
Server: f8c16090ef4be58b615df6da75175fe27e9e6e97

Test Merge Updated @ 05/24/2026 13:32:38 +00:00:
Server Instance

CM13 Live

Revision

Origin: ec4a93d
Pull Request: 431ccbe
Server: 84a90231526ec88e16ab712a326968194d472d61

Test Merge Updated @ 05/24/2026 15:25:21 +00:00:
Server Instance

CM13 Live

Revision

Origin: ec4a93d
Pull Request: 431ccbe
Server: bfc0000

Test Merge Updated @ 05/24/2026 17:58:21 +00:00:
Server Instance

CM13 Live

Revision

Origin: ec4a93d
Pull Request: 431ccbe
Server: d882e1464118baf07488feb25316ae1f5cfb26a7

Test Merge Updated @ 05/25/2026 03:36:06 +00:00:
Server Instance

CM13 Live

Revision

Origin: d3a1738
Pull Request: 431ccbe
Server: cc46f9ea0a1f8e2d627f536fdeec53c0f6514c50

Test Merge Updated @ 05/25/2026 04:37:00 +00:00:
Server Instance

CM13 Live

Revision

Origin: a346170
Pull Request: 431ccbe
Server: 4f6238273c03a365f70cbcbcc6213b8340d34165

Test Merge Updated @ 05/25/2026 17:40:41 +00:00:
Server Instance

CM13 Live

Revision

Origin: d2a84ff
Pull Request: 431ccbe
Server: 0720293100a1cda59c36d78048cebf3d4f3538ad

Test Merge Updated @ 05/25/2026 18:11:32 +00:00:
Server Instance

CM13 Live

Revision

Origin: e5186d5
Pull Request: 431ccbe
Server: 0a7a346367f92be898b6471e815e6ce56666a0d5

Test Merge Updated @ 05/26/2026 04:14:08 +00:00:
Server Instance

CM13 Live

Revision

Origin: 51bfecb
Pull Request: 431ccbe
Server: 2c2e7abeea92c2f9546b9fb3b8fe80ca448de9cd

Test Merge Updated @ 05/26/2026 04:44:55 +00:00:
Server Instance

CM13 Live

Revision

Origin: 4b5b27b
Pull Request: 431ccbe
Server: 3e8e5a55bec2653f2b2d198e8a29723e5e6e294d

Test Merge Updated @ 05/26/2026 05:15:43 +00:00:
Server Instance

CM13 Live

Revision

Origin: 6309a51
Pull Request: 431ccbe
Server: 08fd9194e2ad5104159c916efe0faf09d35b78f0

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

CM13 Live

Revision

Origin: 1ae4d9e
Pull Request: 431ccbe
Server: e43c3a5

Test Merge Updated @ 05/26/2026 08:47:51 +00:00:
Server Instance

CM13 Live

Revision

Origin: bf57b8c
Pull Request: 431ccbe
Server: 4a2dd62cf627f4e3c41a317953390fdea9d85dad

Test Merge Updated @ 05/26/2026 12:59:43 +00:00:
Server Instance

CM13 Live

Revision

Origin: bf57b8c
Pull Request: 431ccbe
Server: 955bf2c

Test Merge Updated @ 05/26/2026 13:10:02 +00:00:
Server Instance

CM13 Live

Revision

Origin: bf57b8c
Pull Request: 431ccbe
Server: fdddc00

Test Merge Updated @ 05/26/2026 13:43:17 +00:00:
Server Instance

CM13 Live

Revision

Origin: bf57b8c
Pull Request: 431ccbe
Server: be6e804

Test Merge Updated @ 05/26/2026 14:50:10 +00:00:
Server Instance

CM13 Live

Revision

Origin: c0285d0
Pull Request: 431ccbe
Server: be2fb28b2216ea53ea997769f24221721746e153

Test Merge Updated @ 05/26/2026 15:51:13 +00:00:
Server Instance

CM13 Live

Revision

Origin: c0285d0
Pull Request: 431ccbe
Server: ac9c357

Test Merge Updated @ 05/26/2026 18:54:12 +00:00:
Server Instance

CM13 Live

Revision

Origin: c0285d0
Pull Request: 431ccbe
Server: 592ae9c

Test Merge Updated @ 05/26/2026 20:53:15 +00:00:
Server Instance

CM13 Live

Revision

Origin: c0285d0
Pull Request: 431ccbe
Server: a77da92

Test Merge Updated @ 05/27/2026 04:25:41 +00:00:
Server Instance

CM13 Live

Revision

Origin: 2cb0549
Pull Request: 431ccbe
Server: 3e9f7225ee07dd4287809a899fc1b971d6fa2e44

Test Merge Updated @ 05/27/2026 10:10:08 +00:00:
Server Instance

CM13 Live

Revision

Origin: 2cb0549
Pull Request: 431ccbe
Server: 8c7ba36

Test Merge Updated @ 05/27/2026 13:28:59 +00:00:
Server Instance

CM13 Live

Revision

Origin: 2cb0549
Pull Request: 431ccbe
Server: 667351d10e7aa0850870788bea7171e226e0a43f

Test Merge Updated @ 05/28/2026 09:04:58 +00:00:
Server Instance

CM13 Live

Revision

Origin: 3aa1683
Pull Request: 431ccbe
Server: f31f55ca7a07a0428f44782a0de0ad49c59f2c75

Test Merge Updated @ 05/28/2026 10:26:12 +00:00:
Server Instance

CM13 Live

Revision

Origin: f1e9ba7
Pull Request: 431ccbe
Server: cf525df

Test Merge Updated @ 05/28/2026 10:36:07 +00:00:
Server Instance

CM13 Live

Revision

Origin: 8b6beeb
Pull Request: 431ccbe
Server: 12a6e5f0fd712d281db7175815491f265b315f7e

Test Merge Removed @ 05/28/2026 10:51:44 +00:00:
Server Instance

CM13 Live

@github-project-automation github-project-automation Bot moved this from Awaiting Review to Partially Approved / Mergeable in Review Backlog May 28, 2026
@Detective-Google Detective-Google added this pull request to the merge queue May 28, 2026
Merged via the queue into cmss13-devs:master with commit 79689ea May 28, 2026
28 checks passed
@github-project-automation github-project-automation Bot moved this from Partially Approved / Mergeable to Merged in Review Backlog May 28, 2026
cmss13-ci Bot added a commit that referenced this pull request May 28, 2026
@Drulikar Drulikar deleted the xeno_update_icon branch May 28, 2026 10:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Code Improvement Make the code longer Fix Fix one bug, make ten more Performance the game sucks and this makes it suck less size/M Denotes a PR that changes 50-199 lines, ignoring generated files. Testmerge Candidate we'll test this while you're asleep and the server has 10 players

Projects

Status: Merged

Development

Successfully merging this pull request may close these issues.

3 participants