Merged
Conversation
…tity<T>` (#41966) * Entity<T>, skipping Magazine and ChamberMagazine * missed some * AUGH!! * ballistic examine * dotnet hates me * WHY ARE YOU CALLED THAT!!!! * cheers aada
Revert "Exo - Exomas Version (revertable) (#41715)" This reverts commit a0e7fe8.
Revert "Christmas-ifed Packed Station! (#41665)" This reverts commit b77a0d6.
* code * cant be toggled * can't unwrench * no rotating it * comments * change from PreventToggle to CanToggle * commentary * Update Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* snowball update * snowball update
Guard against div/0 for HeatContainers
* fix clustersoap eaten sprite * also assure that every entity with the SolutionContainerVisualsComponent has a AppearanceComponent * use the new sprite system + fix the fill for cardboard arrows and the mosin * fix merge issue
* Fix style classes used on monotone labels * Heading>SubHeading
* intercom resprite * fix typo * change copyright
* Add 6 new ironsand tiles Ironsand plating and ironsand tile are based on the asteroid plating and asteroid tile tiles. Ironsand concrete tiles are based on the concrete and gray concrete tiles. Packed ironsand is slightly based on smooth gray concrete, but mostly original. * Add ironsand cobble wall * Finish adding tile objects for ironsand concrete tiles Includes inhands, even though the other concrete tiles don't even have 'em. * Add cutter recipes for ironsand concrete I'm sad that I can't require iron ore for these recipes. Iron ore can't go in a cutter, though, and changing that seems like it'd be more complicated than it's worth. Assuming I don't just make the thing accept any and all ores, which... um. * Delete temporary .swp file that shouldn't have been in the repo to begin with * Add ironsand pavement tile * Add ironsand stone door * Add ironsandstone walls * Improve packed ironsand texture * Add ironsand step * Add ironsand step corner * Add three mysterious, runed pillars * Lighten ironsand wall border * Replace art for paved ironsand * Make steps more closely match paved ironsand tiles * Increase border contrast of ironstone door * Add fake "astro-" versions of ironsand tiles * Add second tall pillar sprite * Add prototype for second tall statue * Make astro-ironsand researchable and latheable * Update corner step texture to match straight steps * Add corner steps that go the other way * Add door variant to match cobbled ironsand wall * Fix license for ironsand step sprites * Darken ironsandstone walls for better contrast * Update ironstone doors to match walls and be more distinct * Remove merge conflict detritus * Fix duplicate component * Update tile stack prototypes * Add detail to copyright info * Improve ironstone wall and door destruction * Normalize ironsand statue prototypes * Normalize ironsand tile object prototypes * Move ironsand plating in with the rest of the plating tiles * Remove .gitignore additions I might just make a new PR just for this, though. I'm very tempted. * Add sound effect to ironsand step destruction * Add abstract base class to stairs and steps * Remove redundant destruction trigger behavior from cardboard door * Add destruction behavior to ironsand statues * Fix up ironsand step prototypes * Remove redundant bits from ironsandstone wall prototypes * Remove ironstone door crush behavior * Add individual ironstone statue bounding boxes * Make ironstone statues shootable * Tweak ironsand statue bounding boxes
* upgrading * Update MeleeWeaponSystem.Effects.cs * Easing
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com> Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com> Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Maintaining the status quo
fixed typo/duplicate
Fix localization missing spam from Admin Overlay (#42244) playerInfo.StartingJob is already localized Co-authored-by: Centronias <me@centronias.com>
predict thieving beacon
* init * subfolder * note
* it begins * god help me * FINALLY
…413) * jugs closeable, move chemitsry entities into chemsitry directory * forgor to stage json. I hope i didnt stage robust :anxious: * Who likes cargo? Not me. Lets remove it. * Remove seal, make the amount examinable regardless of open or not, update jug icon * apply iaada's parenting * fix issues tdw parenting * Review changes * Fix sprite rename * small touchup --------- Co-authored-by: SlamBamActionman <slambamactionman@gmail.com> Co-authored-by: iaada <iaada@users.noreply.github.com>
Contributor
|
Благодарим вас за вклад в репозиторий Space Station 14. К сожалению, похоже, что вы отправили свой PR из master-ветки. Мы предлагаем вам следовать нашей документации по использованию git Вы можете переместить текущую работу из master-ветки в другую ветку, выполнив команду |
github-actions
bot
added
size/L
S: Needs Review
Changes: Sprites
Changes: UI
Changes: Map
Changes: Localization
Changes: Audio
and removed
size/L
S: Needs Review
labels
Contributor
|
Important Review skippedToo many files! This PR contains 296 files, which is 146 over the limit of 150. ⛔ Files ignored due to path filters (4)
📒 Files selected for processing (296)
You can disable this status message by setting the Use the checkbox below for a quick retry:
✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
tau27
added a commit
that referenced
this pull request
Feb 26, 2026
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
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
АПСТРИМНЫЙ ДЕНЬ
Почему / Баланс
Технические детали
Медиа
Требования
Согласие с условиями
Критические изменения
Список изменений