Upstream sync #1712
Merged
Upstream sync #1712
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
* trash * fix * yellow * tweaks * blue light fix
* Artifact analyzer now pauses on power-loss Instead of just cancelling the current scan, the artifact analyzer will now pause in case of power-loss. Scanning will automatically resume when power returns. * Improve artifact scanning pausing This builds upon the latest improvements in artifact scanning regarding UI update.
Fix map not being displayed in lobby ui after map vote
Fixed sprites displaying for pinpointers
* bagel update * fix bagel apc light engi b4 woirk
* the grand l.ottery1!! * i love camel case
Chose a more appropriate welder attack noise.
* easynoodles * morenoodlepernoodle * bigcup
Fold cosmetic sunglasses into regular sunglasses.
Co-authored-by: Jeff <[email protected]>
* good commit * Revert "good commit" This reverts commit 2559a9ad8b642827446e151adc90057d667be60d. * EVEN BETTER PR * even more better
* seed * meta * tweak
* update cvars * vote 1984
* SS14-23184 Migrate Lathe Material Ejection Code to MaterialStorage The lathe material ejection code acts as a do-nothing man-in-the-middle system that does work that would be reasonable for any MaterialStorage-using machine to use. This has been fixed by migrating the ejection code to MaterialStorage, allowing anything that uses the system to eject mats it is storing. * Fix some YAML references. Science!!
* backspikes added * added backspikes to meta.json * fixed capitalization * fix attempt 2 * suffering * Revert "suffering" This reverts commit d9ee23ccd209e8de5b190668f3b795088e8ab139. * Balance is restored * Revert "Balance is restored" This reverts commit fa9b8168d461f8d5e92f2bbd1e1dd1417972ea05. * Revert "Revert "Balance is restored"" This reverts commit f0a809f258973e0605311250d969e0600a970ebc.
Update trashbag.yml Changed down to a reasonable amount.
cheaplasma Co-authored-by: metalgearsloth <[email protected]>
webedit ops
make flashes use range
* AAAAAAAAA * TBoI reference * really remove from cargo crate. redescription * pipi
command beacon recolor
Won't fix any crashes
Adds more Juice(ichor) per Dragon meat
Observation Kit
* implement * fix charges * add listing * fixes * fix locale, probably all done * fix * fix of fix * move query init * cleanup * unbrokey rt
* HellSpawn Mob * added spawner * summary for the namespace * larger collider, cannot enter single tile corridors. * fix * remove duplicate from yml, fix attributions. * moved action to shared, moved comp to shared, networked comp, separated heal, fixed attributions * removed flammable from hellspawn removed the healing effect from firestarter ability (healing can be separate ability). * Update attributions.yml fix attributions * fix * fix
* Adding PAI Slot to PDA * Update PdaComponent.cs * Update pda.yml * Update tags.yml Sorting it alphabetically * Adding PDA UI Elements. * Addressing reviews * Update PdaComponent.cs * Update Content.Shared/PDA/SharedPdaSystem.cs Co-authored-by: faint <[email protected]> * Update Content.Shared/PDA/SharedPdaSystem.cs Co-authored-by: faint <[email protected]> * Update Resources/Prototypes/Entities/Objects/Devices/pda.yml Co-authored-by: faint <[email protected]> * Update PdaComponent.cs * Update PdaComponent.cs --------- Co-authored-by: faint <[email protected]>
webedit ops
* Fix robusted dionas not being recoverable * Implement a polymorph cooldown field, used for TreeMorph Allows the polymorphed Diona some time to work off robust harvest without immediately polymorphing again. * Minor adjustment to polymorph cooldown timing * Apply suggestions from code review Co-authored-by: Kara <[email protected]> * fix: trigger polymorph revert on destruction As suggested by mirrorcult, DamageThresholdReached is not the ideal candidate for reverting a polymorph on destruction, as there exists a DestructionEventArgs to listen for instead. --------- Co-authored-by: Kara <[email protected]>
* PR 1 * fix an error with health bar overlay (#1292) * Revert "Revert "Replace `ResourcePath` with `ResPath` (#15308)" (#155… (#15566) * [1612] change ShowHealthBarsComponent's DamageContainer field to a list (#1662) * fix build * no crit entities from not updating * cleanup * namespace * undu irrelevant changes * undo icon change * make health bar 1 px taller and icon 1 px shorter * fix medibot * fix comment * don't show health bar ratio when in crit * fix build * put the crit bar back * don't render healthbars for mobs that are in containers * draw more boxes without the background sprite * fine status icon for all bio mobs * add wacky mandatory things * attempt 2 * whoops wrong file * cool, this works too * move null check to top * only 1 init * security huds * remove shader * fix build after cleanup * slight cleanup * little more cleanup * Remove clothing grant component system * security HUD now shows a job icon on entities with a body * remove sec stuff and do similar changes to split off PR + remove unused comp * process comments * don't return * update to ComponentAddedOverlaySystemBase * no cache * colors and not rendering out of sight * touch ups * fix build & cleanup * undo * remove shader from icons * process comments * documentation * fix licence * validate prototype id * just use args * rename method and append in method * type * just fucken delete the command * space * undo * remove * don't use LocalPlayer * re-add showhealthbars command, but working * rename icon lists and conform health icon code to the others * space * undo * update command * oops --------- Co-authored-by: Rane <[email protected]> Co-authored-by: metalgearsloth <[email protected]>
# Conflicts: # Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/jester.rsi/meta.json
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
Медиа
Проверки
Изменения