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.

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

Upstream merge 53 #772

Merged
merged 147 commits into from
Feb 23, 2024
Merged

Conversation

TheArturZh
Copy link
Member

Описание PR

мерж апстрима
откат space-wizards#25119

Медиа

Проверки

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

Изменения

🆑 TheArturZh

  • tweak: Амбузол теперь требует обычную кровь вместо крови зомби (как раньше)
  • tweak: Амбузол+ теперь требует кровь зомби вместо омнизина (как раньше)

LankLTE and others added 30 commits February 16, 2024 19:45
Make seeds from clipped plants inherit the decreased health from parents.
Also require one growth stage before clipping.
* nymphs now don't get deleted together with the body of the diona

* moved nymph system to server
* Fix: Grenades don't make trigger sound

* transform instead of trycomp transform

---------

Co-authored-by: Plykiya <[email protected]>
* Save round information into the replay

* Add round end text too

* This is way better

* Get actual job

* oop

* OK THERE

* Fake line endings to make life easier

* I was told this yaml is legal

* I just realised this will make my life easier

* REVIEWS BABY IM A PROGRAMMER MOMMY

* Live pjb reaction

* Live pjb reaction 2

* Reviews 2

* Dont need this

* Please no more have mercy on my soul

* Oh frick
Adds a massban flag to the admin flags used on ss14 to ban large amounts of players rom a .tsv file

Co-authored-by: Geekyhobo <[email protected]>
I could've sworn I corrected this before committing but guess not ???
* added evidence markers

* box tweak

* fixed a spelling mistake

* new sprites, tweaked yml too
This is a visualizer somewhat similar to the Generic. It allows configuring appearance info based on specific CVars the user has set. This allows YAML to easily configure alternatives for accessibility CVars like reduced motion.
Important fixes from the UI PR
* Add Flammable Touch Reaction for liquid tritium

* Stop tail wagging action on crit

* Revert "Add Flammable Touch Reaction for liquid tritium"

This reverts commit 41be57b.
fixes

makes the newton cradle not able to decimate ears while also adding it to the bureaucracy crate and lowering its volume and range a little bit
Enabling "reduced motion" now makes the smoke effects not animate. This helps some people with vision issues.
* added more foodstuff breakdowns

* Calcium doesn't exist; moved phosphorus to protein

* tested reactions- some should be centrifuged

* more testing tweaks
lzk228 and others added 21 commits February 21, 2024 21:44
* Little rework of existing yaml flatpacks

* comit 2

* 55

* 66

* 77

* WRAAAA

* done mr sloth

* Update flatpack.yml

* fix??
Syndi handheld crew monitor got removed. Give them their own content instead of reskinning NT stuff.
…zards#25439)

* Revert "Remove handheld crew monitor (space-wizards#24761)"

This reverts commit bbc6d29.

# Conflicts:
#	Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/Prototypes/Research/biochemical.yml
#	Resources/migration.yml

* changes

* zeweh

* dergs
…b minds (space-wizards#23179)

Fix for 22933 - SharedMindSystem now checks for VisitingMindComponent too.
* saving working code

* add checks for deletion
…-wizards#25461)

* Make even more items good looking in inventory

* holoprojecrots
@github-actions github-actions bot added Changes: Localization Изменение затронуло файлы ".ftl" Changes: Map Изменение затронуло файлы ".yml" в неймспейсе "maps" Changes: Sprites Изменение затронуло файлы ".rsu / .png" Changes: UI Изменение затронуло файлы ".xaml" labels Feb 22, 2024
Copy link

github-actions bot commented Feb 22, 2024

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

Resources/Textures/Clothing/Eyes/Hud/diagpatch.rsi

State Old New Status
equipped-EYES Added
icon Added

Resources/Textures/Effects/optionsvisualizertest.rsi

State Old New Status
both Added
motion Added
none Added
test Added

Resources/Textures/Effects/spookysmoke.rsi

State Old New Status
spookysmoke_static Added

Edit: diff updated after 3348650

@DexlerXD DexlerXD merged commit 395ada2 into SerbiaStrong-220:master Feb 23, 2024
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Изменение затронуло файлы ".ftl" Changes: Map Изменение затронуло файлы ".yml" в неймспейсе "maps" Changes: Sprites Изменение затронуло файлы ".rsu / .png" Changes: UI Изменение затронуло файлы ".xaml"
Projects
None yet
Development

Successfully merging this pull request may close these issues.