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 #1621

Merged
merged 37 commits into from
Dec 10, 2023
Merged

Upstream sync #1621

merged 37 commits into from
Dec 10, 2023

Conversation

Morb0
Copy link
Member

@Morb0 Morb0 commented Dec 10, 2023

Описание PR

Медиа

Проверки

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

Изменения

EmoGarbage404 and others added 30 commits December 8, 2023 12:43
@EmoGarbage404
keybinds for opening bag/belt & context logic for opening storage win…
736300d 
…dow (#22238)

* keybinds for opening bag/belt & context logic for opening storage window

* no error por favor
@EmoGarbage404
Mark the last item stored in storage for smart-equip (#22236)
8112f84 
* mark the last item stored in grid inventory

* shift
@PJBot
Automatic changelog update
c409223
@QuietlyWhisper
Rat king fixes + buffs (#22247)
8fa47b8 
* fix minor typo

* add doafter range

* increase miasma release
@PJBot
Automatic changelog update
baf522d
@Flareguy
adds lime tiles (#22235)
ae1a1b9
@Emisse
give command staff brig access (#22230)
ea441ae 
* lort

* webedit ops

* pro

* Update research_director.yml
@EmoGarbage404
Experimental Anomaly Vessel (#22233)
e7e7974 
* experimental anomaly vessel

* sprote changes
@PJBot
Automatic changelog update
52c6fa5
@Flareguy
Fixes reptilian "full" sprite + adds reptilian template to the raw sp…
8902591 
…rites folder (#22112)

* lizard "full" sprite + adds lizard template to raw sprites folder

* remove the dammned tail

* fix tests
@PJB3005
Fix being unable to open chat channel drop-down. (#22255)
995f506
@VasilisThePikachu
Fixed credits action failing (#21733)
d4490f7
@PJBot
Automatic changelog update
2843f14
@JoeHammad1844
knives get throwing damage (#22248)
fc0ed73
@PJBot
Automatic changelog update
c797c2b
@Flareguy
fixes a few common gridinv sprite rotations (#22256)
bd79fff
@metalgearsloth
Make audio sliders use gain not volume (#21984)
98d5f9f
@PJBot
Automatic changelog update
2436728
@EmoGarbage404
Set enabled on RadiationSourceComponent to true by default (#22259)
d8644e0
@PJBot
Automatic changelog update
6fabc74
@metalgearsloth
Add audio multipliers back (#22260)
b72c855
@PJBot
Automatic changelog update
0f3dc6b
@metalgearsloth
Update submodule to 188.0.0 (#22262)
f0d7272
@VigersRay
Fix entity logs verb (#22231)
b64715b
@OliverOtter
Cluster minor QOL update (#22261)
83aa30c 
* Update cluster.yml

* Update cluster.yml
@noctyrnal
Familiar Garbs (#22253)
8bc4d2a 
* update time

* removing maps and adding petah for pr

* removed shitbox

---------

Co-authored-by: camrynz <[email protected]>
@ElectroJr
Stop terminating entities from being removed from containers (#22232)
5da332f
@metalgearsloth
Update submodule to 189.0.0 (#22281)
174a738
@nok-ko
Prevent entities who do not have hands from setting off bombs. (#22250)
e5fb355
@Tunguso4ka
Adds placement mode to the wall dispensers (#22211)
f3d6540
@Morb0 Morb0 requested a review from ficcialfaint as a code owner December 10, 2023 08:49
@github-actions github-actions bot added 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 Status: Needs Review This PR requires new reviews before it can be merged labels Dec 10, 2023
@github-actions GitHub Actions
Copy link
Contributor

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

Resources/Textures/Mobs/Species/Reptilian/parts.rsi

State Old New Status
full Modified

Resources/Textures/Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Added
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Interface/Alerts/human_crew_monitoring.rsi

State Old New Status
alive Added
critical Added
dead Added
health0 Added
health1 Added
health2 Added
health3 Added
health4 Added

Resources/Textures/Objects/Tiles/tile.rsi

State Old New Status
lime Added

Resources/Textures/Structures/Machines/Anomaly/adv_anomaly_vessel.rsi

State Old New Status
anomaly-1 Added
anomaly-2 Added
anomaly-3 Added
base Added
panel Added
powered-1 Added
powered-2 Added
powered-3 Added

@Morb0 Morb0 merged commit 83f41e7 into master Dec 10, 2023
13 of 14 checks passed
@Morb0 Morb0 deleted the upstream-sync branch December 10, 2023 09:05
Morb0 pushed a commit that referenced this pull request Dec 10, 2023
@lzk228
Upstream translate #1621 #1622 (#1623)
8e4fc12
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 Status: Needs Review This PR requires new reviews before it can be merged
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.