From f8dcc13ae4ac7537f63b9e38cd39c457bd95dd01 Mon Sep 17 00:00:00 2001 From: Piras314 Date: Wed, 28 Aug 2024 19:34:01 -0400 Subject: [PATCH] Merge Upstream (#555) * Automatic changelog update * Fix dungeon spawn + ftl overlap (#31413) * Fix dungeon spawn + ftl overlap * Better fixes * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automatic changelog update * meta update (#31423) * Automatic changelog update * Add ContainerComp (#31311) Applies EntProtoId changes upon insertion / removal from container. Can also be useful for borgs / mechs / vehicles in future but atm I just used it for AI. * Automatic changelog update * Automatic changelog update * Power stuff (#31314) * Power stuff - Add shared IsPowered - Add shared ResolveApc - Move PowerChangedEvent to shared for now - Add SlimPoweredLight that actually functions how you'd expect a PoweredLight to function it id didn't have a bunch of bloat on it. * big update * boing * Automatic changelog update * ContainerComp fix (#31434) Forgot to push these ones on the branch. * Automatic changelog update * Automatic changelog update * Automatic changelog update * bagel update (#31440) * bagel update * fixgridatmos * qm office * sci cam fix * jesus christ so many routers * remove invalids * Automatic changelog update * Cog update (#31458) made disposals less bad * Automatic changelog update * Automatic changelog update * Move OnGhostAttempt to GhostSystem (#31445) * Move OnGhostAttempt to GhostSystem * Remove unused dependencies and sort them * Automatic changelog update * Replace obsolete code in shuttle systems. (#31408) * Format DockingSystem.Shuttle * arrivals system * docking system * shuttle console system * emergency shuttle system * shuttle system * thruster system * Fix compile error --------- Co-authored-by: Pieter-Jan Briers * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automatic changelog update * bagel update (#31502) * Centcom & FTLDestination cleanup (#30226) * centcomm name and ftlcomp * networking microopstimization * go sleep. * map names and arrivals * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automated whitelists (#23985) * Beginnings of making the breadmemes jobs easier * stuff * stuff pt. 2 * Stuff pt.3 * Stuff I forgot last time * Basic whitelist Only people that are added to the whitelist with the addwhitelist command will be able to join. I call this the "legacy" whitelist * Remove always deny condition in favor of just breaking if playtime check fails * Change default whitelist Default whitelist is now the "legacy" whitelist. * localization * Admin check * minor spelling change * Fix build * Whitelist message * Fix vars not being datafield and spelling mistakes * Minor spelling mistake * Change config for salamander * Reviews and stuff * Add summaries * Fix whitelists * Forgot to add a datafield * Fixing stuff I guess * Reuse admin remarks to reduce load when connecting. * Update log messages to be verbose instead of debug * Reviews * whoops * Explain a bit more how whitelist checking works * Apply CE's review * Append Membership to Blacklist and Whitelist conditions * Fix review comments * Uncapitalize playerConnectionWhitelist, add to ignored client prototypes * Make note count field work * Fix cvar for thingy --------- Co-authored-by: Pieter-Jan Briers * Automatic changelog update * Automatic changelog update * bagel update (#31535) * Station AI (#30944) * Station AI overlay * implement * Bunch of ports * Fix a heap of bugs and basic scouting * helldivers * Shuffle interactions a bit * navmap stuff * Revert "navmap stuff" This reverts commit d1f89dd4be83233e22cf5dd062b2581f3c6da062. * AI wires implemented * Fix examines * Optimise the overlay significantly * Back to old static * BUI radial working * lots of work * Saving work * thanks fork * alright * pc * AI upload console * AI upload * stuff * Fix copy-paste shitcode * AI actions * navmap work * Fixes * first impressions * a * reh * Revert "navmap work" This reverts commit 6f63fea6e9245e189f368f97be3e32e9b210580e. * OD * radar * weh * Fix examines * scoop mine eyes * fixes * reh * Optimise * Final round of optimisations * Fixes * fixes * Bagel station ai (#31537) * real * AI * proto fix * Fix PostMapInit tests not considering job containerspawns (#31538) * Fix PostMapInit tests nto considering job containerspawns * fix * AI whitelist fix (#31542) * cog update (#31540) updooted cog * AI radio fix (#31547) Love to see it * Update AI holo sprite to camera (#31558) Update AI camera to 13 default Holo was a placeholder. This is better in the interim. * Add AI warp points (#31559) * Automatic changelog update * Fix AI being ejectable (#31561) * Automatic changelog update * Fix whitelist (#31563) * Automatic changelog update * bagel update (#31562) * bagel update * ore processor cargo * Add some more stuff to AI whitelist (#31564) * Add some more stuff to AI whitelist * by the nine * Automatic changelog update * Meta - Med disposals and chem room extra pipe fix (#31467) Delete extra pipe & fix disposals junction * bagel hotfix (#31566) bagel update * update AI job icon to 8x8 (#31565) icon and meta.json * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automatic changelog update * fix spelling error silicon jobs (#31581) Update department.ftl * Automatic changelog update * Fix defibs draining battery when turned off (#31593) * Marathon - Names a singular camera (#31590) Fixes unnamed camera * Automatic changelog update * Reach - Scientist added to map's prototype (#31567) Added scientist to map prototype * Change my copyright (#31599) * Remove random cyrillic letters (#31600) * escape pod tiny fan (#31601) * escape pod tiny fan * oop * Fix nuke disk erroneously being marked 'left behind' (#31602) Fix erroneous 'disk left behind' objective * Automatic changelog update * bagel update (#31603) * bagel update * light switch to make audience area darker in theatre * Add rings (Salvage loot real)! (#31372) * First commit * I'm silly * Another fix * How could I forget the descriptions! * Forgot * Made textures alligned properly * Removed the stuff! * Opps * Typo fixes * Automatic changelog update * fix12312314234235 --------- Co-authored-by: PJBot Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com> Co-authored-by: Spessmann <156740760+Spessmann@users.noreply.github.com> Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.com> Co-authored-by: Mervill Co-authored-by: Pieter-Jan Briers Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com> Co-authored-by: Simon <63975668+Simyon264@users.noreply.github.com> Co-authored-by: JustCone <141039037+JustCone14@users.noreply.github.com> Co-authored-by: lunarcomets <140772713+lunarcomets@users.noreply.github.com> Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com> Co-authored-by: themias <89101928+themias@users.noreply.github.com> Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com> --- .../Cartridges/NewsReaderUiFragment.xaml | 2 +- .../Anomaly/AnomalySynchronizerSystem.cs | 4 +- .../GameTicking/Rules/NukeopsRuleSystem.cs | 3 +- Resources/Changelog/Changelog.yml | 52 ++++----- .../Locale/en-US/paper/story-generation.ftl | 2 +- .../Locale/en-US/store/uplink-catalog.ftl | 4 +- Resources/Maps/Shuttles/escape_pod_small.yml | 2 +- Resources/Maps/bagel.yml | 102 +++++++++++------ Resources/Maps/marathon.yml | 7 +- .../Clothing/Hands/base_clothinghands.yml | 13 +++ .../Entities/Clothing/Hands/rings.yml | 104 ++++++++++++++++++ .../Spawners/Random/Salvage/tables_loot.yml | 8 ++ .../Markers/Spawners/Random/rings.yml | 21 ++++ .../Objects/Specific/Medical/defib.yml | 1 + .../Entities/Structures/Machines/lathe.yml | 1 + Resources/Prototypes/Maps/bagel.yml | 1 + Resources/Prototypes/Maps/reach.yml | 1 + Resources/Prototypes/tags.yml | 3 + .../Back/Satchels/clown.rsi/meta.json | 2 +- .../Eyes/Glasses/outlawglasses.rsi/meta.json | 2 +- .../Clothing/Hands/Rings/basic.rsi/gem.png | Bin 0 -> 132 bytes .../Clothing/Hands/Rings/basic.rsi/meta.json | 17 +++ .../Clothing/Hands/Rings/basic.rsi/ring.png | Bin 0 -> 228 bytes .../Head/Bandanas/brown.rsi/meta.json | 2 +- .../blue_flame_welding_mask.rsi/meta.json | 2 +- .../Welding/flame_welding_mask.rsi/meta.json | 2 +- .../Head/Welding/paintedwelding.rsi/meta.json | 2 +- .../Mobs/Silicon/station_ai.rsi/meta.json | 2 +- .../Specific/Chemistry/chem_bag.rsi/meta.json | 2 +- .../Equipment/plant_bag.rsi/meta.json | 2 +- .../Library/Equipment/books_bag.rsi/meta.json | 2 +- .../Specific/Mining/ore_bag.rsi/meta.json | 2 +- 32 files changed, 290 insertions(+), 80 deletions(-) create mode 100644 Resources/Prototypes/Entities/Clothing/Hands/rings.yml create mode 100644 Resources/Prototypes/Entities/Markers/Spawners/Random/rings.yml create mode 100644 Resources/Textures/Clothing/Hands/Rings/basic.rsi/gem.png create mode 100644 Resources/Textures/Clothing/Hands/Rings/basic.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Hands/Rings/basic.rsi/ring.png diff --git a/Content.Client/CartridgeLoader/Cartridges/NewsReaderUiFragment.xaml b/Content.Client/CartridgeLoader/Cartridges/NewsReaderUiFragment.xaml index bd5879408ef536..fd5a7bb1617b20 100644 --- a/Content.Client/CartridgeLoader/Cartridges/NewsReaderUiFragment.xaml +++ b/Content.Client/CartridgeLoader/Cartridges/NewsReaderUiFragment.xaml @@ -26,7 +26,7 @@ Text="{Loc 'news-read-ui-next-text'}" ToolTip="{Loc 'news-read-ui-next-tooltip'}"/> - +