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

Merged
merged 104 commits into from
Nov 14, 2023
Merged

Upstream sync #1570

merged 104 commits into from
Nov 14, 2023

Conversation

Morb0
Copy link
Member

@Morb0 Morb0 commented Nov 14, 2023

Описание PR

Медиа

Проверки

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

Изменения

themias and others added 30 commits November 8, 2023 18:42
@themias
Remove need to toggle vending machine button (#21543)
cf6eb20
@PJBot
Automatic changelog update
be8e5b7
@brainfood1183
Roller Skates fixes (#21542)
8be97a2
@themias
Fix space vault (#21541)
c1791eb
@PJBot
Automatic changelog update
cb1e799
@DoubleRiceEddiedd
New crop: Cotton (#21536)
2ef29fb 
* Add cotton plant

* Adddescription and tag to cotton bal allow moth eat it

* Fix typo. Add cotton seed into MegaSeed

* Fix typo

* Fix typo

* Fix cottonbol component typo

* Fix the amount of cotton that bol gives

* Adding correct component to make cotton bol edible

* Change cotton bol parent to see if it is edible

* Adding flavor to cotton bol, and fix typo

* Replace image

* fixing plant image position

* Increase the Megaseed restock crate price to avoid money farming loop hole
@PJBot
Automatic changelog update
50e358a
@pewter-wiz
Tweak dwarf accent (#21522)
88a9dce 
* Remove bad substitutions from dwarf accent

As per discussion in https://discord.com/channels/310555209753690112/1170959598153375815
These phrases are common pain-points
and often don't make gramatical sense
in most conversation

I feel accents (especially ones tied to species)
should favour intelligibility over flavour
where the trade-off arises

* Remove duplicate entry in dwarven accent

For -> fer already exists at accent-dwarf-words-82
@pewter-wiz
Minor: Revert removal of "Oye" from dwarven accent in favour of "Oi" …
e355541 
…(#21547)

* Remove bad substitutions from dwarf accent

As per discussion in https://discord.com/channels/310555209753690112/1170959598153375815
These phrases are common pain-points
and often don't make gramatical sense
in most conversation

I feel accents (especially ones tied to species)
should favour intelligibility over flavour
where the trade-off arises

* Remove duplicate entry in dwarven accent

For -> fer already exists at accent-dwarf-words-82

* Revert removal of Hey -> Oye, opting for Hey -> Oi instead

* Revert removal of Hey -> Oye, opting for Hey -> Oi instead
@VasilisThePikachu
LOOC will appear on top of your head (#21514)
2f2d237 
* Oh well

* Minor fixing up

* HOLY BINGLE I DID IT

* TOGGLE!
@PJBot
Automatic changelog update
7b06e1e
@ravage123321
Adding a kitten (#20726)
c2de7ec 
* Update animals.yml

* Update

* ANOTHER UPDATE

change mobcat meleeweapon from brute to piercing, deleting extra lines

* oops

* Update npc.yml

* Update npc.yml

* Update animals.yml
@PJBot
Automatic changelog update
1ae210f
@themias
Mark space glue and lube TrashOnSolutionEmpty (#21550)
5cc157e
@Emisse
Minor Borg Qol (#21548)
5d46bbb 
* boirg stuff

* gaming

* modules shits

* mini welder is too lmao

* pro

* cheaper recipes, fix mob state thresholds, remove silly crayon, rename module

* generic borg 6 module

* literacy module shityourself
@PJBot
Automatic changelog update
4de0cf6
@EmoGarbage404
Fix borg mobstates (#21307)
ac5e9cd 
* Add dead states to borgs

* this?

* ack
@PJBot
Automatic changelog update
977cced
@PixelTheKermit
strip fix (#21552)
02584a5
@Genkail
Generators were discharged in the admin arena (#21549)
fdf4ea1 
Generators were discharged in the admin arena,
@PJBot
Automatic changelog update
6d2c086
@EmoGarbage404
cheaper borg parts and modules (#21557)
df11de0
@PJBot
Automatic changelog update
a367097
@ElectroJr
Merge ActorSystem and IPlayerManager (#21314)
654cc7f
@ElectroJr
Update engine to v178.0.0 (#21571)
68c45eb
@VasilisThePikachu
stasis bed and microwave qol(#21572)
909621e
@Doru991
Borg QOL, part 3 (#21567)
d7810e6 
* Basic and advanced cleaning modules

* Roundstart entry level modules

* Oops forgot recipe

* Gold
@PJBot
Automatic changelog update
a0198f4
@ElectroJr
Fix replay spectating bugs (#21573)
9af9574
@DrSmugleaf
Fix missing if statement when logging missing action error (#21560)
1a3d3a3
PJBot and others added 18 commits November 13, 2023 18:24
@PJBot
Automatic changelog update
7e0b800
@Emisse
bagel update (#21641)
85f6e99
@Emisse
box update (#21642)
eb46102
@Emisse
meta update (#21643)
126c1bb
@TheShuEd
Pet Carrier (Zookeeper gameplay?) (#21545)
786bb79 
* add visual

* fix item + entityStorage problem, add generation in maints

* make pet carrier two-handed

* added to cargo

* add resistlocker component
@PJBot
Automatic changelog update
2fdc566
@EmoGarbage404
Minimalist Action Bar (#21352)
4e84961
@PJBot
Automatic changelog update
ff7bce6
@Jrpl
Add Check For Gravity On Thrown Items (#21647)
ec76958
@ElectroJr
Flammable system bug fixes. (#21594)
16a9697
@PJBot
Automatic changelog update
50e1289
@metalgearsloth
Reduce NPC query allocations (#21421)
aa704ee
@deltanedas
Add MindPlaySound to role system (#21460)
318d843 
Co-authored-by: deltanedas <@deltanedas:kde.org>
@Chubbygummibear
Fix thrown items not registering the tile they stop by colliding with…
e6e7a23 
… a hard surface (#21107)
@PJBot
Automatic changelog update
75bfba6
@Morb0
Merge remote-tracking branch 'upstream/master' into upstream-sync
3cb4017 
# Conflicts:
#	Resources/Audio/Announcements/license.txt
#	Resources/Audio/Effects/Shuttle/licenses.txt
#	Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
#	Resources/Textures/Structures/Storage/tanks.rsi/meta.json
@Morb0
Update attributions
0f80aeb
@Morb0
Update locale
25b30d6
@Morb0 Morb0 requested a review from ficcialfaint as a code owner November 14, 2023 15:53
@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 Nov 14, 2023
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Nov 14, 2023 •
edited
Loading

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

Resources/Textures/Interface/Alerts/borg_alive.rsi

State Old New Status
health0 Modified
health1 Modified
health2 Modified
health3 Modified
health4 Modified

Resources/Textures/Mobs/Pets/cat.rsi

State Old New Status
cak Modified
kitten Modified
kittencollar Modified
kittentag Modified

Resources/Textures/Clothing/Neck/Cloaks/void.rsi

State Old New Status
equipped-NECK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Interface/Alerts/borg_critical.rsi

State Old New Status
critical Added

Resources/Textures/Interface/Alerts/borg_dead.rsi

State Old New Status
dead Added

Resources/Textures/Mobs/Aliens/Carps/sharkminnow.rsi

State Old New Status
alive Added
dead Added
dead_mouth Added
icon Added
mouth Added

Resources/Textures/Objects/Fun/figurines.rsi

State Old New Status
thiefcharacter Added

Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi

State Old New Status
dead Added
harvest Added
produce Added
seed Added
stage-1 Added
stage-2 Added
stage-3 Added

Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi

State Old New Status
icon-mop-adv Added

Resources/Textures/Objects/Storage/petcarrier.rsi

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

Edit: diff updated after f45c72b

@Morb0 Morb0 merged commit e451598 into master Nov 14, 2023
12 checks passed
@Morb0 Morb0 deleted the upstream-sync branch November 14, 2023 16:53
Morb0 pushed a commit that referenced this pull request Nov 14, 2023
@lapatison
Translate Upstream #1570 (#1571)
1e655c8
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.