Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upstream sync #2347

Merged
merged 110 commits into from
Jun 27, 2024
Merged

Upstream sync #2347

merged 110 commits into from
Jun 27, 2024

Conversation

Morb0
Copy link
Member

@Morb0 Morb0 commented Jun 27, 2024

Описание PR

Медиа

Проверки

  • PR полностью завершён и мне не нужна помощь чтобы его закончить.
  • Я внимательно просмотрел все свои изменения и багов в них не нашёл.
  • Я запускал локальный сервер со своими изменениями и всё протестировал.
  • Я добавил скриншот/видео демонстрации PR в игре, или этот PR этого не требует.

Изменения

PJB3005 and others added 30 commits June 21, 2024 15:29
@PJB3005
Add time index to connection log (#29281)
f041f58 
* Add time index to connection log

Queries go nyoom.

* Don't let me code shit at 5 AM
@Macoron
Fix SSD indicator for scaled humanoids (#29310)
b7c088f 
Fix ssd
@PJBot
Automatic changelog update
0ff144a
@Ko4ergaPunk
Fix noticeboard drawdepth (#29262)
6aa7e2e 
darwdepth added
@Doomsdrayk
Fix pistols not displaying ammo count in-hand (#29289)
e0a6604 
* Make Drozd and C-20r not unwield on use

* Fix wielding mispredict

* add AmmoCounter to pistols
@PJB3005 @metalgearsloth
Rewrite the options menu (#28389)
07fe1a6 
* 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]>
@metalgearsloth
Update submodule to 226.3.0 (#29323)
8922633
@EmoGarbage404 @metalgearsloth
AME Deconstruction Changes (#29317)
be7ffd8 
* AME deconstruction complexity

* review

---------

Co-authored-by: metalgearsloth <[email protected]>
@PJBot
Automatic changelog update
1048817
@Partmedia
Move air sensor components into abstract base prototype (#29261)
bb61f44
@ArkiveDev
Pacifist messages use target's identity name instead of entity name (…
b5f6aa0 
…#29325)
@Partmedia
Fix comments (#29330)
dfe01c7
@Errant-4
Fix for missing survival boxes (#29336)
c418758 
storagefill order fix
@PJBot
Automatic changelog update
df5c4df
@MetalSage
Admin UI localization (#29340)
061c1f5 
admin ui localization

Co-authored-by: MetalSage <[email protected]>
@Flareguy
Disk """resprite""" (#29277)
45a4596 
* disk ""resprite""

* fix holodisk
@marboww
Sound Station 14 like a nukie song (#29345)
5ee79b5 
Nukie song!!
@PJBot
Automatic changelog update
092cad4
@deltanedas
add access reader log wire (#29094)
475c2a0 
* 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>
@PJBot
Automatic changelog update
4d6da00
@Partmedia
Adjust some gas thresholds (#29331)
02fb432
@Partmedia
Add air alarm hysteresis (#29223)
8112063 
Add firelock hysteresis
@PJBot
Automatic changelog update
f954970
@K-Dynamic
Thief toolbox minor rebalance & description clean-up (#27771)
2a6fc45 
* thief clean-up

* anatomy set description change

* description changes
@PJBot
Automatic changelog update
b9172a7
@lzk228 @metalgearsloth
Prying reinforced tile now will give you back metal rod (#29084)
325ab97 
* Reinforced tile can we welded back into metal rod

* more changes

* weh

* fix

---------

Co-authored-by: metalgearsloth <[email protected]>
@PJBot
Automatic changelog update
061445e
@nikthechampiongr
Firelocks are no longer pryable by hand if they are powered (#29221)
6aced66
@PJBot
Automatic changelog update
640115d
@VasilisThePikachu
Don't add untriage lable if it has been labeled at issue creation (#2…
ae84889 
…9356)
notquitehadouken and others added 20 commits June 26, 2024 11:20
@notquitehadouken
Fix dragon ghost role rules (#29474)
33dd7d4 
q
@DieselMohawk
Security Webbing Resprite (#29441)
90c33da
@lzk228
Make blood less satiate hunger (#29433)
a540d1a
@PJBot
Automatic changelog update
7ee2b6f
@Veritable-Calamity
Give moldy food the "Trash" tag (#29380)
4241ad3 
Make moldy food items have the "Trash" tag, so they can be collected.
@PJBot
Automatic changelog update
c34fb39
@Tayrtahn
Forcemap can be cleared with empty string again (#29472)
1a67ab8
@Chief-Engineer
Alert shared connections (#29405)
c81ba6e 
* add admin alert for active shared connections

* update wizden config

* review
@PJBot
Automatic changelog update
063011e
@DrSmugleaf
Fix storages bugging out if an open storage has its component removed…
58efe4f 
… (#29485)

* Fix storages bugging out if an open storage has its component removed

* Fix error on close
@Plykiya
Fixes magic mirror interactions (#29491)
4a0c637 
* Fix for magic mirror interaction

* Works for all cases

* swap the order, works

---------

Co-authored-by: plykiya <[email protected]>
@Doomsdrayk
Fix disposals being effective nuclear bunkers (#29438)
4413253 
Make disposals report their contents to the explosion system
@PJBot
Automatic changelog update
fb705ab
@Tayrtahn
Fix double labels on pills and pill canisters (#29499)
f1e7b4c
@PJBot
Automatic changelog update
4ec2966
@Partmedia
Increase lockout threshold (#29504)
849a790
@Morb0
Merge remote-tracking branch 'refs/remotes/upstream/master' into mast…
da333a1 
…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
@Morb0
Return TTS volume slider
f135037
@Morb0
Update locale
55783a6
@Morb0
Moved out locale
5dd4169
@Morb0 Morb0 requested a review from ficcialfaint as a code owner June 27, 2024 11:02
@github-actions github-actions bot added Status: Needs Review This PR requires new reviews before it can be merged Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design Changes: Map Can be reviewed or fixed by people who are knowledgeable with mapping Changes: UI Can be reviewed or fixed by people who are knowledgeable with UI design Changes: Localization Can be reviewed or fixed by people who are knowledgeable with translation and removed Status: Needs Review This PR requires new reviews before it can be merged labels Jun 27, 2024
@github-actions GitHub Actions
Copy link
Contributor

RSI Diff Bot; head commit 5dd4169 merging into 11e2a96
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Effects/ssd.rsi

State Old New Status
default0 Modified

Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi

State Old New Status
icon Modified
icon_open Added

Resources/Textures/Objects/Misc/module.rsi

State Old New Status
cargodisk Modified
datadisk_base Modified
datadisk_label Modified
holodisk Modified
datadisk0 Removed
datadisk1 Removed
datadisk2 Removed
datadisk3 Removed
datadisk4 Removed
datadisk5 Removed
datadisk6 Removed
nucleardisk Removed

Resources/Textures/Objects/Misc/nukedisk.rsi

State Old New Status
icon Modified
inhand-left Added
inhand-right Added

Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi

State Old New Status
freezerOff Modified
freezerOn Modified
freezerPanelOpen Modified
heaterOff Modified
heaterOn Modified
heaterPanelOpen Modified

Resources/Textures/Interface/Alerts/deflecting.rsi

State Old New Status
deflecting0 Removed

Resources/Textures/Objects/Misc/stock_parts.rsi

State Old New Status
datadisk0 Removed
datadisk1 Removed
datadisk2 Removed
datadisk3 Removed
datadisk4 Removed
datadisk5 Removed
datadisk6 Removed

Resources/Textures/Objects/Consumable/Food/Baked/bagel.rsi

State Old New Status
bagel-poppy Added
bagel Added

Resources/Textures/Objects/Consumable/Food/ingredients.rsi

State Old New Status
dough-rope Added

@Morb0 Morb0 merged commit d4fbfc5 into master Jun 27, 2024
14 of 16 checks passed
lzk228 pushed a commit that referenced this pull request Jun 28, 2024
@lapatison
Translate Upstream #2347 (#2354)
67894f5
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ficcialfaint ficcialfaint Awaiting requested review from ficcialfaint ficcialfaint is a code owner

Assignees
No one assigned
Labels
Changes: Localization Can be reviewed or fixed by people who are knowledgeable with translation Changes: Map Can be reviewed or fixed by people who are knowledgeable with mapping Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design Changes: UI Can be reviewed or fixed by people who are knowledgeable with UI design
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.