Maintenance - Brings fork up to date as of November 25, 2023, at 5:05 PM (EST) #374

deathride58 · 2023-11-21T01:46:12Z

Title

There's two hard-to-find-in-the-sea-of-commits changes this PR makes: A portion of _Citadel.Thalers was moved into shared for compatibility with minds now existing primarily within shared, and instances of MindComponent (and MindComponent EntityUids) within parameter args have been changed to instead use Entity<T>. Everything else here is more or less just a fast-forward to match mainline SS14

…149'

…d14'

…bc8'

…efb'

…7f2'

…2c7'

…8ac'

…a2f'

…304'

…5b3'

…3c1'

…57f'

…241'

…764'

…e16'

…4da'

…813'

…5e8'

…b59'

…baf'

…e90'

…d8b'

…f29'

…51a'

Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>

…2a6'

…973'

…f1b'

…0f9'

…cf0'

…d7c'

…e1d'

…46e'

…aca'

…862'

…d90'

…ad5'

…4c3'

…311'

…4b9'

deathride58 · 2023-12-04T05:05:26Z

Self-merging at the request of other maintainers

deathride58 added 30 commits November 20, 2023 20:17

squash! Merge tool integrating '654cc7f0714cc773350e29a374f89ed5c1f14…

07854c8

…149'

squash! Merge tool integrating '68c45ebc039b64ea85bad984c2148bf9ac874…

3c8a245

…d14'

squash! Merge tool integrating '909621ee5f2bf67cb8da617226e29f3c50148…

5777a18

…bc8'

squash! Merge tool integrating 'd7810e6d6ab7f6d2ecfe2d50a4274f4fd2b80…

e8cf9ca

…efb'

squash! Mergebot skipped commit a0198f4.

4735c6f

squash! Merge tool integrating '9af95742df2bbe165fca98a2553995fe287f6…

759fc76

…7f2'

squash! Merge tool integrating '1a3d3a3ed02a1ac71e340e1aace9211b56165…

2210172

…2c7'

squash! Mergebot skipped commit 86ebdf8.

98f6995

squash! Merge tool integrating 'd9119f895f8322c6d4a87702e221bd4705d9e…

8352372

…8ac'

squash! Merge tool integrating 'fb180fbebc5ef66bcc7c565595740aa4297ed…

8aa79da

…a2f'

squash! Merge tool integrating 'c032fad909fd623e9592052fd0c368d105c3a…

271250e

…304'

squash! Mergebot skipped commit d097b67.

1020b79

squash! Merge tool integrating 'e4ec03f9e23ac861a2d231921c4e6d3cecb6f…

ab1c0f6

…5b3'

squash! Mergebot skipped commit 61f2532.

c68bd4c

squash! Merge tool integrating 'a183f16a8dbaa4fcd052fff05f1cd176e0384…

ecb793e

…3c1'

squash! Merge tool integrating 'f7638ae282a81ce323d4b6ad5dbc12980a9af…

322aced

…57f'

squash! Merge tool integrating '2de0619a522bab97553f4d2630e5482ec5960…

410d1ec

…241'

squash! Merge tool integrating 'df52e239f2ea5eeb58bfc2af191c798d24c94…

65fcfe6

…764'

squash! Merge tool integrating 'ee03526d718948b3b6828e8a9119063bcc3ea…

0595998

…e16'

squash! Merge tool integrating '6e07e5d2cdea226a99ca572029d59fa437c01…

4f05915

…4da'

squash! Merge tool integrating '9d3fb0883cd7f3ae0ba66c4680525cb14a970…

a29654c

…813'

squash! Merge tool integrating 'f09486268471ff741e94c596183867ad10a97…

99eb52a

…5e8'

squash! Merge tool integrating '820a0320b45ed76d33e4e77d9766bec8a8225…

b571ce6

…b59'

squash! Merge tool integrating 'a2b2c56979bcbf0143ccda6efce31250c51b2…

d24370e

…baf'

squash! Merge tool integrating 'bfd509e7afeecf9ec2b2e0a17ab3c84394050…

c327fe9

…e90'

squash! Mergebot skipped commit b9b706b.

715ad90

squash! Merge tool integrating 'c9e2a91f13fb4b653cc5e3df4d8697afd29ba…

d890e42

…d8b'

squash! Mergebot skipped commit f3e5cae.

a752a46

squash! Merge tool integrating '3e6ecb93124dafef9484d41dbe80379d09729…

47280a8

…f29'

squash! Merge tool integrating 'ab1894fd42267c072b7a7d9d0004dcd6d5df1…

9779f37

…51a'

DrSmugleaf and others added 27 commits November 22, 2023 17:04

Update Robust to v180.2.1 (#21845)

7d2e8c7

Content arch (#20107)

93bd997

Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>

Update submodule to 181.0.0 (#21848)

4239545

Update submodule to 181.0.1 (#21851)

fc92bb5

Use GetHashCode for client construction (#21857)

76fe97b

Update submodule to 181.0.2 (#21856)

9abff95

Update submodule to 182.0.0 (#21859)

ab907eb

Minor decal change (#21860)

0c4e265

Revert submodule to 180.2.1 (#21870)

15052bf

Revert the other arch changes (#21871)

d4bed09

Update Operation_suffix.yml (#21882)

808ed84

squash! Merge tool integrating '068f58d2b82d87c96bf5eb985f65546ac1fcb…

7616577

…2a6'

squash! Merge tool integrating '895231961cf83cba69b69b29073ec2059cef0…

8bdc808

…973'

squash! Merge tool integrating 'f173b6a710b01daab11f9728dff0e8131302a…

73993c4

…f1b'

squash! Mergebot skipped commit 8edeb4c.

1bde2d2

squash! Merge tool integrating '4be03591b94d58d34f97ab6236760bd064f7b…

2e086d2

…0f9'

squash! Merge tool integrating '7d2e8c7087d1b502d957d22a0ee12d11bb358…

8c3ee39

…cf0'

squash! Merge tool integrating '93bd9972f12a4645ca4e54307a6daaf47ffd8…

6f7e9ac

…d7c'

squash! Merge tool integrating '4239545655b5aef993f73898824ae43ea0178…

2c72898

…e1d'

squash! Merge tool integrating 'fc92bb51c506d1b3a72ebccc7ee18ca7581cf…

39d04ef

…46e'

squash! Merge tool integrating '76fe97b7c2b975bed7320ed6fee8e488a2ad2…

5f89cdf

…aca'

squash! Merge tool integrating '9abff95a5495ec4ecdf559dad652561fded6f…

6d79e81

…862'

squash! Merge tool integrating 'ab907ebef4c6fc08052de52a27cb0708b202b…

2cf90c9

…d90'

squash! Merge tool integrating '0c4e2650dd0b5b75e419e2f987f3450359c3d…

e19e2be

…ad5'

squash! Merge tool integrating '15052bf7c21b31f255fb7b2e7b06d9305237f…

43e38f2

…4c3'

squash! Merge tool integrating 'd4bed09cdc73d4865920d5ab90fd202a8bb96…

c7263cf

…311'

squash! Merge tool integrating '808ed846d172f5907113b820d9bc1c57e785f…

dc70b61

…4b9'

deathride58 changed the title ~~Maintenance - Brings fork up to date as of November 22, 2023, at 1:45 PM (EST)~~ Maintenance - Brings fork up to date as of November 25, 2023, at 5:05 PM (EST) Nov 25, 2023

deathride58 merged commit 042b261 into Citadel-Station-13:master Dec 4, 2023
11 of 14 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Maintenance - Brings fork up to date as of November 25, 2023, at 5:05 PM (EST) #374

Maintenance - Brings fork up to date as of November 25, 2023, at 5:05 PM (EST) #374

deathride58 commented Nov 21, 2023 •

edited

Loading

deathride58 commented Dec 4, 2023

Maintenance - Brings fork up to date as of November 25, 2023, at 5:05 PM (EST) #374

Maintenance - Brings fork up to date as of November 25, 2023, at 5:05 PM (EST) #374

Conversation

deathride58 commented Nov 21, 2023 • edited Loading

deathride58 commented Dec 4, 2023

deathride58 commented Nov 21, 2023 •

edited

Loading