Upstream sync #447
Merged
Upstream sync #447
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
* Buzzing moth * Update speech_emotes.yml
* marathon update * forgor cameras
Co-authored-by: deltanedas <@deltanedas:kde.org>
* saltern update * name --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
Fix ssd indicator
* clarity? * h * bleeeurgh * review ass --------- Co-authored-by: metalgearsloth <[email protected]>
- Probably confusing if you're not familiar with nentities - if I need the clientside uid for debugging I can just open VV and it's immediately there on first page.
added warning state for AME
* small patch * fix * remove garbage * fix * moved to shared events * fix * LocId --------- Co-authored-by: metalgearsloth <[email protected]>
Bottom text
* adds prototypes for airlock assemblies for other doors * fix tests
…age (#24586) * Initial commit, requires server restart to take effect * Exposes callbacks directly instead, takes effect immediately * Cleaned up control flow, swapped cvar for client customization * Switched to int, dictionary of callbacks, migration * Update Content.Shared/Preferences/SpawnPriorityPreference.cs * krunkle stan --------- Co-authored-by: metalgearsloth <[email protected]> Co-authored-by: metalgearsloth <[email protected]>
* Adds Visitor role and ShowInIdCardConsole property * Add visitor to Agent ID card * Fixes yaml test * Fixes based on feedback * Fixes based on feedback
* Space lube now makes you slide * review * oh lord he slippin --------- Co-authored-by: metalgearsloth <[email protected]>
* Binary Key 4-2 TC * Added Binary Key into RD Locker * Change from ID to Entity * Reverts back to ID * Found the Actual ID
* The zombie virus now cures paraplegia. * no wheelchairbound anymore
All the engineering numbers are complete unusable garbage and it's apparently completely impossible to properly set up power on some maps. This is a band-aid fix (and apology to all engineering players) until somebody fixes this shit properly.
* comit * comit2 * little more range * review --------- Co-authored-by: metalgearsloth <[email protected]>
-Electrocutions now happen using how much power there is rather than how much is being used.
* Fix tests PJB don't look no shed * weh
* Cleanups PolymorphSystem * forgot this * Nah * Fix test --------- Co-authored-by: metalgearsloth <[email protected]>
* inital * fikss * nuh uh
This is literally it Ayup
* Can't slide under fences anymore * Small mobs can't pass instead
This standardises it with audio and whatever. Me when I sprinkle nullchecks everywhere. Was 50/50 on making new non-nullable methods but figured it would bloat too hard and you can't access strings by .Value anyway.
fix popup spam on invalid door Co-authored-by: deltanedas <@deltanedas:kde.org>
* Reduced motion toggle disables screen shake * Actually, screen shake is its own slider instead * Cache screen shake intensity cvar
Co-authored-by: SonicHDC <[email protected]> Co-authored-by: Morb0 <[email protected]> Co-authored-by: lzk <[email protected]> Co-authored-by: Krosus777 <[email protected]>
# Conflicts: # Content.Client/Preferences/UI/HumanoidProfileEditor.xaml # Content.Server/Power/Generator/GeneratorSystem.cs # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml # Resources/Prototypes/Entities/Objects/Misc/paper.yml # Resources/Prototypes/Voice/speech_emotes.yml # Resources/Textures/Effects/speech.rsi/meta.json # Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/assembly.png
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.
No description provided.