Upstream merge - december edition #2669
Merged
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
* Init * fix * Atmosn't * ID fixes * locale
* reduce network burden of the hunger system * explicit start + last updated * remove auto reformat changes to otherwise untouched code add clamp helper * imagine making breaking changes, documenting them, and then not thinking to check the yaml * comments * Remove unused net manager in hunger system Remove lastAuthoritativeHungerValue from prototypes
* Only disable panicbunker for admins with AdminFlags.Admin * nicer curly braces
* Check buckle.BuckledTo value before hugging interaction * Make InteractHandEvent to be used by BuckleSystem before InteractionPopupSystem instead of after
* 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 <[email protected]> Co-authored-by: slarticodefast <[email protected]>
* 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
* 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 <[email protected]>
…#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 <[email protected]>
* Omega Update (Localized Holopads) Replaced all holopads with localized versions and a couple tiny misc * Remove engi protolathe * Forgot to rename engi fax whoops
* 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 4f44d0673e0a597bea39c594f5b7ace3069433ea. * fic the entire thing again
|
Think this looks pretty good. I'll need to check the migrations work, setting up a postgres install at the moment. A few issues to note for afterwards:
|
we have some big plans to use these very heavily, but you are correct that they need some work. I believe we decided to do the changes in a PR outside of this one so its better atomized, commented, and the design around them specifically can be discussed |
|
Database upgrade seems to work without issue using postgres 17. |
whatston3
approved these changes
Jan 16, 2025
|
Thing to note with the borg type switching, the Cad has medical borg parts mapped on it. |
They'll be migrated to standard borg parts. If the person that takes over the ghost role really wants to be a salvage borg, you now have a salvage chassis. Edit: proof |
|
While at that, mind adding a positronic brain to the stuff on the ship? Without it you basically can't get the borg up and running without a scientist, at which point the borg shell is pointless. |
Out of scope for this PR, this ship already have a replacer PR open. |
Co-authored-by: Whatstone <[email protected]>
whatston3
approved these changes
Jan 17, 2025
|
good enough, rest in peace labeler, we'll fix you soon |
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.
Borg type was switched and allows borg type selection when spawning space-wizards/space-station-14#32586
PlayerBorgGeneric -> PlayerBorgBattery
Job-supervisors-hire was kept over the upstream ‘supervisors:’ name change to job-supervisors-rd
Industrial.yml - AdvancedToolsTechnology - removed borg modules, following upstream change.
Rehydratable.yml - Cube production parenting has changed and needs a quick code-check to make sure they have been properly merged.
Potato.yml - Capacitor - changed from tag to material - i updated the sprite to keep the NF version, double check it worksMeal_recipes.yml - recipes have been added - https://github.com/space-wizards/space-station-14/pull/33508/files
Lathe.yml - recipe added - SheetRGlassRaw - SheetRGlass is commented out - should this one be commented as well ?Yes - whatstoneShotgun.yml - BoxShotgunSlug and BoxShotgunUranium - Check if visuals are OK, check if type: Icon and type: MagazineVisuals potentially overlap?Identification_cards.yml - AgentIDCard - added ‘requireTag: WhitelistChameleonIdCard’ - whatever this means? Is it relevant, if not, comment out.it's good - whatstoneCheck gold ore in-hand item name, if it looks ok.
Food container sizes changed. I have done my best to make sure the new container sizes are correct. Could always give a look just to make sure i didn’t do a boo boo.
MobSpiderBase - should this be Carriable?
Borg_chassis.yml - please check for merge errors. Most of the code is overwritten and i chose upstream variant
Check borg access to doors to be sure it works and that they cannot go into SR room or whatever their access normally is.
Ion_storm.yml - I have no idea what this is and i just merged changes completely and totally normal.
Changelog - did i do it correctly ?
All CCVars need to be added again.. They split up the CCVars.cs into different files and currently CBA to one by one copy them over - need the merge fixed firstNeed to re- merge #1514 (Dvir) that add new pumps, because entire file has been reworked -> https://github.com/space-wizards/space-station-14/pull/33717/files#diff-115e07ec3b1bcb7ccec941814f53391d4d82636557312f5a536296bd6c0eee78L20-L26Test that gas pressure pumps start on map init where they have been set to start on map init.
ShuttleNavControl - Electric Bugaloo - CBA now, fix over next few days.PR: https://github.com/space-wizards/space-station-14/pull/31623/files