Upstream20241219 #238
Merged
Upstream20241219 #238
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
…33773) (space-wizards#33811) Amber Station - Playtest Fixes (space-wizards#33773) * Fixed various issued identified during playtests. * Fixed a firelock stuck closed * Added more cameras and moved others * Fixed an issue with disposals Co-authored-by: Southbridge <7013162+southbridge-fur@users.noreply.github.com>
…wizards#33678) * Rename Dungeon Master Laws to not run into copyright problems * Revert direct map changes * Added renaming of DungeonMasterCircuitBoard to migration.yml * Remove whitespace changes to oasis.yml --------- Co-authored-by: Litrax <email@emal.com>
* Zombies can see Initial Infected * Update zombie character info text
Fixed stores with multiple currencies having bad formatting and non-functional withdraw screens
* Cluster grenade refactor * oopsies on the name * Solve client-side errors * reviews addressed * filling scattering grenades is now predicted * reviews addressed
* working mind swap spell * Removing unncessary spacing Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com> * Changing mind swap speech Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com> * All requested changes in review * Stores owned by mind instead of body * Requested changes, traitor uplink fixed * Revert "Requested changes, traitor uplink fixed" This reverts commit 2ceac67. * Revert "Stores owned by mind instead of body" This reverts commit dfb72ab. * Separate target and performer stun duration --------- Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com> Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>
* add SpawnTableOnUse * make BaseEmitSound more flexible and remove sound from spawntable * add log *--------- Co-authored-by: deltanedas <@deltanedas:kde.org>
* First commit * Forgot the shading! * tweaked values * sprite update * Radiation
* Changed comments to be more clear and uniform. EggLayer uses NextGrowth instead of frame accumulation. Egglayer uses much less energy to make eggs, and lay time is randomized for player and AI chicken. * UdderComponent ReagentId can be changed now UdderSystem and WoolySystem use SharedSolutionContainerSystem now * Entities with udders can be examined to see a rough hunger level udders and wooly stop reagent generation/extra nutrient usage once the solution container is full * Moved stuff to Shared AutoPausedField now * Cleanup moving stuff to Shared * Oops. Make UdderSystem sealed instead of abstract. * Switch PopupEntity for PopupClient * Didn't mean to delete Access * new() instead of default! prototype revert egglayer balance change NextGrowth += timespan in egglayer * forgot [Datafield] for NextGrowth * forgot NetworkedComponent again... * Renaming Shared Animal to Shared Animals to match Server Hopefully also resolve merge conflicts. * Fix incorrect filename * Update with requested changes Put UdderSystem dependencies in alphabetical order. Initialise NextGrowth for Udder and Wooly components on MapInitEvent. Clean-up EggLayerSystem a little. Re-write OnExamine function for UdderSystem, improving clarity. Add full stops to end of udder examine locales. And more :) * Add some additional descriptions for cow hunger levels. * Add Udder and Wooly quantity to AutoNetworkedField * Account for less than starving threshold. --------- Co-authored-by: sirionaut <sirionaut@gmail.com> Co-authored-by: Sirionaut <148076704+Sirionaut@users.noreply.github.com> Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
* No more teleporting pulling * pulled dash * Update Content.Shared/Ninja/Systems/DashAbilitySystem.cs Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Update Content.Server/Implants/SubdermalImplantSystem.cs Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* add hold sprites for lizard plushie * make the lizard plushie sprites slightly chonkier for those who are not wearing winter clothes. * me when i hit the noise button and pretend it's shading. * lizard plushie is not legally-distinct green dinosaur with a long tongue™ (front sprite tongue has been shortened) * update meta.json
* Makes admins not count towards the playercount cap * Update Content.Shared/CCVar/CCVars.Admin.cs (thx Aeshus Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com> * Actually fixes whitespace on the comments Thanks VScode very good IDE --------- Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
* Initial commit * hoili moili * now to add sherlock and doctor who * funny stick * Oops it was meant to be called metaphysical * Attribution * Even BETTER attribution
Added explosion resistance to secbelt
* chemmaster buffer has colors now * I have saved chemists everywhere * implimented panelcontainers instead of labels, slight visual rework * added UI changes to input buffer * fixed some unsightly indentation on brackets and removed redundant minheight specification from verticalstretch elements * Formatting and code cleanup * pills still not rendering correctly * more tinkering, entities finally display correctly * entities display correctly, pill fields default to max now * fixed stripes * fixed excess pillCount bug * removed cache, fixed tab swapping --------- Co-authored-by: Saphire <lattice@saphi.re>
* make spaceshroom cookable on grill * remove microwave recipe
* 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>
KeldWolf
requested review from
spanky-spanky,
DieselMohawk and
FluffMe
as code owners
github-actions
bot
added
S: Needs Review
|
RSI Diff Bot; head commit 6dc65f0 merging into cd4e517 Resources/Textures/Objects/Consumable/Drinks/lemon-lime-cranberry.rsi
Resources/Textures/Objects/Consumable/Drinks/zombiecocktail.rsi
|
spanky-spanky
previously approved these changes
Dec 19, 2024
DieselMohawk
previously approved these changes
Dec 19, 2024
|
The test fail isn't real and cannot hurt you. |
Fixed integration tests part I didn't save locally for the merge. Signed-off-by: Kelderan <66748890+KeldWolf@users.noreply.github.com>
KeldWolf
dismissed stale reviews from DieselMohawk and spanky-spanky
via
6dc65f0
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.
Routine Upstream merge for Dec. 19, 2024