Upstream sync #1869
Merged
Upstream sync #1869
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
* made hit sound logic potentially better * Function already tries all fallbacks, no reason to return bool * NoDamageSound execution path
* fix issue * fix fix * add space * really fix --------- Co-authored-by: metalgearsloth <[email protected]>
Not every mob needs to be able to pull, no, if you want it implement it manually.
* Add puller sanity test * weh * NRTs
* Added stonk pockets * Give me a little credit * Update Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json * Update Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json --------- Co-authored-by: metalgearsloth <[email protected]>
* Minor cloning change in guidebook Cloning this should be removed at some point anyway, but im unsure if it can still be found in salv? can anyone confirm? * Changes and updates to survival, removed fluff * Create TradeStation.xml * Forgor * Change hex * Rework this cause it was out of date * Pointless spacing fixed (copy and pasted made it funny,) * revert (somewhat) Science cant set up cloning, so i just removed that part * Remove more space
Fix spaceup flavor
In which I'm a goober and don't clean up after myself and accientally don't fix the issue I tried to fix in my last round restart PR. The audio is now maintained just like music during restarts (yippee to ContentAudioSystem::OnRoundRestart) This needs a refactor but at least the defect is fixed now.
* Make scarfs craftable Also sorted the lathe a bit because I like it when it looks nice. * reverts sorting
* We meet again, my old friend. * Helper property
* Various fixes * Fix bad ordering with scrambled law orders
Updated FollowerSystem's fix to use new helper property
* Pulling rework Fixing up the FOUR systems managing pulling, all the shitcode, and also making it nicer ingame. * More pulling cleanup * stats * More cleanup * First draft * More pulling * weh * Fix puller * Pulling working * Fix merge * Dunked * Self-merge time
* localize shuttle timer eta etd * remove soapy water for real
decouple panels and wires
Allows None to be selected
* Decoupled from gravity, constant animation time, manual networking, cubic interpolation * Reduced overshoot * Implemented PointAttemptEvent, reacts with mobstate & sleeping * Brains can no longer point, PBs must be inside a chassis * Removed chassis check, made callback more obvious
* Fix slip bug * debug assert * count * DebugAssert
…enu (#24895) Update weapons.yml Fixed incorrect path to the uranium spear image in the construction menu
* Moving Gibbing rework out from medrefactor into it's own PR * Re-enabled warning for missing gibbable on TryGibEntity * Implemented better logic for gibbing failover and better logging * Allowing audio params and drop scattering customization per component. Created UnGibbable organ base types and made brains ungibbable. Removed delete brain from gibBody function. Artifact crusher does not destroy brains anymore. It only destroyed brains before not other organs which was wierd. * Update Content.Shared/Body/Systems/SharedBodySystem.Body.cs Fixing space for multiplication Co-authored-by: metalgearsloth <[email protected]> * Added event raised when attempting to gib contained entities to allow modification of allowed and excluded container ids * removing audioParams var from component (sound specifier includes it) * Fixing signature --------- Co-authored-by: metalgearsloth <[email protected]>
Fixing gibbing contents not respecting Include/Exclude container lists. This is currently unused
* Predict two-way levers Annoys me the rare occasions I touch cargo. Doesn't predict the signal but at least the lever responds immediately. * space * a
replace romerol with ambuzol
* Fix self emagging borgs * Add popup on self emag failure.
…entside (#24625) * Adds option to disable character names in chat/speechbubbles * Moved the coloring of names to clientside * Move string functions to SharedChatSystem to avoid duplicate code in SpeechBubble.cs * Changed to be put under Accessibility section * Cache CVar
Co-authored-by: PJBot <[email protected]>
* Replaced fixed drink glasses with metamorphic versions * Fine, no milkshake then
* resprites shuttle tiles * resprites shuttle floor tiles & adds grey/black shuttle tiles * attributions.yml update
# Conflicts: # Content.Shared/Preferences/HumanoidCharacterProfile.cs # README.md # Resources/Prototypes/Entities/Structures/Machines/lathe.yml # Resources/ServerInfo/Guidebook/Cargo/Cargo.xml # Resources/ServerInfo/Guidebook/Medical/Cloning.xml # Resources/ServerInfo/Guidebook/Survival.xml # Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/meta.json # Resources/Textures/Objects/Tools/t-ray.rsi/meta.json # Resources/Textures/Objects/Tools/t-ray.rsi/tray-off.png # Resources/Textures/Objects/Tools/t-ray.rsi/tray-on.png # Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/open.png
github-actions
bot
added
Status: Needs Review
Morb0
pushed a commit
that referenced
this pull request
Feb 15, 2024
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.
Описание PR
Медиа
Проверки
Изменения