2024/04/07 merge master #1060
Merged
2024/04/07 merge master #1060
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
As far as I know, the Box of Hugs only spawns on the clown and is used in the construction of a honkbot such that if the clown decided earlier to craft a honkbot or if the low price of some 3000 spesos is insufficient this bounty is impossible. Similarly, Donk Pockets are not a renewable resource and it has happened that a station has eaten too many for the bounty to be completed only to get it in rotation and esssentially lose a bounty slot forever. I would like it if each bounty was at least theoretically possible on any station it's likely to occur in, and there are too many where there aren't enough of these obtainable to complete the bounty, which is no fun. (cherry picked from commit 3e786f5)
(cherry picked from commit ba7d2dc)
* 2-digit nodes * 3-digits instead * Fix exclusive bounds (cherry picked from commit 2e9deae)
(cherry picked from commit 527c2c4)
* Fix test * Kill float accumulators * Use entity proxy methods * DataField auto name generation where possible * Kill comp properties * Clean up server comps * Make events record structs * Clean up shared body code * Clean up server body code * Rename organ events to be same names as in med refactor (cherry picked from commit 37b8d78)
Add trace to action error logs (cherry picked from commit 92a4443)
* When another player late joins it will correctly update the UI locally * Resolve passengers not displaying the correct message in late join * Improve final boolean comparison of button disabled state to be a bit neater (cherry picked from commit bf7c1d6)
(cherry picked from commit 29fb3ca)
* Remove HasAtmosphereMethodEvent * Remove GetTileMixturesMethodEvent * Remove GetTileMixtureMethodEvent * Remove GetAdjacentTilesMethodEvent * Add TileMixtureEnumerator * Remove GetAdjacentTileMixturesMethodEvent * Remove IsTileSpaceMethodEvent * Remove HotspotExposeMethodEvent * Remove pipe net method events * Remove device method events * Use Entity<T> * Misc fixes * A * Theres probably a few more of these * Fix other resolve errors (cherry picked from commit 77e029d)
* Minor ItemToggleSystem tweaks * Update visuals on startup * Remove SetIgnited * Misc toggle fixes * Update ItemToggleHotComponent.cs (cherry picked from commit 8a6879b)
(cherry picked from commit 7d90175)
* Removed inconsistent broadcast cooldown whenever the "Announce" button is pressed on the communications terminal. * Revert "Removed inconsistent broadcast cooldown whenever the "Announce" button is pressed on the communications terminal." This reverts commit c730d6499b6908f6ae7c52e21d5338fa3b7eb80e. * Reapply "Removed inconsistent broadcast cooldown whenever the "Announce" button is pressed on the communications terminal." This reverts commit 3c2d66af865a11ca55eb0e98db58a955c0d70c00. * -Removed cooldown entirely (cherry picked from commit 578f7e4)
Add DoorBumpOpener to space dragon.yml (cherry picked from commit 887cd42)
(cherry picked from commit b064985)
* use nav beacon locations for announcements * :thumbs_up: (cherry picked from commit 766192f)
(cherry picked from commit a071bc5)
* Give 'em something to talk about * Wire panel visuals * Wire graphics tweak * More ads and thanks * More ads for a noisy arcade * New screen for space villain machines * Implement EmitSoundIntervalComponent and a bunch of arcade noises * Require power for sounds * Allow earlier startup intervals * Orange glow * Audio attributions * Include the PR link * Replace EmitSoundInterval with expanded SpamEmitSound * Remove pacman-themed arcade sounds * Documentation good. * Updated methods to use Entity<T> * Refactored SpamEmitSound to get rid of accumulator and chance. * Fixed prewarm logic * Moved stuff to Shared * Fix outdated YAML * Better prediction, auto pause handling * Make enable/disable reset the timer instead of trying to save it. (cherry picked from commit b1ba6b5)
(cherry picked from commit 65fa3ae)
* add SaveItemLocation keybind * make item direction public to avoid having to change between Angle for no reason * add item location saving * show * Added a better save keybind, made it draw saved positions, and trying to save in a position it has already been saved in removes that position. * w * code style * Make taken spots appear blue * style * ! --------- Co-authored-by: deltanedas <@deltanedas:kde.org> Co-authored-by: notquitehadouken <[email protected]> Co-authored-by: I.K <[email protected]> (cherry picked from commit 6863a7c)
* dynamic alert sprite * fix fat cooldowns (cherry picked from commit d576f5c)
(cherry picked from commit df7f2a1)
* add Name field to SpeechVerbPrototype * extra locale for voice mask ui * SpeechVerb ui and handling * raaaaaaaaa * reeeeeeeeal Co-authored-by: Tayrtahn <[email protected]> * fix sort * did you hear john syndicate died of ligma * Update Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml --------- Co-authored-by: deltanedas <@deltanedas:kde.org> Co-authored-by: Tayrtahn <[email protected]> Co-authored-by: metalgearsloth <[email protected]> (cherry picked from commit d13da28)
(cherry picked from commit 29f34d8)
* Separated "thank you" messages from general ads * Moved MessagePackPrototype to shared, cleaned up AdvertiseComponent, and actually killed AdvertisementsPackPrototype. +More suggests changes. * Rename PackPrototypeID to Pack in both components. (cherry picked from commit 794a447)
* Fix master * this * messages * Fix missing verb name parrot * Fix messagePack for blockgame and spacevillain --------- Co-authored-by: ShadowCommander <[email protected]> (cherry picked from commit bbe08c0)
localize (cherry picked from commit 192f092)
(cherry picked from commit 7759d40)
Fix major skill issue/Incorrect stealth messages appearing on readmin. (cherry picked from commit df631ff)
Makes electrocution damage based on the voltage of the wire and bring down the damage to a sane level. It's no longer primarily based on the power being received. LV Cable -> 10 damage MV Cable -> 20 damage HV Cable -> 30 damage Having a primarily power-based damage system causes there to be massive fluctuations in damage based on things outside of a regular player's control, like the station power output. This removes a lot of player agency and turns grilles into a risky gamble where they can either do no damage or instantly fry the player due to simply being hooked up to the engine. While this may be a more accurate simulation in some regards, the reality of the gameplay is that it's often just frustrating, resulting in constant death traps as players brushing against electrified grilles and punching wires take absurd amounts of damage. By making them flat rates, it's possible to actually balance the damage output. (cherry picked from commit aba1619)
(cherry picked from commit daff655)
github-actions
bot
added
S: Needs Review
Changes: C#
|
I'm not sure how stable this is if I'm being honest, I didn't fully test it |
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
@deltanedas Fishops is too powerful |
NullWanderer
force-pushed
the
2024/04/07-merge-master
branch
from
15d7f1a to
2c3b1f8
Compare
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
github-actions
bot
added
S: Merge Conflict
…master # Conflicts: # Resources/Prototypes/Catalog/Fills/Books/lore.yml
NullWanderer
force-pushed
the
2024/04/07-merge-master
branch
from
51f614f to
8335203
Compare
Colin-Tel
approved these changes
Apr 8, 2024
LaryNevesPR
pushed a commit
to LaryNevesPR/Estacao-Andromeda
that referenced
this pull request
Jan 3, 2025
# Description There were some missing meta.json entries.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About the PR
Big
Changelog
🆑