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

Merged
merged 23 commits into from
Jul 28, 2023
Merged

Upstream sync #1229

merged 23 commits into from
Jul 28, 2023

Conversation

Morb0
Copy link
Member

@Morb0 Morb0 commented Jul 28, 2023

Описание PR

Медиа

Проверки

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

Изменения

SpaceRox1244 and others added 23 commits July 27, 2023 17:05
@SpaceRox1244
Back-Equippable Guitars (#18383)
11c4990 
* added back equip sprites for guitars that didnt have them

* Corrected meta.json copyright fields
@PJBot
Automatic changelog update
773b876
@Vordenburg @metalgearsloth
Add pathfinding for dynamic bodies (#17416)
494b9e5 
Co-authored-by: metalgearsloth <[email protected]>
@Vordenburg
Add pathfinding support for NPCs climbing tables (#17415)
49f3f07
@metalgearsloth
Revert "Add pathfinding for dynamic bodies" (#18397)
e97e7f8
@Verslebas @PJB3005
adds champagne (#18344)
fc4c964 
Co-authored-by: Pieter-Jan Briers <[email protected]>
@PJBot
Automatic changelog update
ca48834
@brainfood1183
added senior roles, added coffins and graves. (#18404)
b13c72b
@OctoRocket
[Tweak] Remove some confusing words from archaic. (#18393)
a6dbaa2
@Vordenburg
Improve implanter descriptions (#18403)
0330ea7 
* Rewrite all implanter and implant descriptions

* Make implanter status control resemble syringe's

* Add implant description to implanter examine

* Remove unused usings
@PJBot
Automatic changelog update
7e00bec
@KingFroozy
Add pockets to hazard vests (#18394)
df815b8
@PJBot
Automatic changelog update
be15a92
@Jackal298
Retexture of weapons in the hands of the character Part 2 (#18365)
ceb77bc
@PJBot
Automatic changelog update
70ceba5
@MishaUnity
convert News read tab to PDA Cartridge (#18368)
e4dcdc0 
* Add Console, PDA news tab, and ringstone popup

* Add English localization

* Add mass-media console board to Advanced Entertainment resrarch

* Fix misprint

* Deleting unused libraries

* Fix round restart problem

* Fixing restart problem

* Just another fix

* Сode optimization

* Code optimization

* Convert News read tab to cartridge

Convert the News read tab into a cartridge, and fix a couple of bugs

* Just another fix

* Some updates

* More fixing!!

Fix cooldown, add author label to read menu

* Again, fix cooldown bug

* Some minor changes

* Revert "Some minor changes"

This reverts commit 470c8d727629ac79994f70e56162adae8659e944.

* Some minor updates
@PJBot
Automatic changelog update
eda9a2d
@Emisse
firesuits/jugsuits buff (#18407)
2708c5e 
* fireuits

* hardsoots
@PJB3005
Update submodule to v141.2.0 (#18408)
c04e075
@Morb0
Merge remote-tracking branch 'upstream/master' into upstream-sync
dda8422 
# Conflicts:
#	Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/equipped-BACKPACK.png
@Morb0
Remove straps from wt550 sprite
1381fba
@Morb0
Correct Largo description
1234d9c
@Morb0
Update locale
b51a3c1
@Morb0 Morb0 requested a review from ficcialfaint as a code owner July 28, 2023 21:01
@github-actions github-actions bot added Status: Needs Review This PR requires new reviews before it can be merged 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 labels Jul 28, 2023
@github-actions
Copy link
Contributor

RSI Diff Bot; head commit b51a3c1 merging into 9f5ecea
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi

State Old New Status
inhand-left Modified
inhand-right Modified
suppressor Modified
equipped-BACKPACK Added

Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi

State Old New Status
equipped-BACKPACK Modified

Resources/Textures/Interface/Misc/program_icons.rsi

State Old New Status
news_read Added

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

State Old New Status
icon Added

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

State Old New Status
icon Added

Resources/Textures/Objects/Fun/Instruments/bassguitar.rsi

State Old New Status
equipped-BACKPACK Added

Resources/Textures/Objects/Fun/Instruments/eguitar.rsi

State Old New Status
equipped-BACKPACK Added

Resources/Textures/Objects/Fun/Instruments/rockguitar.rsi

State Old New Status
equipped-BACKPACK Added

@Morb0 Morb0 merged commit c2b28de into master Jul 28, 2023
15 of 16 checks passed
@Morb0 Morb0 deleted the upstream-sync branch July 28, 2023 21:28
Morb0 pushed a commit that referenced this pull request Jul 29, 2023
@lapatison
Translate Upstream #1229 (#1234)
a499795
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.