Upstream2706 #13
Merged
Upstream2706 #13
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
* Add time index to connection log Queries go nyoom. * Don't let me code shit at 5 AM
darwdepth added
* Make Drozd and C-20r not unwield on use * Fix wielding mispredict * add AmmoCounter to pistols
* Basic attempt at rewriting how the options menu works, move accessibility settings into their own tab. * Audio tab uses the new options system. * Rewrite Misc tab * Clean up heading styling * Rewrite options tab and other minor cleanup all over the place. * Documentation comments and minor cleanup. --------- Co-authored-by: AJCM <[email protected]> Co-authored-by: metalgearsloth <[email protected]>
* AME deconstruction complexity * review --------- Co-authored-by: metalgearsloth <[email protected]>
storagefill order fix
admin ui localization Co-authored-by: MetalSage <[email protected]>
* disk ""resprite"" * fix holodisk
Nukie song!!
* add LoggingDisabled to AccessReader * add LogWireAction * -m give everything besides high-security door a log wire * make LogAccess public and support string arg * add log when pulsing * m * l --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
Add firelock hysteresis
* thief clean-up * anatomy set description change * description changes
* Reinforced tile can we welded back into metal rod * more changes * weh * fix --------- Co-authored-by: metalgearsloth <[email protected]>
Co-authored-by: Morb <[email protected]>
…er-syndie # Conflicts: # .github/CODEOWNERS # Content.Client/Options/UI/Tabs/AudioTab.xaml # Content.Client/Options/UI/Tabs/AudioTab.xaml.cs # Content.Server/Connection/ConnectionManager.cs # Content.Shared/Preferences/Loadouts/RoleLoadout.cs # Resources/Prototypes/Loadouts/role_loadouts.yml # Resources/Prototypes/SoundCollections/NukeMusic.yml # Resources/Textures/Clothing/Belt/securitywebbing.rsi/equipped-BELT.png # Resources/Textures/Clothing/Belt/securitywebbing.rsi/icon.png # Resources/Textures/Clothing/Belt/securitywebbing.rsi/inhand-left.png # Resources/Textures/Clothing/Belt/securitywebbing.rsi/inhand-right.png # Resources/Textures/Clothing/Belt/securitywebbing.rsi/meta.json # Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_gay.png
Co-authored-by: poeMota <[email protected]>
This feature should never have been merged, it can be trivially abused to break the entire server. It's behind a CVar because honestly that's the easiest way to 1984 the feature.
Apparently we did not have these.
The F3 coords manager is blocked if you're not an admin. This check happened even when playing a replay, where you actually aren't. There's now a check to make sure you are actually server-connected-to-game before running the logic. Also moved it to a manager because this *shouldn't be a bloody entity system in the first place*.
* CookBook name,id and description changed * Id isues with CookBook fixed * Maps not added
…er-syndie # Conflicts: # Content.Client/Entry/EntryPoint.cs # Content.Client/IoC/ClientContentIoC.cs
…tion-14 into upstream2706
github-actions
bot
added
Changes: UI
|
RSI Diff Bot; head commit cc884b3 merging into 68438fa Resources/Textures/Effects/ssd.rsi
Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi
Resources/Textures/Objects/Misc/module.rsi
Resources/Textures/Objects/Misc/nukedisk.rsi
Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi
Resources/Textures/Interface/Alerts/deflecting.rsi
Resources/Textures/Objects/Misc/stock_parts.rsi
Resources/Textures/Objects/Consumable/Food/Baked/bagel.rsi
Resources/Textures/Objects/Consumable/Food/ingredients.rsi
|
Merged
via the queue into
AdventureTimeSS14:master
with commit Jun 27, 2024
ef0a1bf
13 of 14 checks passed
Schrodinger71
added a commit
that referenced
this pull request
Jun 29, 2024
This reverts commit ef0a1bf.
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.
Описание PR
Проверки
Изменения
🆑 Schrodinger71