agea #1
Merged
agea #1
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
More device configurator invalid entity serialization fixes
Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co>
* fractional weights dont work in StationEvents * force-int * sure why not, we can keep floats I guess.
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
* Fix name duplication * Apply requested changes
* Add a maintenance panel to bar signs * Update Resources/Locale/en-US/wires/wire-names.ftl * AI interactions --------- Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co> Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Derelictn'tn't Borg! * Clean *sparkles* * Removed "S: Awaiting Changes"
* Added evac shuttle and fixed various issues brought up during playtests * Updated Amber with playtest feedback, removed waste loop and firelocks from evac shuttle
* vox guidebook regen update * damage number * skreee
Update DungeonJob.PostGenBiome.cs
…lopers. (space-wizards#33715) Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: deltanedas <@deltanedas:kde.org> Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Predicted gas pumps I wanted to try out atmos and first thing I found. * a * Remove details range
* 圣诞歌曲 * Update Resources/Audio/StationEvents/attributions.yml Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Added more holiday decorations
* Mercenary gear contraband tweaks. * Fixed Mercenary Combat Gloves to have basic Combat Gloves as a parent again. * Update Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml --------- Co-authored-by: RedBookcase <Usualmoves@gmail.com> Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* FINALLY * Update animals.yml
* Hew * properly attribute hew.ogg * add to maints locker plushie pool with low chance, clear up grammar * shhhh nobody saw that linter failure * adds localization support for Weh and Hew emotes * fix capitalization error present since circa 2/25/2024 * resolve conflicts, fix sprite, add reversed inhands * clear up cursed formatting
* coggers * Requested changes
…33938) * fix marathon power * add holopads * add requested changes
* Stuff * Requested changes
Packed Holopad & Engi Update Added holopads, atmos network monitor and sensors, advanced SMES, and revamped TEG setup.
* Reach/Cargo Update Adds holopads and new atmos tech to Reach, and replaces cargo shuttle/ATS holopads with localized versions. * Fix Invalid invalidinvalidinvalidinvalidinvalidinvalid
* Add a festive lemon-lime soda variant: cranberry! * Gave lemon-lime a brand name * Make the CrateFoodSoftdrinksLarge slightly larger to accomodate the extra drinks. * Extend the Christmas anomaly with extra jolliness * Minor spelling mistake. Jollyness will not be denied. * Removed redundant delay from meta file
* Comment LogTypes * Uncomment unused types --------- Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co>
…pace-wizards#33854) * Use class instead of out variables * Show battery level in power monitoring console * Better color contrast for battery level + localized string * Add visualization to battery percentage * Reverts random ChatSystem.cs whitespace change * Address review * Show BatteryLevel stats in child view when selecting devices --------- Co-authored-by: Crotalus <crotalus@users.noreply.github.com>
* Omega Update (Localized Holopads) Replaced all holopads with localized versions and a couple tiny misc * Remove engi protolathe * Forgot to rename engi fax whoops
…33948) * Added loc versions of holopads to Amber, and made some adjustments given Acorn's feedback * fixed the name of the gameroom * Fixed it in the map file
power fixes, sensors, dim lights
* fix packed power * fix that * fix that as well * even more fixes * fix power, again
* fix packed power * Revert "fix packed power" This reverts commit 4f44d06. * fic the entire thing again
* many changes * contentingregrationtests * serialized invalid removed * blank * "Changes and fixes as suggested" * blank * blank * added desk bells * engi rework rework rework * added gate to content integration * tweaks * aaa * bbb * added holopads * ccc * Update default.yml --------- Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com>
Fixed integration tests part I didn't save locally for the merge. Signed-off-by: Kelderan <66748890+KeldWolf@users.noreply.github.com>
Upstream20241219
* Barratry Update (Holopads & Engi) * Fix UUID 0 error --------- Co-authored-by: FluffMe <1780586+FluffMe@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
About the PR
Why / Balance
Technical details
Media
Requirements
Breaking changes
Changelog