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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add new body examine state for unrecoverable #19435

Merged

Conversation

crazybrain23
Copy link
Contributor

@crazybrain23 crazybrain23 commented Aug 23, 2023

About the PR

Splits the old yellow "soul has departed and moved on. Any recovery is unlikely." to two different states.

For a player who is dead and SSD (meaning they can reconnect and be revived) it now says "soul lies dormant and may return soon." in yellow. For a player who is dead and cannot return (suicided or taken a ghost role (ghost role doesn't count (bug?)) it now says "soul has departed and moved on. Any recovery is unlikely." in purple.

The purple colour was chosen because it matches the catatonic state which it parallels.

Why / Balance

This was made because players have no way of knowing if a dead player is just disconnected or permanently gone. This causes confusion for chefs, medical, and others. Potentially resolves #8495, please confirm if this is true.

Technical details

Adds a check similar to the catatonic check, but for when they're also dead.

Media

image
image
SSDchart

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Changelog

馃啈 crazybrain

  • tweak: The dead body examine text is more accurate for dead, disconnected players.

I'm not too keen on the changelog wording, because it feels hard to explain what I've done.
(new changelog suggested by notafet)

@github-actions github-actions bot added the Status: Needs Review This PR requires new reviews before it can be merged. label Aug 23, 2023
@crazybrain23 crazybrain23 changed the title Add new body examin state for unrecoverable Add new body examine state for unrecoverable Aug 23, 2023
@Partmedia Partmedia self-assigned this Aug 23, 2023
Copy link
Contributor

@Partmedia Partmedia left a comment

Choose a reason for hiding this comment

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

Thank you for your contribution. This looks correct to me, and I've tested in-game with two clients and this appears to work as designed.

@Partmedia Partmedia removed the Status: Needs Review This PR requires new reviews before it can be merged. label Aug 23, 2023
@EmoGarbage404
Copy link
Member

i was sold when i saw the color-coded chart

@EmoGarbage404 EmoGarbage404 merged commit dccb52f into space-wizards:master Aug 23, 2023
10 checks passed
@Partmedia
Copy link
Contributor

i was sold when i saw the color-coded chart

That chart wasn't there when I reviewed it...

graevy added a commit to graevy/space-station-14 that referenced this pull request Aug 24, 2023
commit 88b9c6c
Merge: 288ce0d 70f2ac9
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Wed Aug 23 17:22:27 2023 -0700

    Merge branch 'space-wizards:master' into shuttlescreens

commit 70f2ac9
Author: PJBot <pieterjan.briers+bot@gmail.com>
Date:   Wed Aug 23 20:13:08 2023 -0400

    Automatic changelog update

commit 9341cac
Author: lapatison <100279397+lapatison@users.noreply.github.com>
Date:   Thu Aug 24 03:12:05 2023 +0300

    Split gardening cyborg module, literacy cyborg module tweak (space-wizards#19449)

    * book bag to literacy module, bucket n plant bag to gardening

    * split gardening into gardening and harvesting

    * book bag whitelist document, also dumpable

    * fix

    * new icon

commit 288ce0d
Author: avery <avry@pm.me>
Date:   Wed Aug 23 16:59:15 2023 -0700

    .

commit 5968f14
Author: avery <avry@pm.me>
Date:   Wed Aug 23 16:56:49 2023 -0700

    round end countdown

commit e1a744c
Author: PJBot <pieterjan.briers+bot@gmail.com>
Date:   Wed Aug 23 19:56:03 2023 -0400

    Automatic changelog update

commit b235c06
Author: LankLTE <135308300+LankLTE@users.noreply.github.com>
Date:   Wed Aug 23 16:54:59 2023 -0700

    Borg emag tweaks (space-wizards#19373)

    * Laws update

    * stun change

    * stuntime in component

    * history might be fucked

commit f8b55c8
Author: avery <avry@pm.me>
Date:   Wed Aug 23 16:26:46 2023 -0700

    docs

commit 9dea599
Author: avery <avry@pm.me>
Date:   Wed Aug 23 16:23:46 2023 -0700

    remote -> shuttle pairing

commit baf7af0
Author: Moony <moony@hellomouse.net>
Date:   Wed Aug 23 16:50:49 2023 -0500

    Update issue templates (space-wizards#19458)

commit 8dedce8
Author: PJBot <pieterjan.briers+bot@gmail.com>
Date:   Wed Aug 23 17:50:29 2023 -0400

    Automatic changelog update

commit 149e58d
Author: potato1234_x <79580518+potato1234x@users.noreply.github.com>
Date:   Thu Aug 24 07:49:25 2023 +1000

    revamp getmore inventory (space-wizards#19372)

commit eedcaea
Author: PJBot <pieterjan.briers+bot@gmail.com>
Date:   Wed Aug 23 17:43:37 2023 -0400

    Automatic changelog update

commit 566505c
Author: potato1234_x <79580518+potato1234x@users.noreply.github.com>
Date:   Thu Aug 24 07:42:33 2023 +1000

    short hair sprite change (space-wizards#19425)

commit dccb52f
Author: crazybrain23 <44417085+crazybrain23@users.noreply.github.com>
Date:   Wed Aug 23 22:41:54 2023 +0100

    Add new body examin state (space-wizards#19435)

commit fd0e14d
Author: PJBot <pieterjan.briers+bot@gmail.com>
Date:   Wed Aug 23 17:38:46 2023 -0400

    Automatic changelog update

commit 4a520ae
Author: Nairod <110078045+Nairodian@users.noreply.github.com>
Date:   Wed Aug 23 16:37:42 2023 -0500

    Arachnid Markings Expansion (space-wizards#19439)

commit 1d44e04
Author: PJBot <pieterjan.briers+bot@gmail.com>
Date:   Wed Aug 23 17:35:43 2023 -0400

    Automatic changelog update

commit 4935a95
Author: deltanedas <39013340+deltanedas@users.noreply.github.com>
Date:   Wed Aug 23 22:34:39 2023 +0100

    borg construction module (space-wizards#19260)

    * cant insert materials into machine if unremoveable

    * lingering materials

    * add construction cyborg module

    * fix empty stack color

    * lathe recipe

    * a

    ---------

    Co-authored-by: deltanedas <@deltanedas:kde.org>

commit b61b0e1
Author: Moony <moony@hellomouse.net>
Date:   Wed Aug 23 16:23:06 2023 -0500

    Update CODEOWNERS (space-wizards#19457)

commit 518db6f
Author: Moony <moony@hellomouse.net>
Date:   Wed Aug 23 16:09:56 2023 -0500

    Update RobustToolbox. (space-wizards#19456)

    Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>

commit 3d3c9e3
Author: Moony <moony@hellomouse.net>
Date:   Wed Aug 23 16:03:41 2023 -0500

    Toolshed part 2 (space-wizards#18997)

    * fixe

    * Save work.

    * Rune-aware parser.

    * oogh

    * pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests

    * Publicizes a lot of common generic commands, so custom toolshed envs can include them.

    * i think i might implode

    * Tests.

    * a

    * b

    * awa

    ---------

    Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>

commit 33ef861
Author: avery <avry@pm.me>
Date:   Wed Aug 23 13:55:47 2023 -0700

    to desktop

commit d5388b8
Author: avery <avry@pm.me>
Date:   Wed Aug 23 05:03:09 2023 -0700

    better names, moved an event handler

commit b774282
Author: avery <avry@pm.me>
Date:   Wed Aug 23 04:40:17 2023 -0700

    cargo, minor refactor

commit f013b84
Author: avery <avry@pm.me>
Date:   Wed Aug 23 03:50:18 2023 -0700

    ope

commit 0cdb694
Author: avery <avry@pm.me>
Date:   Wed Aug 23 03:49:47 2023 -0700

    data definitions must now be partial

commit 985df9f
Author: avery <avry@pm.me>
Date:   Wed Aug 23 03:12:51 2023 -0700

    update rt

commit 53c4e3e
Author: avery <avry@pm.me>
Date:   Wed Aug 23 03:10:43 2023 -0700

    upstream bug...?

commit 2bc9850
Author: avery <avry@pm.me>
Date:   Wed Aug 23 03:10:33 2023 -0700

    polish

commit e3cb336
Author: avery <avry@pm.me>
Date:   Wed Aug 23 02:31:54 2023 -0700

    update after merge

commit 6ce709f
Merge: de572c9 852b66d
Author: avery <avry@pm.me>
Date:   Wed Aug 23 02:31:33 2023 -0700

    Merge branch 'shuttlescreens' of https://github.com/graevy/space-station-14 into shuttlescreens

commit de572c9
Author: avery <avry@pm.me>
Date:   Wed Aug 23 02:20:05 2023 -0700

    feature parity :3

commit 852b66d
Author: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date:   Wed Aug 23 19:17:10 2023 +1000

    Update submodule to 150.0.1 (space-wizards#19444)

commit 1d42a6e
Author: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date:   Wed Aug 23 18:57:39 2023 +1000

    Update submodule to 150.0.0 (space-wizards#19442)

commit 7356266
Author: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date:   Wed Aug 23 18:55:58 2023 +1000

    Remove FixtureId (space-wizards#19280)

commit 2cc1f8f
Author: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Date:   Wed Aug 23 00:32:11 2023 -0700

    Update RobustToolbox to dc23dfa (space-wizards#19440)

commit ecd145b
Author: Doru991 <75124791+Doru991@users.noreply.github.com>
Date:   Wed Aug 23 07:51:59 2023 +0300

    Fix zombie eye appearance (space-wizards#19427)

commit db9cedd
Author: avery <avry@pm.me>
Date:   Tue Aug 22 02:58:21 2023 -0700

    to desktop

commit 08bb503
Author: avery <avry@pm.me>
Date:   Thu Aug 17 17:12:53 2023 -0700

    to laptop

commit 19c4cb7
Author: avery <avry@pm.me>
Date:   Tue Aug 15 01:13:02 2023 -0700

    cargo shuttle timer

commit 334e12f
Author: avery <avry@pm.me>
Date:   Tue Aug 15 01:12:54 2023 -0700

    polishes

commit 3425e22
Author: avery <avry@pm.me>
Date:   Mon Aug 14 23:37:48 2023 -0700

    shuttle timers work! predicate refactor next

commit 5b60ce0
Merge: 5490619 3b7a23b
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Mon Aug 14 03:09:20 2023 -0700

    Merge branch 'space-wizards:master' into shuttletimers

commit 5490619
Author: avery <avry@pm.me>
Date:   Mon Aug 14 03:08:11 2023 -0700

    to desktop

commit 884347d
Author: avery <avry@pm.me>
Date:   Mon Aug 14 00:32:10 2023 -0700

    to laptop

commit f2cbde3
Author: avery <avry@pm.me>
Date:   Sun Aug 13 17:28:20 2023 -0700

    remote timer filtering refactor

commit 689c6c8
Author: avery <avry@pm.me>
Date:   Sat Aug 12 23:12:23 2023 -0700

    to desktop

commit 09e582c
Author: avery <avry@pm.me>
Date:   Sat Aug 12 16:00:32 2023 -0700

    to laptop

commit 4cc6c6f
Author: avery <avry@pm.me>
Date:   Sat Aug 12 05:05:49 2023 -0700

    to laptop

commit cbb8c0f
Author: avery <avry@pm.me>
Date:   Sat Aug 12 02:41:34 2023 -0700

    to desktop

commit 7b675ce
Author: avery <avry@pm.me>
Date:   Fri Aug 11 20:36:19 2023 -0700

    to laptop

commit 3d637f3
Author: avery <avry@pm.me>
Date:   Fri Aug 11 20:11:27 2023 -0700

    to desktop

commit d4f244d
Author: avery <avry@pm.me>
Date:   Fri Aug 11 04:01:56 2023 -0700

    to laptop

commit 242ef07
Author: avery <avry@pm.me>
Date:   Thu Aug 10 21:41:35 2023 -0700

    to desktop

commit 0812c07
Author: avery <avry@pm.me>
Date:   Thu Aug 10 16:51:46 2023 -0700

    to laptop

commit 49ff245
Author: avery <avry@pm.me>
Date:   Thu Aug 10 01:09:44 2023 -0700

    to desktop

commit 09fac42
Merge: 922aa09 804dcf4
Author: avery <avry@pm.me>
Date:   Wed Aug 9 16:18:47 2023 -0700

    Merge branch 'shuttletimers' of https://github.com/graevy/space-station-14 into shuttletimers

commit 804dcf4
Merge: 7542338 c5af5c1
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Wed Aug 9 15:55:41 2023 -0700

    Merge branch 'space-wizards:master' into shuttletimers

commit 922aa09
Author: avery <avry@pm.me>
Date:   Wed Aug 9 14:36:45 2023 -0700

    found an extensible solution. moving to laptop

commit 7542338
Author: avery <avry@pm.me>
Date:   Wed Aug 9 14:05:08 2023 -0700

    recall, docking, and transit timing

commit 0a03240
Merge: 4d25533 7381a03
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Tue Aug 8 20:32:25 2023 -0700

    Merge branch 'space-wizards:master' into shuttletimers

commit 4d25533
Author: avery <avry@pm.me>
Date:   Tue Aug 8 04:25:52 2023 -0700

    gotta fix this token bug. everything else works

commit d7927f5
Author: avery <avry@pm.me>
Date:   Mon Aug 7 23:47:53 2023 -0700

    to laptop

commit 6c81ee0
Author: avery <avry@pm.me>
Date:   Sun Aug 6 23:42:24 2023 -0700

    to desktop

commit 857d3f6
Merge: 0aa543a 6ce3285
Author: avery <avry@pm.me>
Date:   Sun Aug 6 20:53:40 2023 -0700

    Merge branch 'shuttletimers' of https://github.com/graevy/space-station-14 into shuttletimers

commit 0aa543a
Author: avery <avry@pm.me>
Date:   Sun Aug 6 20:53:37 2023 -0700

    to laptop

commit 6ce3285
Merge: 4ba8733 56fa974
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Sun Aug 6 18:36:41 2023 -0700

    Merge branch 'space-wizards:master' into shuttletimers

commit 4ba8733
Author: avery <avry@pm.me>
Date:   Sun Aug 6 18:36:27 2023 -0700

    to laptop

commit 614f1a1
Merge: 1430e4a 9af3c88
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Sun Aug 6 14:17:17 2023 -0700

    Merge branch 'space-wizards:master' into shuttletimers

commit 1430e4a
Author: avery <avry@pm.me>
Date:   Sun Aug 6 13:57:02 2023 -0700

    to desktop

commit e469e04
Merge: 48dda40 db5dee6
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Sun Aug 6 01:21:06 2023 -0700

    Merge branch 'space-wizards:master' into shuttletimers

commit 48dda40
Author: avery <avry@pm.me>
Date:   Fri Aug 4 17:15:19 2023 -0700

    parent-child shuttle timer branch initial commit

commit 83897b4
Merge: b7a20fa 2a87079
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Fri Aug 4 14:39:42 2023 -0700

    Merge branch 'space-wizards:master' into shuttles

commit b7a20fa
Merge: a66a216 b74bd10
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Fri Aug 4 00:06:13 2023 -0700

    Merge branch 'space-wizards:master' into shuttles

commit a66a216
Merge: bf8e88b 26dd6f2
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Wed Aug 2 03:59:47 2023 -0700

    Merge branch 'space-wizards:master' into shuttles

commit bf8e88b
Author: avery <avry@pm.me>
Date:   Wed Aug 2 03:56:12 2023 -0700

    squash: debugging

commit 7db8a08
Author: avery <avry@pm.me>
Date:   Wed Aug 2 03:55:30 2023 -0700

    added evac timer system/component/prototype

commit cb89491
Author: avery <avry@pm.me>
Date:   Wed Aug 2 03:54:59 2023 -0700

    support for emergency shuttle events

commit 4738aa0
Author: avery <avry@pm.me>
Date:   Wed Aug 2 03:53:28 2023 -0700

    added events for evac shuttle call/recall/dock

commit b32ff66
Merge: da371ae 6a2aac3
Author: avery <avry@pm.me>
Date:   Wed Aug 2 03:29:09 2023 -0700

    Merge branch 'master' of https://github.com/graevy/space-station-14 into shuttles

commit da371ae
Author: avery <avry@pm.me>
Date:   Wed Aug 2 03:26:29 2023 -0700

    revert screentimer rounding displaying e.g. 1m60s

commit 06f3d6e
Merge: 7300fb8 926e539
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Tue Aug 1 23:00:20 2023 -0700

    Merge branch 'space-wizards:master' into master

commit 7300fb8
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Sun Jul 30 17:11:17 2023 -0700

    Update ReflectComponent.cs

commit b3213a6
Merge: 38c8264 44b44fd
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Sun Jul 30 14:01:44 2023 -0700

    Merge branch 'space-wizards:master' into master

commit 38c8264
Merge: 5800e03 27c08e6
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Sun Jul 23 03:50:28 2023 -0700

    Merge branch 'space-wizards:master' into master

commit 5800e03
Author: avery <avry@pm.me>
Date:   Sun Jul 23 03:14:33 2023 -0700

    support for reflectprob = 1

commit 8e5c380
Merge: 2bdafb3 a11fab3
Author: avery <avry@pm.me>
Date:   Sat Jul 22 04:27:26 2023 -0700

    Merge branch 'master' of https://github.com/graevy/space-station-14

commit 2bdafb3
Author: avery <avry@pm.me>
Date:   Sat Jul 22 04:26:26 2023 -0700

    laptop sync

commit 528b539
Author: avery <avry@pm.me>
Date:   Sat Jul 22 04:25:45 2023 -0700

    removing redundant layer concept

commit 94ca8f1
Author: avery <avry@pm.me>
Date:   Sat Jul 22 04:23:45 2023 -0700

    ce syndie suit vest is cosmetic only

commit a11fab3
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Sat Jul 22 04:18:46 2023 -0700

    Update Resources/Prototypes/Entities/Structures/Walls/walls.yml

    Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>

commit af45aaf
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Sat Jul 22 04:18:20 2023 -0700

    Update Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml

    Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>

commit ce59ab7
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Sat Jul 22 04:18:09 2023 -0700

    Update Resources/Prototypes/Entities/Structures/Walls/walls.yml

    Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>

commit c39c8e2
Author: avery <avry@pm.me>
Date:   Sat Jul 22 03:25:25 2023 -0700

    desktop debugging

commit fe63fbe
Merge: 26e1f20 53e1a63
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Fri Jul 21 17:19:43 2023 -0700

    Merge branch 'space-wizards:master' into master

commit 26e1f20
Merge: 20e46e4 c6cb6ad
Author: avery <avry@pm.me>
Date:   Fri Jul 21 04:11:00 2023 -0700

    Merge branch 'master' of https://github.com/graevy/space-station-14

commit 20e46e4
Author: avery <avry@pm.me>
Date:   Fri Jul 21 02:25:13 2023 -0700

    parent 9da2545
    author avery <avry@pm.me> 1689931513 -0700
    committer avery <avry@pm.me> 1689934524 -0700

    added reflection support for mobs/reflective vest/shuttle walls

commit 9da2545
Author: PJBot <pieterjan.briers+bot@gmail.com>
Date:   Thu Jul 20 17:56:54 2023 -0400

    Automatic changelog update

    desktop debugging

    added reflection support for mobs/reflective vest/shuttle walls
graevy added a commit to graevy/space-station-14 that referenced this pull request Aug 24, 2023
commit ed2b4fc
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Wed Aug 23 19:09:04 2023 -0700

    remove debugging shuttletimers

commit 88b9c6c
Merge: 288ce0d 70f2ac9
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Wed Aug 23 17:22:27 2023 -0700

    Merge branch 'space-wizards:master' into shuttlescreens

commit 70f2ac9
Author: PJBot <pieterjan.briers+bot@gmail.com>
Date:   Wed Aug 23 20:13:08 2023 -0400

    Automatic changelog update

commit 9341cac
Author: lapatison <100279397+lapatison@users.noreply.github.com>
Date:   Thu Aug 24 03:12:05 2023 +0300

    Split gardening cyborg module, literacy cyborg module tweak (space-wizards#19449)

    * book bag to literacy module, bucket n plant bag to gardening

    * split gardening into gardening and harvesting

    * book bag whitelist document, also dumpable

    * fix

    * new icon

commit 288ce0d
Author: avery <avry@pm.me>
Date:   Wed Aug 23 16:59:15 2023 -0700

    .

commit 5968f14
Author: avery <avry@pm.me>
Date:   Wed Aug 23 16:56:49 2023 -0700

    round end countdown

commit e1a744c
Author: PJBot <pieterjan.briers+bot@gmail.com>
Date:   Wed Aug 23 19:56:03 2023 -0400

    Automatic changelog update

commit b235c06
Author: LankLTE <135308300+LankLTE@users.noreply.github.com>
Date:   Wed Aug 23 16:54:59 2023 -0700

    Borg emag tweaks (space-wizards#19373)

    * Laws update

    * stun change

    * stuntime in component

    * history might be fucked

commit f8b55c8
Author: avery <avry@pm.me>
Date:   Wed Aug 23 16:26:46 2023 -0700

    docs

commit 9dea599
Author: avery <avry@pm.me>
Date:   Wed Aug 23 16:23:46 2023 -0700

    remote -> shuttle pairing

commit baf7af0
Author: Moony <moony@hellomouse.net>
Date:   Wed Aug 23 16:50:49 2023 -0500

    Update issue templates (space-wizards#19458)

commit 8dedce8
Author: PJBot <pieterjan.briers+bot@gmail.com>
Date:   Wed Aug 23 17:50:29 2023 -0400

    Automatic changelog update

commit 149e58d
Author: potato1234_x <79580518+potato1234x@users.noreply.github.com>
Date:   Thu Aug 24 07:49:25 2023 +1000

    revamp getmore inventory (space-wizards#19372)

commit eedcaea
Author: PJBot <pieterjan.briers+bot@gmail.com>
Date:   Wed Aug 23 17:43:37 2023 -0400

    Automatic changelog update

commit 566505c
Author: potato1234_x <79580518+potato1234x@users.noreply.github.com>
Date:   Thu Aug 24 07:42:33 2023 +1000

    short hair sprite change (space-wizards#19425)

commit dccb52f
Author: crazybrain23 <44417085+crazybrain23@users.noreply.github.com>
Date:   Wed Aug 23 22:41:54 2023 +0100

    Add new body examin state (space-wizards#19435)

commit fd0e14d
Author: PJBot <pieterjan.briers+bot@gmail.com>
Date:   Wed Aug 23 17:38:46 2023 -0400

    Automatic changelog update

commit 4a520ae
Author: Nairod <110078045+Nairodian@users.noreply.github.com>
Date:   Wed Aug 23 16:37:42 2023 -0500

    Arachnid Markings Expansion (space-wizards#19439)

commit 1d44e04
Author: PJBot <pieterjan.briers+bot@gmail.com>
Date:   Wed Aug 23 17:35:43 2023 -0400

    Automatic changelog update

commit 4935a95
Author: deltanedas <39013340+deltanedas@users.noreply.github.com>
Date:   Wed Aug 23 22:34:39 2023 +0100

    borg construction module (space-wizards#19260)

    * cant insert materials into machine if unremoveable

    * lingering materials

    * add construction cyborg module

    * fix empty stack color

    * lathe recipe

    * a

    ---------

    Co-authored-by: deltanedas <@deltanedas:kde.org>

commit b61b0e1
Author: Moony <moony@hellomouse.net>
Date:   Wed Aug 23 16:23:06 2023 -0500

    Update CODEOWNERS (space-wizards#19457)

commit 518db6f
Author: Moony <moony@hellomouse.net>
Date:   Wed Aug 23 16:09:56 2023 -0500

    Update RobustToolbox. (space-wizards#19456)

    Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>

commit 3d3c9e3
Author: Moony <moony@hellomouse.net>
Date:   Wed Aug 23 16:03:41 2023 -0500

    Toolshed part 2 (space-wizards#18997)

    * fixe

    * Save work.

    * Rune-aware parser.

    * oogh

    * pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests

    * Publicizes a lot of common generic commands, so custom toolshed envs can include them.

    * i think i might implode

    * Tests.

    * a

    * b

    * awa

    ---------

    Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>

commit 33ef861
Author: avery <avry@pm.me>
Date:   Wed Aug 23 13:55:47 2023 -0700

    to desktop

commit d5388b8
Author: avery <avry@pm.me>
Date:   Wed Aug 23 05:03:09 2023 -0700

    better names, moved an event handler

commit b774282
Author: avery <avry@pm.me>
Date:   Wed Aug 23 04:40:17 2023 -0700

    cargo, minor refactor

commit f013b84
Author: avery <avry@pm.me>
Date:   Wed Aug 23 03:50:18 2023 -0700

    ope

commit 0cdb694
Author: avery <avry@pm.me>
Date:   Wed Aug 23 03:49:47 2023 -0700

    data definitions must now be partial

commit 985df9f
Author: avery <avry@pm.me>
Date:   Wed Aug 23 03:12:51 2023 -0700

    update rt

commit 53c4e3e
Author: avery <avry@pm.me>
Date:   Wed Aug 23 03:10:43 2023 -0700

    upstream bug...?

commit 2bc9850
Author: avery <avry@pm.me>
Date:   Wed Aug 23 03:10:33 2023 -0700

    polish

commit e3cb336
Author: avery <avry@pm.me>
Date:   Wed Aug 23 02:31:54 2023 -0700

    update after merge

commit 6ce709f
Merge: de572c9 852b66d
Author: avery <avry@pm.me>
Date:   Wed Aug 23 02:31:33 2023 -0700

    Merge branch 'shuttlescreens' of https://github.com/graevy/space-station-14 into shuttlescreens

commit de572c9
Author: avery <avry@pm.me>
Date:   Wed Aug 23 02:20:05 2023 -0700

    feature parity :3

commit 852b66d
Author: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date:   Wed Aug 23 19:17:10 2023 +1000

    Update submodule to 150.0.1 (space-wizards#19444)

commit 1d42a6e
Author: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date:   Wed Aug 23 18:57:39 2023 +1000

    Update submodule to 150.0.0 (space-wizards#19442)

commit 7356266
Author: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date:   Wed Aug 23 18:55:58 2023 +1000

    Remove FixtureId (space-wizards#19280)

commit 2cc1f8f
Author: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Date:   Wed Aug 23 00:32:11 2023 -0700

    Update RobustToolbox to dc23dfa (space-wizards#19440)

commit ecd145b
Author: Doru991 <75124791+Doru991@users.noreply.github.com>
Date:   Wed Aug 23 07:51:59 2023 +0300

    Fix zombie eye appearance (space-wizards#19427)

commit db9cedd
Author: avery <avry@pm.me>
Date:   Tue Aug 22 02:58:21 2023 -0700

    to desktop

commit 08bb503
Author: avery <avry@pm.me>
Date:   Thu Aug 17 17:12:53 2023 -0700

    to laptop

commit 19c4cb7
Author: avery <avry@pm.me>
Date:   Tue Aug 15 01:13:02 2023 -0700

    cargo shuttle timer

commit 334e12f
Author: avery <avry@pm.me>
Date:   Tue Aug 15 01:12:54 2023 -0700

    polishes

commit 3425e22
Author: avery <avry@pm.me>
Date:   Mon Aug 14 23:37:48 2023 -0700

    shuttle timers work! predicate refactor next

commit 5b60ce0
Merge: 5490619 3b7a23b
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Mon Aug 14 03:09:20 2023 -0700

    Merge branch 'space-wizards:master' into shuttletimers

commit 5490619
Author: avery <avry@pm.me>
Date:   Mon Aug 14 03:08:11 2023 -0700

    to desktop

commit 884347d
Author: avery <avry@pm.me>
Date:   Mon Aug 14 00:32:10 2023 -0700

    to laptop

commit f2cbde3
Author: avery <avry@pm.me>
Date:   Sun Aug 13 17:28:20 2023 -0700

    remote timer filtering refactor

commit 689c6c8
Author: avery <avry@pm.me>
Date:   Sat Aug 12 23:12:23 2023 -0700

    to desktop

commit 09e582c
Author: avery <avry@pm.me>
Date:   Sat Aug 12 16:00:32 2023 -0700

    to laptop

commit 4cc6c6f
Author: avery <avry@pm.me>
Date:   Sat Aug 12 05:05:49 2023 -0700

    to laptop

commit cbb8c0f
Author: avery <avry@pm.me>
Date:   Sat Aug 12 02:41:34 2023 -0700

    to desktop

commit 7b675ce
Author: avery <avry@pm.me>
Date:   Fri Aug 11 20:36:19 2023 -0700

    to laptop

commit 3d637f3
Author: avery <avry@pm.me>
Date:   Fri Aug 11 20:11:27 2023 -0700

    to desktop

commit d4f244d
Author: avery <avry@pm.me>
Date:   Fri Aug 11 04:01:56 2023 -0700

    to laptop

commit 242ef07
Author: avery <avry@pm.me>
Date:   Thu Aug 10 21:41:35 2023 -0700

    to desktop

commit 0812c07
Author: avery <avry@pm.me>
Date:   Thu Aug 10 16:51:46 2023 -0700

    to laptop

commit 49ff245
Author: avery <avry@pm.me>
Date:   Thu Aug 10 01:09:44 2023 -0700

    to desktop

commit 09fac42
Merge: 922aa09 804dcf4
Author: avery <avry@pm.me>
Date:   Wed Aug 9 16:18:47 2023 -0700

    Merge branch 'shuttletimers' of https://github.com/graevy/space-station-14 into shuttletimers

commit 804dcf4
Merge: 7542338 c5af5c1
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Wed Aug 9 15:55:41 2023 -0700

    Merge branch 'space-wizards:master' into shuttletimers

commit 922aa09
Author: avery <avry@pm.me>
Date:   Wed Aug 9 14:36:45 2023 -0700

    found an extensible solution. moving to laptop

commit 7542338
Author: avery <avry@pm.me>
Date:   Wed Aug 9 14:05:08 2023 -0700

    recall, docking, and transit timing

commit 0a03240
Merge: 4d25533 7381a03
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Tue Aug 8 20:32:25 2023 -0700

    Merge branch 'space-wizards:master' into shuttletimers

commit 4d25533
Author: avery <avry@pm.me>
Date:   Tue Aug 8 04:25:52 2023 -0700

    gotta fix this token bug. everything else works

commit d7927f5
Author: avery <avry@pm.me>
Date:   Mon Aug 7 23:47:53 2023 -0700

    to laptop

commit 6c81ee0
Author: avery <avry@pm.me>
Date:   Sun Aug 6 23:42:24 2023 -0700

    to desktop

commit 857d3f6
Merge: 0aa543a 6ce3285
Author: avery <avry@pm.me>
Date:   Sun Aug 6 20:53:40 2023 -0700

    Merge branch 'shuttletimers' of https://github.com/graevy/space-station-14 into shuttletimers

commit 0aa543a
Author: avery <avry@pm.me>
Date:   Sun Aug 6 20:53:37 2023 -0700

    to laptop

commit 6ce3285
Merge: 4ba8733 56fa974
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Sun Aug 6 18:36:41 2023 -0700

    Merge branch 'space-wizards:master' into shuttletimers

commit 4ba8733
Author: avery <avry@pm.me>
Date:   Sun Aug 6 18:36:27 2023 -0700

    to laptop

commit 614f1a1
Merge: 1430e4a 9af3c88
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Sun Aug 6 14:17:17 2023 -0700

    Merge branch 'space-wizards:master' into shuttletimers

commit 1430e4a
Author: avery <avry@pm.me>
Date:   Sun Aug 6 13:57:02 2023 -0700

    to desktop

commit e469e04
Merge: 48dda40 db5dee6
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Sun Aug 6 01:21:06 2023 -0700

    Merge branch 'space-wizards:master' into shuttletimers

commit 48dda40
Author: avery <avry@pm.me>
Date:   Fri Aug 4 17:15:19 2023 -0700

    parent-child shuttle timer branch initial commit

commit 83897b4
Merge: b7a20fa 2a87079
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Fri Aug 4 14:39:42 2023 -0700

    Merge branch 'space-wizards:master' into shuttles

commit b7a20fa
Merge: a66a216 b74bd10
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Fri Aug 4 00:06:13 2023 -0700

    Merge branch 'space-wizards:master' into shuttles

commit a66a216
Merge: bf8e88b 26dd6f2
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Wed Aug 2 03:59:47 2023 -0700

    Merge branch 'space-wizards:master' into shuttles

commit bf8e88b
Author: avery <avry@pm.me>
Date:   Wed Aug 2 03:56:12 2023 -0700

    squash: debugging

commit 7db8a08
Author: avery <avry@pm.me>
Date:   Wed Aug 2 03:55:30 2023 -0700

    added evac timer system/component/prototype

commit cb89491
Author: avery <avry@pm.me>
Date:   Wed Aug 2 03:54:59 2023 -0700

    support for emergency shuttle events

commit 4738aa0
Author: avery <avry@pm.me>
Date:   Wed Aug 2 03:53:28 2023 -0700

    added events for evac shuttle call/recall/dock

commit b32ff66
Merge: da371ae 6a2aac3
Author: avery <avry@pm.me>
Date:   Wed Aug 2 03:29:09 2023 -0700

    Merge branch 'master' of https://github.com/graevy/space-station-14 into shuttles

commit da371ae
Author: avery <avry@pm.me>
Date:   Wed Aug 2 03:26:29 2023 -0700

    revert screentimer rounding displaying e.g. 1m60s

commit 06f3d6e
Merge: 7300fb8 926e539
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Tue Aug 1 23:00:20 2023 -0700

    Merge branch 'space-wizards:master' into master

commit 7300fb8
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Sun Jul 30 17:11:17 2023 -0700

    Update ReflectComponent.cs

commit b3213a6
Merge: 38c8264 44b44fd
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Sun Jul 30 14:01:44 2023 -0700

    Merge branch 'space-wizards:master' into master

commit 38c8264
Merge: 5800e03 27c08e6
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Sun Jul 23 03:50:28 2023 -0700

    Merge branch 'space-wizards:master' into master

commit 5800e03
Author: avery <avry@pm.me>
Date:   Sun Jul 23 03:14:33 2023 -0700

    support for reflectprob = 1

commit 8e5c380
Merge: 2bdafb3 a11fab3
Author: avery <avry@pm.me>
Date:   Sat Jul 22 04:27:26 2023 -0700

    Merge branch 'master' of https://github.com/graevy/space-station-14

commit 2bdafb3
Author: avery <avry@pm.me>
Date:   Sat Jul 22 04:26:26 2023 -0700

    laptop sync

commit 528b539
Author: avery <avry@pm.me>
Date:   Sat Jul 22 04:25:45 2023 -0700

    removing redundant layer concept

commit 94ca8f1
Author: avery <avry@pm.me>
Date:   Sat Jul 22 04:23:45 2023 -0700

    ce syndie suit vest is cosmetic only

commit a11fab3
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Sat Jul 22 04:18:46 2023 -0700

    Update Resources/Prototypes/Entities/Structures/Walls/walls.yml

    Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>

commit af45aaf
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Sat Jul 22 04:18:20 2023 -0700

    Update Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml

    Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>

commit ce59ab7
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Sat Jul 22 04:18:09 2023 -0700

    Update Resources/Prototypes/Entities/Structures/Walls/walls.yml

    Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>

commit c39c8e2
Author: avery <avry@pm.me>
Date:   Sat Jul 22 03:25:25 2023 -0700

    desktop debugging

commit fe63fbe
Merge: 26e1f20 53e1a63
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Fri Jul 21 17:19:43 2023 -0700

    Merge branch 'space-wizards:master' into master

commit 26e1f20
Merge: 20e46e4 c6cb6ad
Author: avery <avry@pm.me>
Date:   Fri Jul 21 04:11:00 2023 -0700

    Merge branch 'master' of https://github.com/graevy/space-station-14

commit 20e46e4
Author: avery <avry@pm.me>
Date:   Fri Jul 21 02:25:13 2023 -0700

    parent 9da2545
    author avery <avry@pm.me> 1689931513 -0700
    committer avery <avry@pm.me> 1689934524 -0700

    added reflection support for mobs/reflective vest/shuttle walls

commit 9da2545
Author: PJBot <pieterjan.briers+bot@gmail.com>
Date:   Thu Jul 20 17:56:54 2023 -0400

    Automatic changelog update

    desktop debugging

    added reflection support for mobs/reflective vest/shuttle walls
graevy added a commit to graevy/space-station-14 that referenced this pull request Aug 24, 2023
commit e414d49
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Wed Aug 23 19:39:01 2023 -0700

    more bad changes

commit 04650d4
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Wed Aug 23 19:35:55 2023 -0700

    Squashed commit of the following:

    commit 76f6136
    Author: avery <51971268+graevy@users.noreply.github.com>
    Date:   Wed Aug 23 19:34:25 2023 -0700

        pruning bad changes

    commit 57206c9
    Merge: e5dd552 222b40a
    Author: avery <51971268+graevy@users.noreply.github.com>
    Date:   Wed Aug 23 19:17:19 2023 -0700

        Merge branch 'shuttletimers-prod' of https://github.com/graevy/space-station-14 into shuttletimers-prod

    commit e5dd552
    Author: avery <51971268+graevy@users.noreply.github.com>
    Date:   Wed Aug 23 19:11:49 2023 -0700

        Squashed commit of the following:

        commit ed2b4fc
        Author: avery <51971268+graevy@users.noreply.github.com>
        Date:   Wed Aug 23 19:09:04 2023 -0700

            remove debugging shuttletimers

        commit 88b9c6c
        Merge: 288ce0d 70f2ac9
        Author: avery <51971268+graevy@users.noreply.github.com>
        Date:   Wed Aug 23 17:22:27 2023 -0700

            Merge branch 'space-wizards:master' into shuttlescreens

        commit 70f2ac9
        Author: PJBot <pieterjan.briers+bot@gmail.com>
        Date:   Wed Aug 23 20:13:08 2023 -0400

            Automatic changelog update

        commit 9341cac
        Author: lapatison <100279397+lapatison@users.noreply.github.com>
        Date:   Thu Aug 24 03:12:05 2023 +0300

            Split gardening cyborg module, literacy cyborg module tweak (space-wizards#19449)

            * book bag to literacy module, bucket n plant bag to gardening

            * split gardening into gardening and harvesting

            * book bag whitelist document, also dumpable

            * fix

            * new icon

        commit 288ce0d
        Author: avery <avry@pm.me>
        Date:   Wed Aug 23 16:59:15 2023 -0700

            .

        commit 5968f14
        Author: avery <avry@pm.me>
        Date:   Wed Aug 23 16:56:49 2023 -0700

            round end countdown

        commit e1a744c
        Author: PJBot <pieterjan.briers+bot@gmail.com>
        Date:   Wed Aug 23 19:56:03 2023 -0400

            Automatic changelog update

        commit b235c06
        Author: LankLTE <135308300+LankLTE@users.noreply.github.com>
        Date:   Wed Aug 23 16:54:59 2023 -0700

            Borg emag tweaks (space-wizards#19373)

            * Laws update

            * stun change

            * stuntime in component

            * history might be fucked

        commit f8b55c8
        Author: avery <avry@pm.me>
        Date:   Wed Aug 23 16:26:46 2023 -0700

            docs

        commit 9dea599
        Author: avery <avry@pm.me>
        Date:   Wed Aug 23 16:23:46 2023 -0700

            remote -> shuttle pairing

        commit baf7af0
        Author: Moony <moony@hellomouse.net>
        Date:   Wed Aug 23 16:50:49 2023 -0500

            Update issue templates (space-wizards#19458)

        commit 8dedce8
        Author: PJBot <pieterjan.briers+bot@gmail.com>
        Date:   Wed Aug 23 17:50:29 2023 -0400

            Automatic changelog update

        commit 149e58d
        Author: potato1234_x <79580518+potato1234x@users.noreply.github.com>
        Date:   Thu Aug 24 07:49:25 2023 +1000

            revamp getmore inventory (space-wizards#19372)

        commit eedcaea
        Author: PJBot <pieterjan.briers+bot@gmail.com>
        Date:   Wed Aug 23 17:43:37 2023 -0400

            Automatic changelog update

        commit 566505c
        Author: potato1234_x <79580518+potato1234x@users.noreply.github.com>
        Date:   Thu Aug 24 07:42:33 2023 +1000

            short hair sprite change (space-wizards#19425)

        commit dccb52f
        Author: crazybrain23 <44417085+crazybrain23@users.noreply.github.com>
        Date:   Wed Aug 23 22:41:54 2023 +0100

            Add new body examin state (space-wizards#19435)

        commit fd0e14d
        Author: PJBot <pieterjan.briers+bot@gmail.com>
        Date:   Wed Aug 23 17:38:46 2023 -0400

            Automatic changelog update

        commit 4a520ae
        Author: Nairod <110078045+Nairodian@users.noreply.github.com>
        Date:   Wed Aug 23 16:37:42 2023 -0500

            Arachnid Markings Expansion (space-wizards#19439)

        commit 1d44e04
        Author: PJBot <pieterjan.briers+bot@gmail.com>
        Date:   Wed Aug 23 17:35:43 2023 -0400

            Automatic changelog update

        commit 4935a95
        Author: deltanedas <39013340+deltanedas@users.noreply.github.com>
        Date:   Wed Aug 23 22:34:39 2023 +0100

            borg construction module (space-wizards#19260)

            * cant insert materials into machine if unremoveable

            * lingering materials

            * add construction cyborg module

            * fix empty stack color

            * lathe recipe

            * a

            ---------

            Co-authored-by: deltanedas <@deltanedas:kde.org>

        commit b61b0e1
        Author: Moony <moony@hellomouse.net>
        Date:   Wed Aug 23 16:23:06 2023 -0500

            Update CODEOWNERS (space-wizards#19457)

        commit 518db6f
        Author: Moony <moony@hellomouse.net>
        Date:   Wed Aug 23 16:09:56 2023 -0500

            Update RobustToolbox. (space-wizards#19456)

            Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>

        commit 3d3c9e3
        Author: Moony <moony@hellomouse.net>
        Date:   Wed Aug 23 16:03:41 2023 -0500

            Toolshed part 2 (space-wizards#18997)

            * fixe

            * Save work.

            * Rune-aware parser.

            * oogh

            * pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests

            * Publicizes a lot of common generic commands, so custom toolshed envs can include them.

            * i think i might implode

            * Tests.

            * a

            * b

            * awa

            ---------

            Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>

        commit 33ef861
        Author: avery <avry@pm.me>
        Date:   Wed Aug 23 13:55:47 2023 -0700

            to desktop

        commit d5388b8
        Author: avery <avry@pm.me>
        Date:   Wed Aug 23 05:03:09 2023 -0700

            better names, moved an event handler

        commit b774282
        Author: avery <avry@pm.me>
        Date:   Wed Aug 23 04:40:17 2023 -0700

            cargo, minor refactor

        commit f013b84
        Author: avery <avry@pm.me>
        Date:   Wed Aug 23 03:50:18 2023 -0700

            ope

        commit 0cdb694
        Author: avery <avry@pm.me>
        Date:   Wed Aug 23 03:49:47 2023 -0700

            data definitions must now be partial

        commit 985df9f
        Author: avery <avry@pm.me>
        Date:   Wed Aug 23 03:12:51 2023 -0700

            update rt

        commit 53c4e3e
        Author: avery <avry@pm.me>
        Date:   Wed Aug 23 03:10:43 2023 -0700

            upstream bug...?

        commit 2bc9850
        Author: avery <avry@pm.me>
        Date:   Wed Aug 23 03:10:33 2023 -0700

            polish

        commit e3cb336
        Author: avery <avry@pm.me>
        Date:   Wed Aug 23 02:31:54 2023 -0700

            update after merge

        commit 6ce709f
        Merge: de572c9 852b66d
        Author: avery <avry@pm.me>
        Date:   Wed Aug 23 02:31:33 2023 -0700

            Merge branch 'shuttlescreens' of https://github.com/graevy/space-station-14 into shuttlescreens

        commit de572c9
        Author: avery <avry@pm.me>
        Date:   Wed Aug 23 02:20:05 2023 -0700

            feature parity :3

        commit 852b66d
        Author: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
        Date:   Wed Aug 23 19:17:10 2023 +1000

            Update submodule to 150.0.1 (space-wizards#19444)

        commit 1d42a6e
        Author: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
        Date:   Wed Aug 23 18:57:39 2023 +1000

            Update submodule to 150.0.0 (space-wizards#19442)

        commit 7356266
        Author: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
        Date:   Wed Aug 23 18:55:58 2023 +1000

            Remove FixtureId (space-wizards#19280)

        commit 2cc1f8f
        Author: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
        Date:   Wed Aug 23 00:32:11 2023 -0700

            Update RobustToolbox to dc23dfa (space-wizards#19440)

        commit ecd145b
        Author: Doru991 <75124791+Doru991@users.noreply.github.com>
        Date:   Wed Aug 23 07:51:59 2023 +0300

            Fix zombie eye appearance (space-wizards#19427)

        commit db9cedd
        Author: avery <avry@pm.me>
        Date:   Tue Aug 22 02:58:21 2023 -0700

            to desktop

        commit 08bb503
        Author: avery <avry@pm.me>
        Date:   Thu Aug 17 17:12:53 2023 -0700

            to laptop

        commit 19c4cb7
        Author: avery <avry@pm.me>
        Date:   Tue Aug 15 01:13:02 2023 -0700

            cargo shuttle timer

        commit 334e12f
        Author: avery <avry@pm.me>
        Date:   Tue Aug 15 01:12:54 2023 -0700

            polishes

        commit 3425e22
        Author: avery <avry@pm.me>
        Date:   Mon Aug 14 23:37:48 2023 -0700

            shuttle timers work! predicate refactor next

        commit 5b60ce0
        Merge: 5490619 3b7a23b
        Author: avery <51971268+graevy@users.noreply.github.com>
        Date:   Mon Aug 14 03:09:20 2023 -0700

            Merge branch 'space-wizards:master' into shuttletimers

        commit 5490619
        Author: avery <avry@pm.me>
        Date:   Mon Aug 14 03:08:11 2023 -0700

            to desktop

        commit 884347d
        Author: avery <avry@pm.me>
        Date:   Mon Aug 14 00:32:10 2023 -0700

            to laptop

        commit f2cbde3
        Author: avery <avry@pm.me>
        Date:   Sun Aug 13 17:28:20 2023 -0700

            remote timer filtering refactor

        commit 689c6c8
        Author: avery <avry@pm.me>
        Date:   Sat Aug 12 23:12:23 2023 -0700

            to desktop

        commit 09e582c
        Author: avery <avry@pm.me>
        Date:   Sat Aug 12 16:00:32 2023 -0700

            to laptop

        commit 4cc6c6f
        Author: avery <avry@pm.me>
        Date:   Sat Aug 12 05:05:49 2023 -0700

            to laptop

        commit cbb8c0f
        Author: avery <avry@pm.me>
        Date:   Sat Aug 12 02:41:34 2023 -0700

            to desktop

        commit 7b675ce
        Author: avery <avry@pm.me>
        Date:   Fri Aug 11 20:36:19 2023 -0700

            to laptop

        commit 3d637f3
        Author: avery <avry@pm.me>
        Date:   Fri Aug 11 20:11:27 2023 -0700

            to desktop

        commit d4f244d
        Author: avery <avry@pm.me>
        Date:   Fri Aug 11 04:01:56 2023 -0700

            to laptop

        commit 242ef07
        Author: avery <avry@pm.me>
        Date:   Thu Aug 10 21:41:35 2023 -0700

            to desktop

        commit 0812c07
        Author: avery <avry@pm.me>
        Date:   Thu Aug 10 16:51:46 2023 -0700

            to laptop

        commit 49ff245
        Author: avery <avry@pm.me>
        Date:   Thu Aug 10 01:09:44 2023 -0700

            to desktop

        commit 09fac42
        Merge: 922aa09 804dcf4
        Author: avery <avry@pm.me>
        Date:   Wed Aug 9 16:18:47 2023 -0700

            Merge branch 'shuttletimers' of https://github.com/graevy/space-station-14 into shuttletimers

        commit 804dcf4
        Merge: 7542338 c5af5c1
        Author: avery <51971268+graevy@users.noreply.github.com>
        Date:   Wed Aug 9 15:55:41 2023 -0700

            Merge branch 'space-wizards:master' into shuttletimers

        commit 922aa09
        Author: avery <avry@pm.me>
        Date:   Wed Aug 9 14:36:45 2023 -0700

            found an extensible solution. moving to laptop

        commit 7542338
        Author: avery <avry@pm.me>
        Date:   Wed Aug 9 14:05:08 2023 -0700

            recall, docking, and transit timing

        commit 0a03240
        Merge: 4d25533 7381a03
        Author: avery <51971268+graevy@users.noreply.github.com>
        Date:   Tue Aug 8 20:32:25 2023 -0700

            Merge branch 'space-wizards:master' into shuttletimers

        commit 4d25533
        Author: avery <avry@pm.me>
        Date:   Tue Aug 8 04:25:52 2023 -0700

            gotta fix this token bug. everything else works

        commit d7927f5
        Author: avery <avry@pm.me>
        Date:   Mon Aug 7 23:47:53 2023 -0700

            to laptop

        commit 6c81ee0
        Author: avery <avry@pm.me>
        Date:   Sun Aug 6 23:42:24 2023 -0700

            to desktop

        commit 857d3f6
        Merge: 0aa543a 6ce3285
        Author: avery <avry@pm.me>
        Date:   Sun Aug 6 20:53:40 2023 -0700

            Merge branch 'shuttletimers' of https://github.com/graevy/space-station-14 into shuttletimers

        commit 0aa543a
        Author: avery <avry@pm.me>
        Date:   Sun Aug 6 20:53:37 2023 -0700

            to laptop

        commit 6ce3285
        Merge: 4ba8733 56fa974
        Author: avery <51971268+graevy@users.noreply.github.com>
        Date:   Sun Aug 6 18:36:41 2023 -0700

            Merge branch 'space-wizards:master' into shuttletimers

        commit 4ba8733
        Author: avery <avry@pm.me>
        Date:   Sun Aug 6 18:36:27 2023 -0700

            to laptop

        commit 614f1a1
        Merge: 1430e4a 9af3c88
        Author: avery <51971268+graevy@users.noreply.github.com>
        Date:   Sun Aug 6 14:17:17 2023 -0700

            Merge branch 'space-wizards:master' into shuttletimers

        commit 1430e4a
        Author: avery <avry@pm.me>
        Date:   Sun Aug 6 13:57:02 2023 -0700

            to desktop

        commit e469e04
        Merge: 48dda40 db5dee6
        Author: avery <51971268+graevy@users.noreply.github.com>
        Date:   Sun Aug 6 01:21:06 2023 -0700

            Merge branch 'space-wizards:master' into shuttletimers

        commit 48dda40
        Author: avery <avry@pm.me>
        Date:   Fri Aug 4 17:15:19 2023 -0700

            parent-child shuttle timer branch initial commit

        commit 83897b4
        Merge: b7a20fa 2a87079
        Author: avery <51971268+graevy@users.noreply.github.com>
        Date:   Fri Aug 4 14:39:42 2023 -0700

            Merge branch 'space-wizards:master' into shuttles

        commit b7a20fa
        Merge: a66a216 b74bd10
        Author: avery <51971268+graevy@users.noreply.github.com>
        Date:   Fri Aug 4 00:06:13 2023 -0700

            Merge branch 'space-wizards:master' into shuttles

        commit a66a216
        Merge: bf8e88b 26dd6f2
        Author: avery <51971268+graevy@users.noreply.github.com>
        Date:   Wed Aug 2 03:59:47 2023 -0700

            Merge branch 'space-wizards:master' into shuttles

        commit bf8e88b
        Author: avery <avry@pm.me>
        Date:   Wed Aug 2 03:56:12 2023 -0700

            squash: debugging

        commit 7db8a08
        Author: avery <avry@pm.me>
        Date:   Wed Aug 2 03:55:30 2023 -0700

            added evac timer system/component/prototype

        commit cb89491
        Author: avery <avry@pm.me>
        Date:   Wed Aug 2 03:54:59 2023 -0700

            support for emergency shuttle events

        commit 4738aa0
        Author: avery <avry@pm.me>
        Date:   Wed Aug 2 03:53:28 2023 -0700

            added events for evac shuttle call/recall/dock

        commit b32ff66
        Merge: da371ae 6a2aac3
        Author: avery <avry@pm.me>
        Date:   Wed Aug 2 03:29:09 2023 -0700

            Merge branch 'master' of https://github.com/graevy/space-station-14 into shuttles

        commit da371ae
        Author: avery <avry@pm.me>
        Date:   Wed Aug 2 03:26:29 2023 -0700

            revert screentimer rounding displaying e.g. 1m60s

        commit 06f3d6e
        Merge: 7300fb8 926e539
        Author: avery <51971268+graevy@users.noreply.github.com>
        Date:   Tue Aug 1 23:00:20 2023 -0700

            Merge branch 'space-wizards:master' into master

        commit 7300fb8
        Author: avery <51971268+graevy@users.noreply.github.com>
        Date:   Sun Jul 30 17:11:17 2023 -0700

            Update ReflectComponent.cs

        commit b3213a6
        Merge: 38c8264 44b44fd
        Author: avery <51971268+graevy@users.noreply.github.com>
        Date:   Sun Jul 30 14:01:44 2023 -0700

            Merge branch 'space-wizards:master' into master

        commit 38c8264
        Merge: 5800e03 27c08e6
        Author: avery <51971268+graevy@users.noreply.github.com>
        Date:   Sun Jul 23 03:50:28 2023 -0700

            Merge branch 'space-wizards:master' into master

        commit 5800e03
        Author: avery <avry@pm.me>
        Date:   Sun Jul 23 03:14:33 2023 -0700

            support for reflectprob = 1

        commit 8e5c380
        Merge: 2bdafb3 a11fab3
        Author: avery <avry@pm.me>
        Date:   Sat Jul 22 04:27:26 2023 -0700

            Merge branch 'master' of https://github.com/graevy/space-station-14

        commit 2bdafb3
        Author: avery <avry@pm.me>
        Date:   Sat Jul 22 04:26:26 2023 -0700

            laptop sync

        commit 528b539
        Author: avery <avry@pm.me>
        Date:   Sat Jul 22 04:25:45 2023 -0700

            removing redundant layer concept

        commit 94ca8f1
        Author: avery <avry@pm.me>
        Date:   Sat Jul 22 04:23:45 2023 -0700

            ce syndie suit vest is cosmetic only

        commit a11fab3
        Author: avery <51971268+graevy@users.noreply.github.com>
        Date:   Sat Jul 22 04:18:46 2023 -0700

            Update Resources/Prototypes/Entities/Structures/Walls/walls.yml

            Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>

        commit af45aaf
        Author: avery <51971268+graevy@users.noreply.github.com>
        Date:   Sat Jul 22 04:18:20 2023 -0700

            Update Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml

            Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>

        commit ce59ab7
        Author: avery <51971268+graevy@users.noreply.github.com>
        Date:   Sat Jul 22 04:18:09 2023 -0700

            Update Resources/Prototypes/Entities/Structures/Walls/walls.yml

            Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>

        commit c39c8e2
        Author: avery <avry@pm.me>
        Date:   Sat Jul 22 03:25:25 2023 -0700

            desktop debugging

        commit fe63fbe
        Merge: 26e1f20 53e1a63
        Author: avery <51971268+graevy@users.noreply.github.com>
        Date:   Fri Jul 21 17:19:43 2023 -0700

            Merge branch 'space-wizards:master' into master

        commit 26e1f20
        Merge: 20e46e4 c6cb6ad
        Author: avery <avry@pm.me>
        Date:   Fri Jul 21 04:11:00 2023 -0700

            Merge branch 'master' of https://github.com/graevy/space-station-14

        commit 20e46e4
        Author: avery <avry@pm.me>
        Date:   Fri Jul 21 02:25:13 2023 -0700

            parent 9da2545
            author avery <avry@pm.me> 1689931513 -0700
            committer avery <avry@pm.me> 1689934524 -0700

            added reflection support for mobs/reflective vest/shuttle walls

        commit 9da2545
        Author: PJBot <pieterjan.briers+bot@gmail.com>
        Date:   Thu Jul 20 17:56:54 2023 -0400

            Automatic changelog update

            desktop debugging

            added reflection support for mobs/reflective vest/shuttle walls

    commit 222b40a
    Author: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com>
    Date:   Thu Aug 24 04:02:37 2023 +0200

        Kettle QoL (space-wizards#19443)

        * Robotics QoL

        * Add note pointing chemists to the drain in morgue

        * Add senior role spawns

        * Add senior roles to kettle map prototype

    commit 2c21f48
    Author: LankLTE <135308300+LankLTE@users.noreply.github.com>
    Date:   Wed Aug 23 19:00:19 2023 -0700

        update s (space-wizards#19453)

    commit 4e7f104
    Author: LankLTE <135308300+LankLTE@users.noreply.github.com>
    Date:   Wed Aug 23 18:58:51 2023 -0700

        boegs (space-wizards#19466)

    commit 0ed40bd
    Author: LankLTE <135308300+LankLTE@users.noreply.github.com>
    Date:   Wed Aug 23 18:58:38 2023 -0700

        roundstart borgs (space-wizards#19465)

    commit 1ca36a4
    Author: LankLTE <135308300+LankLTE@users.noreply.github.com>
    Date:   Wed Aug 23 18:57:21 2023 -0700

        cyborg n seniors (space-wizards#19464)

    commit 3589cb6
    Author: LankLTE <135308300+LankLTE@users.noreply.github.com>
    Date:   Wed Aug 23 18:56:56 2023 -0700

        borgs n warp points (space-wizards#19463)

    commit 009927e
    Author: PJBot <pieterjan.briers+bot@gmail.com>
    Date:   Wed Aug 23 21:21:57 2023 -0400

        Automatic changelog update

    commit e5e663e
    Author: liltenhead <104418166+liltenhead@users.noreply.github.com>
    Date:   Wed Aug 23 18:20:53 2023 -0700

        Nerf Giant Spiders (space-wizards#19392)

    commit 70f2ac9
    Author: PJBot <pieterjan.briers+bot@gmail.com>
    Date:   Wed Aug 23 20:13:08 2023 -0400

        Automatic changelog update

    commit 9341cac
    Author: lapatison <100279397+lapatison@users.noreply.github.com>
    Date:   Thu Aug 24 03:12:05 2023 +0300

        Split gardening cyborg module, literacy cyborg module tweak (space-wizards#19449)

        * book bag to literacy module, bucket n plant bag to gardening

        * split gardening into gardening and harvesting

        * book bag whitelist document, also dumpable

        * fix

        * new icon

    commit e1a744c
    Author: PJBot <pieterjan.briers+bot@gmail.com>
    Date:   Wed Aug 23 19:56:03 2023 -0400

        Automatic changelog update

    commit b235c06
    Author: LankLTE <135308300+LankLTE@users.noreply.github.com>
    Date:   Wed Aug 23 16:54:59 2023 -0700

        Borg emag tweaks (space-wizards#19373)

        * Laws update

        * stun change

        * stuntime in component

        * history might be fucked

    commit baf7af0
    Author: Moony <moony@hellomouse.net>
    Date:   Wed Aug 23 16:50:49 2023 -0500

        Update issue templates (space-wizards#19458)

    commit 8dedce8
    Author: PJBot <pieterjan.briers+bot@gmail.com>
    Date:   Wed Aug 23 17:50:29 2023 -0400

        Automatic changelog update

    commit 149e58d
    Author: potato1234_x <79580518+potato1234x@users.noreply.github.com>
    Date:   Thu Aug 24 07:49:25 2023 +1000

        revamp getmore inventory (space-wizards#19372)

    commit eedcaea
    Author: PJBot <pieterjan.briers+bot@gmail.com>
    Date:   Wed Aug 23 17:43:37 2023 -0400

        Automatic changelog update

    commit 566505c
    Author: potato1234_x <79580518+potato1234x@users.noreply.github.com>
    Date:   Thu Aug 24 07:42:33 2023 +1000

        short hair sprite change (space-wizards#19425)

    commit dccb52f
    Author: crazybrain23 <44417085+crazybrain23@users.noreply.github.com>
    Date:   Wed Aug 23 22:41:54 2023 +0100

        Add new body examin state (space-wizards#19435)

    commit fd0e14d
    Author: PJBot <pieterjan.briers+bot@gmail.com>
    Date:   Wed Aug 23 17:38:46 2023 -0400

        Automatic changelog update

    commit 4a520ae
    Author: Nairod <110078045+Nairodian@users.noreply.github.com>
    Date:   Wed Aug 23 16:37:42 2023 -0500

        Arachnid Markings Expansion (space-wizards#19439)

    commit 1d44e04
    Author: PJBot <pieterjan.briers+bot@gmail.com>
    Date:   Wed Aug 23 17:35:43 2023 -0400

        Automatic changelog update

    commit 4935a95
    Author: deltanedas <39013340+deltanedas@users.noreply.github.com>
    Date:   Wed Aug 23 22:34:39 2023 +0100

        borg construction module (space-wizards#19260)

        * cant insert materials into machine if unremoveable

        * lingering materials

        * add construction cyborg module

        * fix empty stack color

        * lathe recipe

        * a

        ---------

        Co-authored-by: deltanedas <@deltanedas:kde.org>

    commit b61b0e1
    Author: Moony <moony@hellomouse.net>
    Date:   Wed Aug 23 16:23:06 2023 -0500

        Update CODEOWNERS (space-wizards#19457)

    commit 518db6f
    Author: Moony <moony@hellomouse.net>
    Date:   Wed Aug 23 16:09:56 2023 -0500

        Update RobustToolbox. (space-wizards#19456)

        Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>

    commit 3d3c9e3
    Author: Moony <moony@hellomouse.net>
    Date:   Wed Aug 23 16:03:41 2023 -0500

        Toolshed part 2 (space-wizards#18997)

        * fixe

        * Save work.

        * Rune-aware parser.

        * oogh

        * pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests

        * Publicizes a lot of common generic commands, so custom toolshed envs can include them.

        * i think i might implode

        * Tests.

        * a

        * b

        * awa

        ---------

        Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>

    commit 852b66d
    Author: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
    Date:   Wed Aug 23 19:17:10 2023 +1000

        Update submodule to 150.0.1 (space-wizards#19444)

    commit 1d42a6e
    Author: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
    Date:   Wed Aug 23 18:57:39 2023 +1000

        Update submodule to 150.0.0 (space-wizards#19442)

    commit 7356266
    Author: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
    Date:   Wed Aug 23 18:55:58 2023 +1000

        Remove FixtureId (space-wizards#19280)

    commit 2cc1f8f
    Author: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
    Date:   Wed Aug 23 00:32:11 2023 -0700

        Update RobustToolbox to dc23dfa (space-wizards#19440)

    commit ecd145b
    Author: Doru991 <75124791+Doru991@users.noreply.github.com>
    Date:   Wed Aug 23 07:51:59 2023 +0300

        Fix zombie eye appearance (space-wizards#19427)
graevy added a commit to graevy/space-station-14 that referenced this pull request Aug 24, 2023
commit 76f6136
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Wed Aug 23 19:34:25 2023 -0700

    pruning bad changes

commit 57206c9
Merge: e5dd552 222b40a
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Wed Aug 23 19:17:19 2023 -0700

    Merge branch 'shuttletimers-prod' of https://github.com/graevy/space-station-14 into shuttletimers-prod

commit e5dd552
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Wed Aug 23 19:11:49 2023 -0700

    Squashed commit of the following:

    commit ed2b4fc
    Author: avery <51971268+graevy@users.noreply.github.com>
    Date:   Wed Aug 23 19:09:04 2023 -0700

        remove debugging shuttletimers

    commit 88b9c6c
    Merge: 288ce0d 70f2ac9
    Author: avery <51971268+graevy@users.noreply.github.com>
    Date:   Wed Aug 23 17:22:27 2023 -0700

        Merge branch 'space-wizards:master' into shuttlescreens

    commit 70f2ac9
    Author: PJBot <pieterjan.briers+bot@gmail.com>
    Date:   Wed Aug 23 20:13:08 2023 -0400

        Automatic changelog update

    commit 9341cac
    Author: lapatison <100279397+lapatison@users.noreply.github.com>
    Date:   Thu Aug 24 03:12:05 2023 +0300

        Split gardening cyborg module, literacy cyborg module tweak (space-wizards#19449)

        * book bag to literacy module, bucket n plant bag to gardening

        * split gardening into gardening and harvesting

        * book bag whitelist document, also dumpable

        * fix

        * new icon

    commit 288ce0d
    Author: avery <avry@pm.me>
    Date:   Wed Aug 23 16:59:15 2023 -0700

        .

    commit 5968f14
    Author: avery <avry@pm.me>
    Date:   Wed Aug 23 16:56:49 2023 -0700

        round end countdown

    commit e1a744c
    Author: PJBot <pieterjan.briers+bot@gmail.com>
    Date:   Wed Aug 23 19:56:03 2023 -0400

        Automatic changelog update

    commit b235c06
    Author: LankLTE <135308300+LankLTE@users.noreply.github.com>
    Date:   Wed Aug 23 16:54:59 2023 -0700

        Borg emag tweaks (space-wizards#19373)

        * Laws update

        * stun change

        * stuntime in component

        * history might be fucked

    commit f8b55c8
    Author: avery <avry@pm.me>
    Date:   Wed Aug 23 16:26:46 2023 -0700

        docs

    commit 9dea599
    Author: avery <avry@pm.me>
    Date:   Wed Aug 23 16:23:46 2023 -0700

        remote -> shuttle pairing

    commit baf7af0
    Author: Moony <moony@hellomouse.net>
    Date:   Wed Aug 23 16:50:49 2023 -0500

        Update issue templates (space-wizards#19458)

    commit 8dedce8
    Author: PJBot <pieterjan.briers+bot@gmail.com>
    Date:   Wed Aug 23 17:50:29 2023 -0400

        Automatic changelog update

    commit 149e58d
    Author: potato1234_x <79580518+potato1234x@users.noreply.github.com>
    Date:   Thu Aug 24 07:49:25 2023 +1000

        revamp getmore inventory (space-wizards#19372)

    commit eedcaea
    Author: PJBot <pieterjan.briers+bot@gmail.com>
    Date:   Wed Aug 23 17:43:37 2023 -0400

        Automatic changelog update

    commit 566505c
    Author: potato1234_x <79580518+potato1234x@users.noreply.github.com>
    Date:   Thu Aug 24 07:42:33 2023 +1000

        short hair sprite change (space-wizards#19425)

    commit dccb52f
    Author: crazybrain23 <44417085+crazybrain23@users.noreply.github.com>
    Date:   Wed Aug 23 22:41:54 2023 +0100

        Add new body examin state (space-wizards#19435)

    commit fd0e14d
    Author: PJBot <pieterjan.briers+bot@gmail.com>
    Date:   Wed Aug 23 17:38:46 2023 -0400

        Automatic changelog update

    commit 4a520ae
    Author: Nairod <110078045+Nairodian@users.noreply.github.com>
    Date:   Wed Aug 23 16:37:42 2023 -0500

        Arachnid Markings Expansion (space-wizards#19439)

    commit 1d44e04
    Author: PJBot <pieterjan.briers+bot@gmail.com>
    Date:   Wed Aug 23 17:35:43 2023 -0400

        Automatic changelog update

    commit 4935a95
    Author: deltanedas <39013340+deltanedas@users.noreply.github.com>
    Date:   Wed Aug 23 22:34:39 2023 +0100

        borg construction module (space-wizards#19260)

        * cant insert materials into machine if unremoveable

        * lingering materials

        * add construction cyborg module

        * fix empty stack color

        * lathe recipe

        * a

        ---------

        Co-authored-by: deltanedas <@deltanedas:kde.org>

    commit b61b0e1
    Author: Moony <moony@hellomouse.net>
    Date:   Wed Aug 23 16:23:06 2023 -0500

        Update CODEOWNERS (space-wizards#19457)

    commit 518db6f
    Author: Moony <moony@hellomouse.net>
    Date:   Wed Aug 23 16:09:56 2023 -0500

        Update RobustToolbox. (space-wizards#19456)

        Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>

    commit 3d3c9e3
    Author: Moony <moony@hellomouse.net>
    Date:   Wed Aug 23 16:03:41 2023 -0500

        Toolshed part 2 (space-wizards#18997)

        * fixe

        * Save work.

        * Rune-aware parser.

        * oogh

        * pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests

        * Publicizes a lot of common generic commands, so custom toolshed envs can include them.

        * i think i might implode

        * Tests.

        * a

        * b

        * awa

        ---------

        Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>

    commit 33ef861
    Author: avery <avry@pm.me>
    Date:   Wed Aug 23 13:55:47 2023 -0700

        to desktop

    commit d5388b8
    Author: avery <avry@pm.me>
    Date:   Wed Aug 23 05:03:09 2023 -0700

        better names, moved an event handler

    commit b774282
    Author: avery <avry@pm.me>
    Date:   Wed Aug 23 04:40:17 2023 -0700

        cargo, minor refactor

    commit f013b84
    Author: avery <avry@pm.me>
    Date:   Wed Aug 23 03:50:18 2023 -0700

        ope

    commit 0cdb694
    Author: avery <avry@pm.me>
    Date:   Wed Aug 23 03:49:47 2023 -0700

        data definitions must now be partial

    commit 985df9f
    Author: avery <avry@pm.me>
    Date:   Wed Aug 23 03:12:51 2023 -0700

        update rt

    commit 53c4e3e
    Author: avery <avry@pm.me>
    Date:   Wed Aug 23 03:10:43 2023 -0700

        upstream bug...?

    commit 2bc9850
    Author: avery <avry@pm.me>
    Date:   Wed Aug 23 03:10:33 2023 -0700

        polish

    commit e3cb336
    Author: avery <avry@pm.me>
    Date:   Wed Aug 23 02:31:54 2023 -0700

        update after merge

    commit 6ce709f
    Merge: de572c9 852b66d
    Author: avery <avry@pm.me>
    Date:   Wed Aug 23 02:31:33 2023 -0700

        Merge branch 'shuttlescreens' of https://github.com/graevy/space-station-14 into shuttlescreens

    commit de572c9
    Author: avery <avry@pm.me>
    Date:   Wed Aug 23 02:20:05 2023 -0700

        feature parity :3

    commit 852b66d
    Author: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
    Date:   Wed Aug 23 19:17:10 2023 +1000

        Update submodule to 150.0.1 (space-wizards#19444)

    commit 1d42a6e
    Author: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
    Date:   Wed Aug 23 18:57:39 2023 +1000

        Update submodule to 150.0.0 (space-wizards#19442)

    commit 7356266
    Author: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
    Date:   Wed Aug 23 18:55:58 2023 +1000

        Remove FixtureId (space-wizards#19280)

    commit 2cc1f8f
    Author: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
    Date:   Wed Aug 23 00:32:11 2023 -0700

        Update RobustToolbox to dc23dfa (space-wizards#19440)

    commit ecd145b
    Author: Doru991 <75124791+Doru991@users.noreply.github.com>
    Date:   Wed Aug 23 07:51:59 2023 +0300

        Fix zombie eye appearance (space-wizards#19427)

    commit db9cedd
    Author: avery <avry@pm.me>
    Date:   Tue Aug 22 02:58:21 2023 -0700

        to desktop

    commit 08bb503
    Author: avery <avry@pm.me>
    Date:   Thu Aug 17 17:12:53 2023 -0700

        to laptop

    commit 19c4cb7
    Author: avery <avry@pm.me>
    Date:   Tue Aug 15 01:13:02 2023 -0700

        cargo shuttle timer

    commit 334e12f
    Author: avery <avry@pm.me>
    Date:   Tue Aug 15 01:12:54 2023 -0700

        polishes

    commit 3425e22
    Author: avery <avry@pm.me>
    Date:   Mon Aug 14 23:37:48 2023 -0700

        shuttle timers work! predicate refactor next

    commit 5b60ce0
    Merge: 5490619 3b7a23b
    Author: avery <51971268+graevy@users.noreply.github.com>
    Date:   Mon Aug 14 03:09:20 2023 -0700

        Merge branch 'space-wizards:master' into shuttletimers

    commit 5490619
    Author: avery <avry@pm.me>
    Date:   Mon Aug 14 03:08:11 2023 -0700

        to desktop

    commit 884347d
    Author: avery <avry@pm.me>
    Date:   Mon Aug 14 00:32:10 2023 -0700

        to laptop

    commit f2cbde3
    Author: avery <avry@pm.me>
    Date:   Sun Aug 13 17:28:20 2023 -0700

        remote timer filtering refactor

    commit 689c6c8
    Author: avery <avry@pm.me>
    Date:   Sat Aug 12 23:12:23 2023 -0700

        to desktop

    commit 09e582c
    Author: avery <avry@pm.me>
    Date:   Sat Aug 12 16:00:32 2023 -0700

        to laptop

    commit 4cc6c6f
    Author: avery <avry@pm.me>
    Date:   Sat Aug 12 05:05:49 2023 -0700

        to laptop

    commit cbb8c0f
    Author: avery <avry@pm.me>
    Date:   Sat Aug 12 02:41:34 2023 -0700

        to desktop

    commit 7b675ce
    Author: avery <avry@pm.me>
    Date:   Fri Aug 11 20:36:19 2023 -0700

        to laptop

    commit 3d637f3
    Author: avery <avry@pm.me>
    Date:   Fri Aug 11 20:11:27 2023 -0700

        to desktop

    commit d4f244d
    Author: avery <avry@pm.me>
    Date:   Fri Aug 11 04:01:56 2023 -0700

        to laptop

    commit 242ef07
    Author: avery <avry@pm.me>
    Date:   Thu Aug 10 21:41:35 2023 -0700

        to desktop

    commit 0812c07
    Author: avery <avry@pm.me>
    Date:   Thu Aug 10 16:51:46 2023 -0700

        to laptop

    commit 49ff245
    Author: avery <avry@pm.me>
    Date:   Thu Aug 10 01:09:44 2023 -0700

        to desktop

    commit 09fac42
    Merge: 922aa09 804dcf4
    Author: avery <avry@pm.me>
    Date:   Wed Aug 9 16:18:47 2023 -0700

        Merge branch 'shuttletimers' of https://github.com/graevy/space-station-14 into shuttletimers

    commit 804dcf4
    Merge: 7542338 c5af5c1
    Author: avery <51971268+graevy@users.noreply.github.com>
    Date:   Wed Aug 9 15:55:41 2023 -0700

        Merge branch 'space-wizards:master' into shuttletimers

    commit 922aa09
    Author: avery <avry@pm.me>
    Date:   Wed Aug 9 14:36:45 2023 -0700

        found an extensible solution. moving to laptop

    commit 7542338
    Author: avery <avry@pm.me>
    Date:   Wed Aug 9 14:05:08 2023 -0700

        recall, docking, and transit timing

    commit 0a03240
    Merge: 4d25533 7381a03
    Author: avery <51971268+graevy@users.noreply.github.com>
    Date:   Tue Aug 8 20:32:25 2023 -0700

        Merge branch 'space-wizards:master' into shuttletimers

    commit 4d25533
    Author: avery <avry@pm.me>
    Date:   Tue Aug 8 04:25:52 2023 -0700

        gotta fix this token bug. everything else works

    commit d7927f5
    Author: avery <avry@pm.me>
    Date:   Mon Aug 7 23:47:53 2023 -0700

        to laptop

    commit 6c81ee0
    Author: avery <avry@pm.me>
    Date:   Sun Aug 6 23:42:24 2023 -0700

        to desktop

    commit 857d3f6
    Merge: 0aa543a 6ce3285
    Author: avery <avry@pm.me>
    Date:   Sun Aug 6 20:53:40 2023 -0700

        Merge branch 'shuttletimers' of https://github.com/graevy/space-station-14 into shuttletimers

    commit 0aa543a
    Author: avery <avry@pm.me>
    Date:   Sun Aug 6 20:53:37 2023 -0700

        to laptop

    commit 6ce3285
    Merge: 4ba8733 56fa974
    Author: avery <51971268+graevy@users.noreply.github.com>
    Date:   Sun Aug 6 18:36:41 2023 -0700

        Merge branch 'space-wizards:master' into shuttletimers

    commit 4ba8733
    Author: avery <avry@pm.me>
    Date:   Sun Aug 6 18:36:27 2023 -0700

        to laptop

    commit 614f1a1
    Merge: 1430e4a 9af3c88
    Author: avery <51971268+graevy@users.noreply.github.com>
    Date:   Sun Aug 6 14:17:17 2023 -0700

        Merge branch 'space-wizards:master' into shuttletimers

    commit 1430e4a
    Author: avery <avry@pm.me>
    Date:   Sun Aug 6 13:57:02 2023 -0700

        to desktop

    commit e469e04
    Merge: 48dda40 db5dee6
    Author: avery <51971268+graevy@users.noreply.github.com>
    Date:   Sun Aug 6 01:21:06 2023 -0700

        Merge branch 'space-wizards:master' into shuttletimers

    commit 48dda40
    Author: avery <avry@pm.me>
    Date:   Fri Aug 4 17:15:19 2023 -0700

        parent-child shuttle timer branch initial commit

    commit 83897b4
    Merge: b7a20fa 2a87079
    Author: avery <51971268+graevy@users.noreply.github.com>
    Date:   Fri Aug 4 14:39:42 2023 -0700

        Merge branch 'space-wizards:master' into shuttles

    commit b7a20fa
    Merge: a66a216 b74bd10
    Author: avery <51971268+graevy@users.noreply.github.com>
    Date:   Fri Aug 4 00:06:13 2023 -0700

        Merge branch 'space-wizards:master' into shuttles

    commit a66a216
    Merge: bf8e88b 26dd6f2
    Author: avery <51971268+graevy@users.noreply.github.com>
    Date:   Wed Aug 2 03:59:47 2023 -0700

        Merge branch 'space-wizards:master' into shuttles

    commit bf8e88b
    Author: avery <avry@pm.me>
    Date:   Wed Aug 2 03:56:12 2023 -0700

        squash: debugging

    commit 7db8a08
    Author: avery <avry@pm.me>
    Date:   Wed Aug 2 03:55:30 2023 -0700

        added evac timer system/component/prototype

    commit cb89491
    Author: avery <avry@pm.me>
    Date:   Wed Aug 2 03:54:59 2023 -0700

        support for emergency shuttle events

    commit 4738aa0
    Author: avery <avry@pm.me>
    Date:   Wed Aug 2 03:53:28 2023 -0700

        added events for evac shuttle call/recall/dock

    commit b32ff66
    Merge: da371ae 6a2aac3
    Author: avery <avry@pm.me>
    Date:   Wed Aug 2 03:29:09 2023 -0700

        Merge branch 'master' of https://github.com/graevy/space-station-14 into shuttles

    commit da371ae
    Author: avery <avry@pm.me>
    Date:   Wed Aug 2 03:26:29 2023 -0700

        revert screentimer rounding displaying e.g. 1m60s

    commit 06f3d6e
    Merge: 7300fb8 926e539
    Author: avery <51971268+graevy@users.noreply.github.com>
    Date:   Tue Aug 1 23:00:20 2023 -0700

        Merge branch 'space-wizards:master' into master

    commit 7300fb8
    Author: avery <51971268+graevy@users.noreply.github.com>
    Date:   Sun Jul 30 17:11:17 2023 -0700

        Update ReflectComponent.cs

    commit b3213a6
    Merge: 38c8264 44b44fd
    Author: avery <51971268+graevy@users.noreply.github.com>
    Date:   Sun Jul 30 14:01:44 2023 -0700

        Merge branch 'space-wizards:master' into master

    commit 38c8264
    Merge: 5800e03 27c08e6
    Author: avery <51971268+graevy@users.noreply.github.com>
    Date:   Sun Jul 23 03:50:28 2023 -0700

        Merge branch 'space-wizards:master' into master

    commit 5800e03
    Author: avery <avry@pm.me>
    Date:   Sun Jul 23 03:14:33 2023 -0700

        support for reflectprob = 1

    commit 8e5c380
    Merge: 2bdafb3 a11fab3
    Author: avery <avry@pm.me>
    Date:   Sat Jul 22 04:27:26 2023 -0700

        Merge branch 'master' of https://github.com/graevy/space-station-14

    commit 2bdafb3
    Author: avery <avry@pm.me>
    Date:   Sat Jul 22 04:26:26 2023 -0700

        laptop sync

    commit 528b539
    Author: avery <avry@pm.me>
    Date:   Sat Jul 22 04:25:45 2023 -0700

        removing redundant layer concept

    commit 94ca8f1
    Author: avery <avry@pm.me>
    Date:   Sat Jul 22 04:23:45 2023 -0700

        ce syndie suit vest is cosmetic only

    commit a11fab3
    Author: avery <51971268+graevy@users.noreply.github.com>
    Date:   Sat Jul 22 04:18:46 2023 -0700

        Update Resources/Prototypes/Entities/Structures/Walls/walls.yml

        Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>

    commit af45aaf
    Author: avery <51971268+graevy@users.noreply.github.com>
    Date:   Sat Jul 22 04:18:20 2023 -0700

        Update Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml

        Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>

    commit ce59ab7
    Author: avery <51971268+graevy@users.noreply.github.com>
    Date:   Sat Jul 22 04:18:09 2023 -0700

        Update Resources/Prototypes/Entities/Structures/Walls/walls.yml

        Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>

    commit c39c8e2
    Author: avery <avry@pm.me>
    Date:   Sat Jul 22 03:25:25 2023 -0700

        desktop debugging

    commit fe63fbe
    Merge: 26e1f20 53e1a63
    Author: avery <51971268+graevy@users.noreply.github.com>
    Date:   Fri Jul 21 17:19:43 2023 -0700

        Merge branch 'space-wizards:master' into master

    commit 26e1f20
    Merge: 20e46e4 c6cb6ad
    Author: avery <avry@pm.me>
    Date:   Fri Jul 21 04:11:00 2023 -0700

        Merge branch 'master' of https://github.com/graevy/space-station-14

    commit 20e46e4
    Author: avery <avry@pm.me>
    Date:   Fri Jul 21 02:25:13 2023 -0700

        parent 9da2545
        author avery <avry@pm.me> 1689931513 -0700
        committer avery <avry@pm.me> 1689934524 -0700

        added reflection support for mobs/reflective vest/shuttle walls

    commit 9da2545
    Author: PJBot <pieterjan.briers+bot@gmail.com>
    Date:   Thu Jul 20 17:56:54 2023 -0400

        Automatic changelog update

        desktop debugging

        added reflection support for mobs/reflective vest/shuttle walls

commit 222b40a
Author: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com>
Date:   Thu Aug 24 04:02:37 2023 +0200

    Kettle QoL (space-wizards#19443)

    * Robotics QoL

    * Add note pointing chemists to the drain in morgue

    * Add senior role spawns

    * Add senior roles to kettle map prototype

commit 2c21f48
Author: LankLTE <135308300+LankLTE@users.noreply.github.com>
Date:   Wed Aug 23 19:00:19 2023 -0700

    update s (space-wizards#19453)

commit 4e7f104
Author: LankLTE <135308300+LankLTE@users.noreply.github.com>
Date:   Wed Aug 23 18:58:51 2023 -0700

    boegs (space-wizards#19466)

commit 0ed40bd
Author: LankLTE <135308300+LankLTE@users.noreply.github.com>
Date:   Wed Aug 23 18:58:38 2023 -0700

    roundstart borgs (space-wizards#19465)

commit 1ca36a4
Author: LankLTE <135308300+LankLTE@users.noreply.github.com>
Date:   Wed Aug 23 18:57:21 2023 -0700

    cyborg n seniors (space-wizards#19464)

commit 3589cb6
Author: LankLTE <135308300+LankLTE@users.noreply.github.com>
Date:   Wed Aug 23 18:56:56 2023 -0700

    borgs n warp points (space-wizards#19463)

commit 009927e
Author: PJBot <pieterjan.briers+bot@gmail.com>
Date:   Wed Aug 23 21:21:57 2023 -0400

    Automatic changelog update

commit e5e663e
Author: liltenhead <104418166+liltenhead@users.noreply.github.com>
Date:   Wed Aug 23 18:20:53 2023 -0700

    Nerf Giant Spiders (space-wizards#19392)

commit 70f2ac9
Author: PJBot <pieterjan.briers+bot@gmail.com>
Date:   Wed Aug 23 20:13:08 2023 -0400

    Automatic changelog update

commit 9341cac
Author: lapatison <100279397+lapatison@users.noreply.github.com>
Date:   Thu Aug 24 03:12:05 2023 +0300

    Split gardening cyborg module, literacy cyborg module tweak (space-wizards#19449)

    * book bag to literacy module, bucket n plant bag to gardening

    * split gardening into gardening and harvesting

    * book bag whitelist document, also dumpable

    * fix

    * new icon

commit e1a744c
Author: PJBot <pieterjan.briers+bot@gmail.com>
Date:   Wed Aug 23 19:56:03 2023 -0400

    Automatic changelog update

commit b235c06
Author: LankLTE <135308300+LankLTE@users.noreply.github.com>
Date:   Wed Aug 23 16:54:59 2023 -0700

    Borg emag tweaks (space-wizards#19373)

    * Laws update

    * stun change

    * stuntime in component

    * history might be fucked

commit baf7af0
Author: Moony <moony@hellomouse.net>
Date:   Wed Aug 23 16:50:49 2023 -0500

    Update issue templates (space-wizards#19458)

commit 8dedce8
Author: PJBot <pieterjan.briers+bot@gmail.com>
Date:   Wed Aug 23 17:50:29 2023 -0400

    Automatic changelog update

commit 149e58d
Author: potato1234_x <79580518+potato1234x@users.noreply.github.com>
Date:   Thu Aug 24 07:49:25 2023 +1000

    revamp getmore inventory (space-wizards#19372)

commit eedcaea
Author: PJBot <pieterjan.briers+bot@gmail.com>
Date:   Wed Aug 23 17:43:37 2023 -0400

    Automatic changelog update

commit 566505c
Author: potato1234_x <79580518+potato1234x@users.noreply.github.com>
Date:   Thu Aug 24 07:42:33 2023 +1000

    short hair sprite change (space-wizards#19425)

commit dccb52f
Author: crazybrain23 <44417085+crazybrain23@users.noreply.github.com>
Date:   Wed Aug 23 22:41:54 2023 +0100

    Add new body examin state (space-wizards#19435)

commit fd0e14d
Author: PJBot <pieterjan.briers+bot@gmail.com>
Date:   Wed Aug 23 17:38:46 2023 -0400

    Automatic changelog update

commit 4a520ae
Author: Nairod <110078045+Nairodian@users.noreply.github.com>
Date:   Wed Aug 23 16:37:42 2023 -0500

    Arachnid Markings Expansion (space-wizards#19439)

commit 1d44e04
Author: PJBot <pieterjan.briers+bot@gmail.com>
Date:   Wed Aug 23 17:35:43 2023 -0400

    Automatic changelog update

commit 4935a95
Author: deltanedas <39013340+deltanedas@users.noreply.github.com>
Date:   Wed Aug 23 22:34:39 2023 +0100

    borg construction module (space-wizards#19260)

    * cant insert materials into machine if unremoveable

    * lingering materials

    * add construction cyborg module

    * fix empty stack color

    * lathe recipe

    * a

    ---------

    Co-authored-by: deltanedas <@deltanedas:kde.org>

commit b61b0e1
Author: Moony <moony@hellomouse.net>
Date:   Wed Aug 23 16:23:06 2023 -0500

    Update CODEOWNERS (space-wizards#19457)

commit 518db6f
Author: Moony <moony@hellomouse.net>
Date:   Wed Aug 23 16:09:56 2023 -0500

    Update RobustToolbox. (space-wizards#19456)

    Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>

commit 3d3c9e3
Author: Moony <moony@hellomouse.net>
Date:   Wed Aug 23 16:03:41 2023 -0500

    Toolshed part 2 (space-wizards#18997)

    * fixe

    * Save work.

    * Rune-aware parser.

    * oogh

    * pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests

    * Publicizes a lot of common generic commands, so custom toolshed envs can include them.

    * i think i might implode

    * Tests.

    * a

    * b

    * awa

    ---------

    Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>

commit 852b66d
Author: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date:   Wed Aug 23 19:17:10 2023 +1000

    Update submodule to 150.0.1 (space-wizards#19444)

commit 1d42a6e
Author: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date:   Wed Aug 23 18:57:39 2023 +1000

    Update submodule to 150.0.0 (space-wizards#19442)

commit 7356266
Author: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date:   Wed Aug 23 18:55:58 2023 +1000

    Remove FixtureId (space-wizards#19280)

commit 2cc1f8f
Author: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Date:   Wed Aug 23 00:32:11 2023 -0700

    Update RobustToolbox to dc23dfa (space-wizards#19440)

commit ecd145b
Author: Doru991 <75124791+Doru991@users.noreply.github.com>
Date:   Wed Aug 23 07:51:59 2023 +0300

    Fix zombie eye appearance (space-wizards#19427)
graevy added a commit to graevy/space-station-14 that referenced this pull request Aug 24, 2023
commit f9fa492
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Wed Aug 23 20:13:26 2023 -0700

    undo cargo edits

commit 6c07bc4
Merge: e414d49 e2e1b75
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Wed Aug 23 20:10:34 2023 -0700

    Merge branch 'shuttletimers' of https://github.com/graevy/space-station-14 into shuttletimers

commit e2e1b75
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Wed Aug 23 20:00:45 2023 -0700

    final touches (famous last words)

commit bcf030e
Merge: ed2b4fc 5bb6f29
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Wed Aug 23 19:54:16 2023 -0700

    Merge branch 'shuttletimers' of https://github.com/graevy/space-station-14 into shuttletimers-backup

commit e414d49
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Wed Aug 23 19:39:01 2023 -0700

    more bad changes

commit 04650d4
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Wed Aug 23 19:35:55 2023 -0700

    Squashed commit of the following:

    commit 76f6136
    Author: avery <51971268+graevy@users.noreply.github.com>
    Date:   Wed Aug 23 19:34:25 2023 -0700

        pruning bad changes

    commit 57206c9
    Merge: e5dd552 222b40a
    Author: avery <51971268+graevy@users.noreply.github.com>
    Date:   Wed Aug 23 19:17:19 2023 -0700

        Merge branch 'shuttletimers-prod' of https://github.com/graevy/space-station-14 into shuttletimers-prod

    commit e5dd552
    Author: avery <51971268+graevy@users.noreply.github.com>
    Date:   Wed Aug 23 19:11:49 2023 -0700

        Squashed commit of the following:

        commit ed2b4fc
        Author: avery <51971268+graevy@users.noreply.github.com>
        Date:   Wed Aug 23 19:09:04 2023 -0700

            remove debugging shuttletimers

        commit 88b9c6c
        Merge: 288ce0d 70f2ac9
        Author: avery <51971268+graevy@users.noreply.github.com>
        Date:   Wed Aug 23 17:22:27 2023 -0700

            Merge branch 'space-wizards:master' into shuttlescreens

        commit 70f2ac9
        Author: PJBot <pieterjan.briers+bot@gmail.com>
        Date:   Wed Aug 23 20:13:08 2023 -0400

            Automatic changelog update

        commit 9341cac
        Author: lapatison <100279397+lapatison@users.noreply.github.com>
        Date:   Thu Aug 24 03:12:05 2023 +0300

            Split gardening cyborg module, literacy cyborg module tweak (space-wizards#19449)

            * book bag to literacy module, bucket n plant bag to gardening

            * split gardening into gardening and harvesting

            * book bag whitelist document, also dumpable

            * fix

            * new icon

        commit 288ce0d
        Author: avery <avry@pm.me>
        Date:   Wed Aug 23 16:59:15 2023 -0700

            .

        commit 5968f14
        Author: avery <avry@pm.me>
        Date:   Wed Aug 23 16:56:49 2023 -0700

            round end countdown

        commit e1a744c
        Author: PJBot <pieterjan.briers+bot@gmail.com>
        Date:   Wed Aug 23 19:56:03 2023 -0400

            Automatic changelog update

        commit b235c06
        Author: LankLTE <135308300+LankLTE@users.noreply.github.com>
        Date:   Wed Aug 23 16:54:59 2023 -0700

            Borg emag tweaks (space-wizards#19373)

            * Laws update

            * stun change

            * stuntime in component

            * history might be fucked

        commit f8b55c8
        Author: avery <avry@pm.me>
        Date:   Wed Aug 23 16:26:46 2023 -0700

            docs

        commit 9dea599
        Author: avery <avry@pm.me>
        Date:   Wed Aug 23 16:23:46 2023 -0700

            remote -> shuttle pairing

        commit baf7af0
        Author: Moony <moony@hellomouse.net>
        Date:   Wed Aug 23 16:50:49 2023 -0500

            Update issue templates (space-wizards#19458)

        commit 8dedce8
        Author: PJBot <pieterjan.briers+bot@gmail.com>
        Date:   Wed Aug 23 17:50:29 2023 -0400

            Automatic changelog update

        commit 149e58d
        Author: potato1234_x <79580518+potato1234x@users.noreply.github.com>
        Date:   Thu Aug 24 07:49:25 2023 +1000

            revamp getmore inventory (space-wizards#19372)

        commit eedcaea
        Author: PJBot <pieterjan.briers+bot@gmail.com>
        Date:   Wed Aug 23 17:43:37 2023 -0400

            Automatic changelog update

        commit 566505c
        Author: potato1234_x <79580518+potato1234x@users.noreply.github.com>
        Date:   Thu Aug 24 07:42:33 2023 +1000

            short hair sprite change (space-wizards#19425)

        commit dccb52f
        Author: crazybrain23 <44417085+crazybrain23@users.noreply.github.com>
        Date:   Wed Aug 23 22:41:54 2023 +0100

            Add new body examin state (space-wizards#19435)

        commit fd0e14d
        Author: PJBot <pieterjan.briers+bot@gmail.com>
        Date:   Wed Aug 23 17:38:46 2023 -0400

            Automatic changelog update

        commit 4a520ae
        Author: Nairod <110078045+Nairodian@users.noreply.github.com>
        Date:   Wed Aug 23 16:37:42 2023 -0500

            Arachnid Markings Expansion (space-wizards#19439)

        commit 1d44e04
        Author: PJBot <pieterjan.briers+bot@gmail.com>
        Date:   Wed Aug 23 17:35:43 2023 -0400

            Automatic changelog update

        commit 4935a95
        Author: deltanedas <39013340+deltanedas@users.noreply.github.com>
        Date:   Wed Aug 23 22:34:39 2023 +0100

            borg construction module (space-wizards#19260)

            * cant insert materials into machine if unremoveable

            * lingering materials

            * add construction cyborg module

            * fix empty stack color

            * lathe recipe

            * a

            ---------

            Co-authored-by: deltanedas <@deltanedas:kde.org>

        commit b61b0e1
        Author: Moony <moony@hellomouse.net>
        Date:   Wed Aug 23 16:23:06 2023 -0500

            Update CODEOWNERS (space-wizards#19457)

        commit 518db6f
        Author: Moony <moony@hellomouse.net>
        Date:   Wed Aug 23 16:09:56 2023 -0500

            Update RobustToolbox. (space-wizards#19456)

            Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>

        commit 3d3c9e3
        Author: Moony <moony@hellomouse.net>
        Date:   Wed Aug 23 16:03:41 2023 -0500

            Toolshed part 2 (space-wizards#18997)

            * fixe

            * Save work.

            * Rune-aware parser.

            * oogh

            * pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests

            * Publicizes a lot of common generic commands, so custom toolshed envs can include them.

            * i think i might implode

            * Tests.

            * a

            * b

            * awa

            ---------

            Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>

        commit 33ef861
        Author: avery <avry@pm.me>
        Date:   Wed Aug 23 13:55:47 2023 -0700

            to desktop

        commit d5388b8
        Author: avery <avry@pm.me>
        Date:   Wed Aug 23 05:03:09 2023 -0700

            better names, moved an event handler

        commit b774282
        Author: avery <avry@pm.me>
        Date:   Wed Aug 23 04:40:17 2023 -0700

            cargo, minor refactor

        commit f013b84
        Author: avery <avry@pm.me>
        Date:   Wed Aug 23 03:50:18 2023 -0700

            ope

        commit 0cdb694
        Author: avery <avry@pm.me>
        Date:   Wed Aug 23 03:49:47 2023 -0700

            data definitions must now be partial

        commit 985df9f
        Author: avery <avry@pm.me>
        Date:   Wed Aug 23 03:12:51 2023 -0700

            update rt

        commit 53c4e3e
        Author: avery <avry@pm.me>
        Date:   Wed Aug 23 03:10:43 2023 -0700

            upstream bug...?

        commit 2bc9850
        Author: avery <avry@pm.me>
        Date:   Wed Aug 23 03:10:33 2023 -0700

            polish

        commit e3cb336
        Author: avery <avry@pm.me>
        Date:   Wed Aug 23 02:31:54 2023 -0700

            update after merge

        commit 6ce709f
        Merge: de572c9 852b66d
        Author: avery <avry@pm.me>
        Date:   Wed Aug 23 02:31:33 2023 -0700

            Merge branch 'shuttlescreens' of https://github.com/graevy/space-station-14 into shuttlescreens

        commit de572c9
        Author: avery <avry@pm.me>
        Date:   Wed Aug 23 02:20:05 2023 -0700

            feature parity :3

        commit 852b66d
        Author: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
        Date:   Wed Aug 23 19:17:10 2023 +1000

            Update submodule to 150.0.1 (space-wizards#19444)

        commit 1d42a6e
        Author: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
        Date:   Wed Aug 23 18:57:39 2023 +1000

            Update submodule to 150.0.0 (space-wizards#19442)

        commit 7356266
        Author: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
        Date:   Wed Aug 23 18:55:58 2023 +1000

            Remove FixtureId (space-wizards#19280)

        commit 2cc1f8f
        Author: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
        Date:   Wed Aug 23 00:32:11 2023 -0700

            Update RobustToolbox to dc23dfa (space-wizards#19440)

        commit ecd145b
        Author: Doru991 <75124791+Doru991@users.noreply.github.com>
        Date:   Wed Aug 23 07:51:59 2023 +0300

            Fix zombie eye appearance (space-wizards#19427)

        commit db9cedd
        Author: avery <avry@pm.me>
        Date:   Tue Aug 22 02:58:21 2023 -0700

            to desktop

        commit 08bb503
        Author: avery <avry@pm.me>
        Date:   Thu Aug 17 17:12:53 2023 -0700

            to laptop

        commit 19c4cb7
        Author: avery <avry@pm.me>
        Date:   Tue Aug 15 01:13:02 2023 -0700

            cargo shuttle timer

        commit 334e12f
        Author: avery <avry@pm.me>
        Date:   Tue Aug 15 01:12:54 2023 -0700

            polishes

        commit 3425e22
        Author: avery <avry@pm.me>
        Date:   Mon Aug 14 23:37:48 2023 -0700

            shuttle timers work! predicate refactor next

        commit 5b60ce0
        Merge: 5490619 3b7a23b
        Author: avery <51971268+graevy@users.noreply.github.com>
        Date:   Mon Aug 14 03:09:20 2023 -0700

            Merge branch 'space-wizards:master' into shuttletimers

        commit 5490619
        Author: avery <avry@pm.me>
        Date:   Mon Aug 14 03:08:11 2023 -0700

            to desktop

        commit 884347d
        Author: avery <avry@pm.me>
        Date:   Mon Aug 14 00:32:10 2023 -0700

            to laptop

        commit f2cbde3
        Author: avery <avry@pm.me>
        Date:   Sun Aug 13 17:28:20 2023 -0700

            remote timer filtering refactor

        commit 689c6c8
        Author: avery <avry@pm.me>
        Date:   Sat Aug 12 23:12:23 2023 -0700

            to desktop

        commit 09e582c
        Author: avery <avry@pm.me>
        Date:   Sat Aug 12 16:00:32 2023 -0700

            to laptop

        commit 4cc6c6f
        Author: avery <avry@pm.me>
        Date:   Sat Aug 12 05:05:49 2023 -0700

            to laptop

        commit cbb8c0f
        Author: avery <avry@pm.me>
        Date:   Sat Aug 12 02:41:34 2023 -0700

            to desktop

        commit 7b675ce
        Author: avery <avry@pm.me>
        Date:   Fri Aug 11 20:36:19 2023 -0700

            to laptop

        commit 3d637f3
        Author: avery <avry@pm.me>
        Date:   Fri Aug 11 20:11:27 2023 -0700

            to desktop

        commit d4f244d
        Author: avery <avry@pm.me>
        Date:   Fri Aug 11 04:01:56 2023 -0700

            to laptop

        commit 242ef07
        Author: avery <avry@pm.me>
        Date:   Thu Aug 10 21:41:35 2023 -0700

            to desktop

        commit 0812c07
        Author: avery <avry@pm.me>
        Date:   Thu Aug 10 16:51:46 2023 -0700

            to laptop

        commit 49ff245
        Author: avery <avry@pm.me>
        Date:   Thu Aug 10 01:09:44 2023 -0700

            to desktop

        commit 09fac42
        Merge: 922aa09 804dcf4
        Author: avery <avry@pm.me>
        Date:   Wed Aug 9 16:18:47 2023 -0700

            Merge branch 'shuttletimers' of https://github.com/graevy/space-station-14 into shuttletimers

        commit 804dcf4
        Merge: 7542338 c5af5c1
        Author: avery <51971268+graevy@users.noreply.github.com>
        Date:   Wed Aug 9 15:55:41 2023 -0700

            Merge branch 'space-wizards:master' into shuttletimers

        commit 922aa09
        Author: avery <avry@pm.me>
        Date:   Wed Aug 9 14:36:45 2023 -0700

            found an extensible solution. moving to laptop

        commit 7542338
        Author: avery <avry@pm.me>
        Date:   Wed Aug 9 14:05:08 2023 -0700

            recall, docking, and transit timing

        commit 0a03240
        Merge: 4d25533 7381a03
        Author: avery <51971268+graevy@users.noreply.github.com>
        Date:   Tue Aug 8 20:32:25 2023 -0700

            Merge branch 'space-wizards:master' into shuttletimers

        commit 4d25533
        Author: avery <avry@pm.me>
        Date:   Tue Aug 8 04:25:52 2023 -0700

            gotta fix this token bug. everything else works

        commit d7927f5
        Author: avery <avry@pm.me>
        Date:   Mon Aug 7 23:47:53 2023 -0700

            to laptop

        commit 6c81ee0
        Author: avery <avry@pm.me>
        Date:   Sun Aug 6 23:42:24 2023 -0700

            to desktop

        commit 857d3f6
        Merge: 0aa543a 6ce3285
        Author: avery <avry@pm.me>
        Date:   Sun Aug 6 20:53:40 2023 -0700

            Merge branch 'shuttletimers' of https://github.com/graevy/space-station-14 into shuttletimers

        commit 0aa543a
        Author: avery <avry@pm.me>
        Date:   Sun Aug 6 20:53:37 2023 -0700

            to laptop

        commit 6ce3285
        Merge: 4ba8733 56fa974
        Author: avery <51971268+graevy@users.noreply.github.com>
        Date:   Sun Aug 6 18:36:41 2023 -0700

            Merge branch 'space-wizards:master' into shuttletimers

        commit 4ba8733
        Author: avery <avry@pm.me>
        Date:   Sun Aug 6 18:36:27 2023 -0700

            to laptop

        commit 614f1a1
        Merge: 1430e4a 9af3c88
        Author: avery <51971268+graevy@users.noreply.github.com>
        Date:   Sun Aug 6 14:17:17 2023 -0700

            Merge branch 'space-wizards:master' into shuttletimers

        commit 1430e4a
        Author: avery <avry@pm.me>
        Date:   Sun Aug 6 13:57:02 2023 -0700

            to desktop

        commit e469e04
        Merge: 48dda40 db5dee6
        Author: avery <51971268+graevy@users.noreply.github.com>
        Date:   Sun Aug 6 01:21:06 2023 -0700

            Merge branch 'space-wizards:master' into shuttletimers

        commit 48dda40
        Author: avery <avry@pm.me>
        Date:   Fri Aug 4 17:15:19 2023 -0700

            parent-child shuttle timer branch initial commit

        commit 83897b4
        Merge: b7a20fa 2a87079
        Author: avery <51971268+graevy@users.noreply.github.com>
        Date:   Fri Aug 4 14:39:42 2023 -0700

            Merge branch 'space-wizards:master' into shuttles

        commit b7a20fa
        Merge: a66a216 b74bd10
        Author: avery <51971268+graevy@users.noreply.github.com>
        Date:   Fri Aug 4 00:06:13 2023 -0700

            Merge branch 'space-wizards:master' into shuttles

        commit a66a216
        Merge: bf8e88b 26dd6f2
        Author: avery <51971268+graevy@users.noreply.github.com>
        Date:   Wed Aug 2 03:59:47 2023 -0700

            Merge branch 'space-wizards:master' into shuttles

        commit bf8e88b
        Author: avery <avry@pm.me>
        Date:   Wed Aug 2 03:56:12 2023 -0700

            squash: debugging

        commit 7db8a08
        Author: avery <avry@pm.me>
        Date:   Wed Aug 2 03:55:30 2023 -0700

            added evac timer system/component/prototype

        commit cb89491
        Author: avery <avry@pm.me>
        Date:   Wed Aug 2 03:54:59 2023 -0700

            support for emergency shuttle events

        commit 4738aa0
        Author: avery <avry@pm.me>
        Date:   Wed Aug 2 03:53:28 2023 -0700

            added events for evac shuttle call/recall/dock

        commit b32ff66
        Merge: da371ae 6a2aac3
        Author: avery <avry@pm.me>
        Date:   Wed Aug 2 03:29:09 2023 -0700

            Merge branch 'master' of https://github.com/graevy/space-station-14 into shuttles

        commit da371ae
        Author: avery <avry@pm.me>
        Date:   Wed Aug 2 03:26:29 2023 -0700

            revert screentimer rounding displaying e.g. 1m60s

        commit 06f3d6e
        Merge: 7300fb8 926e539
        Author: avery <51971268+graevy@users.noreply.github.com>
        Date:   Tue Aug 1 23:00:20 2023 -0700

            Merge branch 'space-wizards:master' into master

        commit 7300fb8
        Author: avery <51971268+graevy@users.noreply.github.com>
        Date:   Sun Jul 30 17:11:17 2023 -0700

            Update ReflectComponent.cs

        commit b3213a6
        Merge: 38c8264 44b44fd
        Author: avery <51971268+graevy@users.noreply.github.com>
        Date:   Sun Jul 30 14:01:44 2023 -0700

            Merge branch 'space-wizards:master' into master

        commit 38c8264
        Merge: 5800e03 27c08e6
        Author: avery <51971268+graevy@users.noreply.github.com>
        Date:   Sun Jul 23 03:50:28 2023 -0700

            Merge branch 'space-wizards:master' into master

        commit 5800e03
        Author: avery <avry@pm.me>
        Date:   Sun Jul 23 03:14:33 2023 -0700

            support for reflectprob = 1

        commit 8e5c380
        Merge: 2bdafb3 a11fab3
        Author: avery <avry@pm.me>
        Date:   Sat Jul 22 04:27:26 2023 -0700

            Merge branch 'master' of https://github.com/graevy/space-station-14

        commit 2bdafb3
        Author: avery <avry@pm.me>
        Date:   Sat Jul 22 04:26:26 2023 -0700

            laptop sync

        commit 528b539
        Author: avery <avry@pm.me>
        Date:   Sat Jul 22 04:25:45 2023 -0700

            removing redundant layer concept

        commit 94ca8f1
        Author: avery <avry@pm.me>
        Date:   Sat Jul 22 04:23:45 2023 -0700

            ce syndie suit vest is cosmetic only

        commit a11fab3
        Author: avery <51971268+graevy@users.noreply.github.com>
        Date:   Sat Jul 22 04:18:46 2023 -0700

            Update Resources/Prototypes/Entities/Structures/Walls/walls.yml

            Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>

        commit af45aaf
        Author: avery <51971268+graevy@users.noreply.github.com>
        Date:   Sat Jul 22 04:18:20 2023 -0700

            Update Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml

            Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>

        commit ce59ab7
        Author: avery <51971268+graevy@users.noreply.github.com>
        Date:   Sat Jul 22 04:18:09 2023 -0700

            Update Resources/Prototypes/Entities/Structures/Walls/walls.yml

            Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>

        commit c39c8e2
        Author: avery <avry@pm.me>
        Date:   Sat Jul 22 03:25:25 2023 -0700

            desktop debugging

        commit fe63fbe
        Merge: 26e1f20 53e1a63
        Author: avery <51971268+graevy@users.noreply.github.com>
        Date:   Fri Jul 21 17:19:43 2023 -0700

            Merge branch 'space-wizards:master' into master

        commit 26e1f20
        Merge: 20e46e4 c6cb6ad
        Author: avery <avry@pm.me>
        Date:   Fri Jul 21 04:11:00 2023 -0700

            Merge branch 'master' of https://github.com/graevy/space-station-14

        commit 20e46e4
        Author: avery <avry@pm.me>
        Date:   Fri Jul 21 02:25:13 2023 -0700

            parent 9da2545
            author avery <avry@pm.me> 1689931513 -0700
            committer avery <avry@pm.me> 1689934524 -0700

            added reflection support for mobs/reflective vest/shuttle walls

        commit 9da2545
        Author: PJBot <pieterjan.briers+bot@gmail.com>
        Date:   Thu Jul 20 17:56:54 2023 -0400

            Automatic changelog update

            desktop debugging

            added reflection support for mobs/reflective vest/shuttle walls

    commit 222b40a
    Author: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com>
    Date:   Thu Aug 24 04:02:37 2023 +0200

        Kettle QoL (space-wizards#19443)

        * Robotics QoL

        * Add note pointing chemists to the drain in morgue

        * Add senior role spawns

        * Add senior roles to kettle map prototype

    commit 2c21f48
    Author: LankLTE <135308300+LankLTE@users.noreply.github.com>
    Date:   Wed Aug 23 19:00:19 2023 -0700

        update s (space-wizards#19453)

    commit 4e7f104
    Author: LankLTE <135308300+LankLTE@users.noreply.github.com>
    Date:   Wed Aug 23 18:58:51 2023 -0700

        boegs (space-wizards#19466)

    commit 0ed40bd
    Author: LankLTE <135308300+LankLTE@users.noreply.github.com>
    Date:   Wed Aug 23 18:58:38 2023 -0700

        roundstart borgs (space-wizards#19465)

    commit 1ca36a4
    Author: LankLTE <135308300+LankLTE@users.noreply.github.com>
    Date:   Wed Aug 23 18:57:21 2023 -0700

        cyborg n seniors (space-wizards#19464)

    commit 3589cb6
    Author: LankLTE <135308300+LankLTE@users.noreply.github.com>
    Date:   Wed Aug 23 18:56:56 2023 -0700

        borgs n warp points (space-wizards#19463)

    commit 009927e
    Author: PJBot <pieterjan.briers+bot@gmail.com>
    Date:   Wed Aug 23 21:21:57 2023 -0400

        Automatic changelog update

    commit e5e663e
    Author: liltenhead <104418166+liltenhead@users.noreply.github.com>
    Date:   Wed Aug 23 18:20:53 2023 -0700

        Nerf Giant Spiders (space-wizards#19392)

    commit 70f2ac9
    Author: PJBot <pieterjan.briers+bot@gmail.com>
    Date:   Wed Aug 23 20:13:08 2023 -0400

        Automatic changelog update

    commit 9341cac
    Author: lapatison <100279397+lapatison@users.noreply.github.com>
    Date:   Thu Aug 24 03:12:05 2023 +0300

        Split gardening cyborg module, literacy cyborg module tweak (space-wizards#19449)

        * book bag to literacy module, bucket n plant bag to gardening

        * split gardening into gardening and harvesting

        * book bag whitelist document, also dumpable

        * fix

        * new icon

    commit e1a744c
    Author: PJBot <pieterjan.briers+bot@gmail.com>
    Date:   Wed Aug 23 19:56:03 2023 -0400

        Automatic changelog update

    commit b235c06
    Author: LankLTE <135308300+LankLTE@users.noreply.github.com>
    Date:   Wed Aug 23 16:54:59 2023 -0700

        Borg emag tweaks (space-wizards#19373)

        * Laws update

        * stun change

        * stuntime in component

        * history might be fucked

    commit baf7af0
    Author: Moony <moony@hellomouse.net>
    Date:   Wed Aug 23 16:50:49 2023 -0500

        Update issue templates (space-wizards#19458)

    commit 8dedce8
    Author: PJBot <pieterjan.briers+bot@gmail.com>
    Date:   Wed Aug 23 17:50:29 2023 -0400

        Automatic changelog update

    commit 149e58d
    Author: potato1234_x <79580518+potato1234x@users.noreply.github.com>
    Date:   Thu Aug 24 07:49:25 2023 +1000

        revamp getmore inventory (space-wizards#19372)

    commit eedcaea
    Author: PJBot <pieterjan.briers+bot@gmail.com>
    Date:   Wed Aug 23 17:43:37 2023 -0400

        Automatic changelog update

    commit 566505c
    Author: potato1234_x <79580518+potato1234x@users.noreply.github.com>
    Date:   Thu Aug 24 07:42:33 2023 +1000

        short hair sprite change (space-wizards#19425)

    commit dccb52f
    Author: crazybrain23 <44417085+crazybrain23@users.noreply.github.com>
    Date:   Wed Aug 23 22:41:54 2023 +0100

        Add new body examin state (space-wizards#19435)

    commit fd0e14d
    Author: PJBot <pieterjan.briers+bot@gmail.com>
    Date:   Wed Aug 23 17:38:46 2023 -0400

        Automatic changelog update

    commit 4a520ae
    Author: Nairod <110078045+Nairodian@users.noreply.github.com>
    Date:   Wed Aug 23 16:37:42 2023 -0500

        Arachnid Markings Expansion (space-wizards#19439)

    commit 1d44e04
    Author: PJBot <pieterjan.briers+bot@gmail.com>
    Date:   Wed Aug 23 17:35:43 2023 -0400

        Automatic changelog update

    commit 4935a95
    Author: deltanedas <39013340+deltanedas@users.noreply.github.com>
    Date:   Wed Aug 23 22:34:39 2023 +0100

        borg construction module (space-wizards#19260)

        * cant insert materials into machine if unremoveable

        * lingering materials

        * add construction cyborg module

        * fix empty stack color

        * lathe recipe

        * a

        ---------

        Co-authored-by: deltanedas <@deltanedas:kde.org>

    commit b61b0e1
    Author: Moony <moony@hellomouse.net>
    Date:   Wed Aug 23 16:23:06 2023 -0500

        Update CODEOWNERS (space-wizards#19457)

    commit 518db6f
    Author: Moony <moony@hellomouse.net>
    Date:   Wed Aug 23 16:09:56 2023 -0500

        Update RobustToolbox. (space-wizards#19456)

        Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>

    commit 3d3c9e3
    Author: Moony <moony@hellomouse.net>
    Date:   Wed Aug 23 16:03:41 2023 -0500

        Toolshed part 2 (space-wizards#18997)

        * fixe

        * Save work.

        * Rune-aware parser.

        * oogh

        * pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests

        * Publicizes a lot of common generic commands, so custom toolshed envs can include them.

        * i think i might implode

        * Tests.

        * a

        * b

        * awa

        ---------

        Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>

    commit 852b66d
    Author: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
    Date:   Wed Aug 23 19:17:10 2023 +1000

        Update submodule to 150.0.1 (space-wizards#19444)

    commit 1d42a6e
    Author: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
    Date:   Wed Aug 23 18:57:39 2023 +1000

        Update submodule to 150.0.0 (space-wizards#19442)

    commit 7356266
    Author: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
    Date:   Wed Aug 23 18:55:58 2023 +1000

        Remove FixtureId (space-wizards#19280)

    commit 2cc1f8f
    Author: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
    Date:   Wed Aug 23 00:32:11 2023 -0700

        Update RobustToolbox to dc23dfa (space-wizards#19440)

    commit ecd145b
    Author: Doru991 <75124791+Doru991@users.noreply.github.com>
    Date:   Wed Aug 23 07:51:59 2023 +0300

        Fix zombie eye appearance (space-wizards#19427)

commit ed2b4fc
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Wed Aug 23 19:09:04 2023 -0700

    remove debugging shuttletimers

commit 88b9c6c
Merge: 288ce0d 70f2ac9
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Wed Aug 23 17:22:27 2023 -0700

    Merge branch 'space-wizards:master' into shuttlescreens

commit 288ce0d
Author: avery <avry@pm.me>
Date:   Wed Aug 23 16:59:15 2023 -0700

    .

commit 5968f14
Author: avery <avry@pm.me>
Date:   Wed Aug 23 16:56:49 2023 -0700

    round end countdown

commit f8b55c8
Author: avery <avry@pm.me>
Date:   Wed Aug 23 16:26:46 2023 -0700

    docs

commit 9dea599
Author: avery <avry@pm.me>
Date:   Wed Aug 23 16:23:46 2023 -0700

    remote -> shuttle pairing

commit 33ef861
Author: avery <avry@pm.me>
Date:   Wed Aug 23 13:55:47 2023 -0700

    to desktop

commit d5388b8
Author: avery <avry@pm.me>
Date:   Wed Aug 23 05:03:09 2023 -0700

    better names, moved an event handler

commit b774282
Author: avery <avry@pm.me>
Date:   Wed Aug 23 04:40:17 2023 -0700

    cargo, minor refactor

commit f013b84
Author: avery <avry@pm.me>
Date:   Wed Aug 23 03:50:18 2023 -0700

    ope

commit 0cdb694
Author: avery <avry@pm.me>
Date:   Wed Aug 23 03:49:47 2023 -0700

    data definitions must now be partial

commit 985df9f
Author: avery <avry@pm.me>
Date:   Wed Aug 23 03:12:51 2023 -0700

    update rt

commit 53c4e3e
Author: avery <avry@pm.me>
Date:   Wed Aug 23 03:10:43 2023 -0700

    upstream bug...?

commit 2bc9850
Author: avery <avry@pm.me>
Date:   Wed Aug 23 03:10:33 2023 -0700

    polish

commit e3cb336
Author: avery <avry@pm.me>
Date:   Wed Aug 23 02:31:54 2023 -0700

    update after merge

commit 6ce709f
Merge: de572c9 852b66d
Author: avery <avry@pm.me>
Date:   Wed Aug 23 02:31:33 2023 -0700

    Merge branch 'shuttlescreens' of https://github.com/graevy/space-station-14 into shuttlescreens

commit de572c9
Author: avery <avry@pm.me>
Date:   Wed Aug 23 02:20:05 2023 -0700

    feature parity :3

commit db9cedd
Author: avery <avry@pm.me>
Date:   Tue Aug 22 02:58:21 2023 -0700

    to desktop

commit 08bb503
Author: avery <avry@pm.me>
Date:   Thu Aug 17 17:12:53 2023 -0700

    to laptop

commit 19c4cb7
Author: avery <avry@pm.me>
Date:   Tue Aug 15 01:13:02 2023 -0700

    cargo shuttle timer

commit 334e12f
Author: avery <avry@pm.me>
Date:   Tue Aug 15 01:12:54 2023 -0700

    polishes

commit 3425e22
Author: avery <avry@pm.me>
Date:   Mon Aug 14 23:37:48 2023 -0700

    shuttle timers work! predicate refactor next

commit 5b60ce0
Merge: 5490619 3b7a23b
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Mon Aug 14 03:09:20 2023 -0700

    Merge branch 'space-wizards:master' into shuttletimers

commit 5490619
Author: avery <avry@pm.me>
Date:   Mon Aug 14 03:08:11 2023 -0700

    to desktop

commit 884347d
Author: avery <avry@pm.me>
Date:   Mon Aug 14 00:32:10 2023 -0700

    to laptop

commit f2cbde3
Author: avery <avry@pm.me>
Date:   Sun Aug 13 17:28:20 2023 -0700

    remote timer filtering refactor

commit 689c6c8
Author: avery <avry@pm.me>
Date:   Sat Aug 12 23:12:23 2023 -0700

    to desktop

commit 09e582c
Author: avery <avry@pm.me>
Date:   Sat Aug 12 16:00:32 2023 -0700

    to laptop

commit 4cc6c6f
Author: avery <avry@pm.me>
Date:   Sat Aug 12 05:05:49 2023 -0700

    to laptop

commit cbb8c0f
Author: avery <avry@pm.me>
Date:   Sat Aug 12 02:41:34 2023 -0700

    to desktop

commit 7b675ce
Author: avery <avry@pm.me>
Date:   Fri Aug 11 20:36:19 2023 -0700

    to laptop

commit 3d637f3
Author: avery <avry@pm.me>
Date:   Fri Aug 11 20:11:27 2023 -0700

    to desktop

commit d4f244d
Author: avery <avry@pm.me>
Date:   Fri Aug 11 04:01:56 2023 -0700

    to laptop

commit 242ef07
Author: avery <avry@pm.me>
Date:   Thu Aug 10 21:41:35 2023 -0700

    to desktop

commit 0812c07
Author: avery <avry@pm.me>
Date:   Thu Aug 10 16:51:46 2023 -0700

    to laptop

commit 49ff245
Author: avery <avry@pm.me>
Date:   Thu Aug 10 01:09:44 2023 -0700

    to desktop

commit 09fac42
Merge: 922aa09 804dcf4
Author: avery <avry@pm.me>
Date:   Wed Aug 9 16:18:47 2023 -0700

    Merge branch 'shuttletimers' of https://github.com/graevy/space-station-14 into shuttletimers

commit 804dcf4
Merge: 7542338 c5af5c1
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Wed Aug 9 15:55:41 2023 -0700

    Merge branch 'space-wizards:master' into shuttletimers

commit 922aa09
Author: avery <avry@pm.me>
Date:   Wed Aug 9 14:36:45 2023 -0700

    found an extensible solution. moving to laptop

commit 7542338
Author: avery <avry@pm.me>
Date:   Wed Aug 9 14:05:08 2023 -0700

    recall, docking, and transit timing

commit 0a03240
Merge: 4d25533 7381a03
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Tue Aug 8 20:32:25 2023 -0700

    Merge branch 'space-wizards:master' into shuttletimers

commit 4d25533
Author: avery <avry@pm.me>
Date:   Tue Aug 8 04:25:52 2023 -0700

    gotta fix this token bug. everything else works

commit d7927f5
Author: avery <avry@pm.me>
Date:   Mon Aug 7 23:47:53 2023 -0700

    to laptop

commit 6c81ee0
Author: avery <avry@pm.me>
Date:   Sun Aug 6 23:42:24 2023 -0700

    to desktop

commit 857d3f6
Merge: 0aa543a 6ce3285
Author: avery <avry@pm.me>
Date:   Sun Aug 6 20:53:40 2023 -0700

    Merge branch 'shuttletimers' of https://github.com/graevy/space-station-14 into shuttletimers

commit 0aa543a
Author: avery <avry@pm.me>
Date:   Sun Aug 6 20:53:37 2023 -0700

    to laptop

commit 6ce3285
Merge: 4ba8733 56fa974
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Sun Aug 6 18:36:41 2023 -0700

    Merge branch 'space-wizards:master' into shuttletimers

commit 4ba8733
Author: avery <avry@pm.me>
Date:   Sun Aug 6 18:36:27 2023 -0700

    to laptop

commit 614f1a1
Merge: 1430e4a 9af3c88
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Sun Aug 6 14:17:17 2023 -0700

    Merge branch 'space-wizards:master' into shuttletimers

commit 1430e4a
Author: avery <avry@pm.me>
Date:   Sun Aug 6 13:57:02 2023 -0700

    to desktop

commit e469e04
Merge: 48dda40 db5dee6
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Sun Aug 6 01:21:06 2023 -0700

    Merge branch 'space-wizards:master' into shuttletimers

commit 48dda40
Author: avery <avry@pm.me>
Date:   Fri Aug 4 17:15:19 2023 -0700

    parent-child shuttle timer branch initial commit

commit 83897b4
Merge: b7a20fa 2a87079
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Fri Aug 4 14:39:42 2023 -0700

    Merge branch 'space-wizards:master' into shuttles

commit b7a20fa
Merge: a66a216 b74bd10
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Fri Aug 4 00:06:13 2023 -0700

    Merge branch 'space-wizards:master' into shuttles

commit a66a216
Merge: bf8e88b 26dd6f2
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Wed Aug 2 03:59:47 2023 -0700

    Merge branch 'space-wizards:master' into shuttles

commit bf8e88b
Author: avery <avry@pm.me>
Date:   Wed Aug 2 03:56:12 2023 -0700

    squash: debugging

commit 7db8a08
Author: avery <avry@pm.me>
Date:   Wed Aug 2 03:55:30 2023 -0700

    added evac timer system/component/prototype

commit cb89491
Author: avery <avry@pm.me>
Date:   Wed Aug 2 03:54:59 2023 -0700

    support for emergency shuttle events

commit 4738aa0
Author: avery <avry@pm.me>
Date:   Wed Aug 2 03:53:28 2023 -0700

    added events for evac shuttle call/recall/dock

commit b32ff66
Merge: da371ae 6a2aac3
Author: avery <avry@pm.me>
Date:   Wed Aug 2 03:29:09 2023 -0700

    Merge branch 'master' of https://github.com/graevy/space-station-14 into shuttles

commit da371ae
Author: avery <avry@pm.me>
Date:   Wed Aug 2 03:26:29 2023 -0700

    revert screentimer rounding displaying e.g. 1m60s

commit 06f3d6e
Merge: 7300fb8 926e539
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Tue Aug 1 23:00:20 2023 -0700

    Merge branch 'space-wizards:master' into master

commit 7300fb8
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Sun Jul 30 17:11:17 2023 -0700

    Update ReflectComponent.cs

commit b3213a6
Merge: 38c8264 44b44fd
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Sun Jul 30 14:01:44 2023 -0700

    Merge branch 'space-wizards:master' into master

commit 38c8264
Merge: 5800e03 27c08e6
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Sun Jul 23 03:50:28 2023 -0700

    Merge branch 'space-wizards:master' into master

commit 5800e03
Author: avery <avry@pm.me>
Date:   Sun Jul 23 03:14:33 2023 -0700

    support for reflectprob = 1

commit 8e5c380
Merge: 2bdafb3 a11fab3
Author: avery <avry@pm.me>
Date:   Sat Jul 22 04:27:26 2023 -0700

    Merge branch 'master' of https://github.com/graevy/space-station-14

commit 2bdafb3
Author: avery <avry@pm.me>
Date:   Sat Jul 22 04:26:26 2023 -0700

    laptop sync

commit 528b539
Author: avery <avry@pm.me>
Date:   Sat Jul 22 04:25:45 2023 -0700

    removing redundant layer concept

commit 94ca8f1
Author: avery <avry@pm.me>
Date:   Sat Jul 22 04:23:45 2023 -0700

    ce syndie suit vest is cosmetic only

commit a11fab3
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Sat Jul 22 04:18:46 2023 -0700

    Update Resources/Prototypes/Entities/Structures/Walls/walls.yml

    Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>

commit af45aaf
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Sat Jul 22 04:18:20 2023 -0700

    Update Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml

    Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>

commit ce59ab7
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Sat Jul 22 04:18:09 2023 -0700

    Update Resources/Prototypes/Entities/Structures/Walls/walls.yml

    Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>

commit c39c8e2
Author: avery <avry@pm.me>
Date:   Sat Jul 22 03:25:25 2023 -0700

    desktop debugging

commit fe63fbe
Merge: 26e1f20 53e1a63
Author: avery <51971268+graevy@users.noreply.github.com>
Date:   Fri Jul 21 17:19:43 2023 -0700

    Merge branch 'space-wizards:master' into master

commit 26e1f20
Merge: 20e46e4 c6cb6ad
Author: avery <avry@pm.me>
Date:   Fri Jul 21 04:11:00 2023 -0700

    Merge branch 'master' of https://github.com/graevy/space-station-14

commit 20e46e4
Author: avery <avry@pm.me>
Date:   Fri Jul 21 02:25:13 2023 -0700

    parent 9da2545
    author avery <avry@pm.me> 1689931513 -0700
    committer avery <avry@pm.me> 1689934524 -0700

    added reflection support for mobs/reflective vest/shuttle walls

commit 9da2545
Author: PJBot <pieterjan.briers+bot@gmail.com>
Date:   Thu Jul 20 17:56:54 2023 -0400

    Automatic changelog update

    desktop debugging

    added reflection support for mobs/reflective vest/shuttle walls
TemporalOroboros pushed a commit to TemporalOroboros/space-station-14 that referenced this pull request Sep 9, 2023
BasedUser pushed a commit to cube-station-14/cube-station-14 that referenced this pull request Oct 6, 2023
@crazybrain23 crazybrain23 deleted the new-mind-examine-text branch December 19, 2023 17:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Better information on soul presence or lack thereof required
3 participants