forked from space-wizards/space-station-14
-
Notifications
You must be signed in to change notification settings - Fork 154
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
DexlerXD
merged 147 commits into
SerbiaStrong-220:master
from
TheArturZh:upstream-merge-53
Feb 23, 2024
Merged
Upstream merge 53 #772
DexlerXD
merged 147 commits into
SerbiaStrong-220:master
from
TheArturZh:upstream-merge-53
Feb 23, 2024
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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
* add * yes
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.
add (un)equip sounds to EVA helms
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.
Co-authored-by: PJBot <[email protected]>
* added more foodstuff breakdowns * Calcium doesn't exist; moved phosphorus to protein * tested reactions- some should be centrifuged * more testing tweaks
* Little rework of existing yaml flatpacks * comit 2 * 55 * 66 * 77 * WRAAAA * done mr sloth * Update flatpack.yml * fix??
Changed wattage from 6 -> 2
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.
assaultborglight
* saving working code * add checks for deletion
…-wizards#25461) * Make even more items good looking in inventory * holoprojecrots
Large Wood Floors
…on-14 into upstream-merge-53
This reverts commit 0aa35af.
github-actions
bot
added
Changes: Localization
Изменение затронуло файлы ".ftl"
Changes: Map
Изменение затронуло файлы ".yml" в неймспейсе "maps"
Changes: Sprites
Изменение затронуло файлы ".rsu / .png"
Changes: UI
Изменение затронуло файлы ".xaml"
labels
Feb 22, 2024
RSI Diff Bot; head commit 3348650 merging into f5529b8 Resources/Textures/Clothing/Eyes/Hud/diagpatch.rsi
Resources/Textures/Effects/optionsvisualizertest.rsi
|
DexlerXD
approved these changes
Feb 23, 2024
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"
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Описание PR
мерж апстрима
откат space-wizards#25119
Медиа
Проверки
Изменения
🆑 TheArturZh