mirror of
https://github.com/DeltaV-Station/Delta-v.git
synced 2026-09-30 08:07:28 +00:00
ebc0340fc9bbde5fbdeaac4e50dc5628ad18357f
13
Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
  Brandon LiandJanet Blackquill
|
e2f5f4b7fa |
StyleNano removal: Palette system and Sheetlets (#29903)
* Apply patch https://github.com/moonheart08/space-station-14/compare/1777eea9a42a8bdbc4a865327bb9ef3e10fe57de..6b32bb2b148ef9d312b5332ccea4d8688694dba5 Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * make red squiggly line go away Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * Add todo list Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * Add palette to `TextureButton` Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * Rename `PalettedButtonSheetlet` to `NTButtonSheetlet` and move useful methods to `ButtonSheetlet` Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * migrate `ContextMenu` styles Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * Update todo Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * tweak NT colors * New stylesheet: `InterfaceStylesheet` & `InterfaceTooltipSheetlet` * Move inheritance of `IButtonConfig` to `NanotransenStylesheet.Buttons` * move `MenuButtonSheetlet` & actually implement `InterfaceStylesheet` correctly Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * tweak color & update todo Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * chat is this real (update chat palette) Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * Update todo Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * `SmallButton` and remove some obsolete things from `StyleNano` Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * rename `StyleClasses` to `StyleClass` so `Stylesheets.Redux.StyleClasses` syntax is dead Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * replace `ButtonColorGreen` with `Positive` Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * `Placeholder` Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * Examine popup buttons Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * move over more things & cleanup `StyleNano` more (under 1000 lines!!!!) Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * Remove some more redundant stuff Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * Undo style change for chat window Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * paper editing works now Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * `OptionButton` styles Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * `ListContainer`, move `DefaultWindow` styles (for now) & more cleanup Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * fix `ActionButton` not having highlighting Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * remove imports of `Robust.Client.UserInterface.StylesheetHelpers` & format Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * `ButtonBig` and more cleanup Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * Move items inheriting from `ISheetletConfig` into their own directory Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * Cleanup & move `Label` styles Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * Action search box styles Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * Moved, stuff is Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * rename `LabelSubtext` to `LabelSubText` & move more stuff (were almost there!!) Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * yap & move over MORE stuff (just like one thing left!!!) Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * Change status classes to appropriate existing classes Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * remove remaining references to `StyleNano` Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * Fix some hardcoding & broken code, `GetFromControl` Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * Scrollbars! Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * chores Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * clean up `StyleClass.cs` Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * `ItemListSheetlet` refactor Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * more chores! Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * Consistency w/ directory structure Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * Move `MainMenuSheetlet` Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * `ColorPalette` Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * whoopsie Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * Remove most sheet-specific sheetlets Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * fix warnings, cleanup, & fix scrollbar (this is why we fix warnings boys) Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * yap Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * MASSIVE resharper skill issue Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * actually use `ISheetletConfig` Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * have specific sheetlet be specific Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * `GetResourceOr` Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * cleanup & move / remove `IPalette`s Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * actually do specific stylesheets correctly & fix tooltips Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * cleanup & logging Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * Move `FontKind` and `FontKindExtensions` to their own files Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * rename `InterfaceStylesheet` to `SystemStylesheet` Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * change `ButtonHovered` etc to `PseudoHovered` etc Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * give the palettes fun names Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * `StyleSpace` is no more Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * It should compile now! I am now going to bed (fr) if it fails it fails Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * make squiggly red line go away Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> * add additional type restrictions to sheetlets * `CommonStylesheet` * minor cleanup * Make `GetSheetletRules` not horrible * wait this was duplicating style rules. oops! * move some sheetlets to their associated xamls * oh wait apparently that was important * review pass 1 * review pass 2 (font & color stuff) * review pass 3: remove unused stuff / filename fix * fix warnings & "replace cast with explicit variable type" * move `Palette` stuff to its own directory * tweak colors (they're different now that I actually fixed the OKlab thing) * review pass 4: little things * make window close button grey before hovering * refactor `HLine` to make it less terrible and allow it to be styled * fix `NanoHeading` (it's been broken for a while whoops) and cleanup hardcoding * band-aid missing references in `StyleNano` * move `StyleBox` generating functions out of `IButtonSheetlet` into `StyleBoxHelper` * remove dictionary field from `IStylesheetManager` * Add check for unloaded sheetlets * style tweaks to satisfy OCD * I somehow missed this: `Caution` styleclass replaced with `negative`, refactor `PowerChargeWindow` * tweak palettes for like the fourth time * construct `StyleNano` / `StyleSpace` in `StylesheetManager` and mark them as obsolete * rename `BackgroundPanel` classes for consistency * tweak window / `ListContainer` * oh right you use `///` not `/**` * font system is bad, make it temporary * acknowledge Divider funkyness * remove use of class `Disabled` * `ColorPalette` allow overriding colors with brace initialization * review pass again * tweak disabled button colors * `StatusPalette` tweaks * typo * Make squiggly red line go away * Delete `Redux` * Remove all references to `Redux` * make red less radioactive * Store stylesheet name inside stylesheet class * fix merge errors * use RT's Oklab support instead * shuffle around `StylesheetManager` fields * apply stylesheets based off `StylesheetComponent` * simplify `ColorPalette` construction * add todo for `SheetletConfigType` * `OptionButton` has a background color now * fix disabled buttons * sigh (red color palette fixed) * make `ItemList` use primary palette * Revert "apply stylesheets based off `StylesheetComponent`" This reverts commit c05b147da845f6e04ff33d1cbd91a18a92c676d7. * dead code removal * buttons are green when pressed (we need togglebuttons) --------- Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com> Co-authored-by: Janet Blackquill <uhhadd@gmail.com> |
||
  
|
29e55b9464 |
Upstream Merge (June / July) attempt 2 electric boogaloo (#4607)
* Fix the sensor monitoring console forcing a GC every 3 seconds (#38146) * Optimize sensor monitoring window graph drawing * Add shared static Vector2 pool for all GraphView instances * Address requested changes * remove lock * Update submodule to 264.0.0 (#38629) * Toy/Plushie Inhands and Wearables (#38514) * Fixed dependency injection and some other issues in a few places. * More issue fixes * patchfor broken NetworkConfiguratorLinkMenu (#38632) fix * Fix solutions flickering when transferring contents (#34838) * Use Solution clones when applying SolutionComponent states * Revert "Use Solution clones when applying SolutionComponent states" This reverts commit 013fd111cf92b22562e00f98a7aaa49bc4b4ed62. * Make Solution implement ICloneable and rename Clone method. * Copy CanReact value when cloning a Solution * Convert to IRobustCloneable * Fix typos in guidebook: Buisness → Business (#38636) * Fix typo in `MinorAntagonists.xml` Buisness → Business * Fix typo in `YourFirstCharacter.xml` Buisness → Business * Various Headphones Fixes and Tweaks (#38479) * sprites, wearables * neck * icon-on sprite * Cleanup prototype instantiation in `DamageTest` (#38639) Cleanup prototype instantiation in DamageTest * Cleanup prototype instantiation in `ExplosionSystem` (#38642) Cleanup prototype instantiation in ExplosionSystem * AddBodyPartCommand localization. (#38612) commit * fix ItemSlotsSystem debug assert (#38655) * Allow the Command & Super door remotes to use the access of their user. (Re-creation of PR due to changes to game balance) (#35536) * Added directional beacons (#38284) * Added directional beacons Signed-off-by: Nox38 <nebulousnox38@gmail.com> * Fixed names Signed-off-by: Nox38 <nebulousnox38@gmail.com> --------- Signed-off-by: Nox38 <nebulousnox38@gmail.com> * Power stat and nuke codes commands get some LEC love. (#38585) * commit * requested changes. * Dsay Dirty and Follow commands converted to LEC and localized. (#38666) * commit * whoopwhoopwhoop * Retro laser sprite fix (#38676) * Fixed everything except the icon Signed-off-by: Nox38 <nebulousnox38@gmail.com> * fixed icon Signed-off-by: Nox38 <nebulousnox38@gmail.com> --------- Signed-off-by: Nox38 <nebulousnox38@gmail.com> * fix water coolers (#38681) * Monochromacy typo fix (#38686) * fixes the typo * Fixed cloning looking for the trait, not the component, RE https://github.com/space-wizards/space-station-14/pull/38686#issuecomment-3025093504 * Apply suggestions from code review --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Validate `CloningSettingsPrototype`s (#38688) * Validate CloningSettingsPrototypes * Update Content.IntegrationTests/Tests/Cloning/CloningSettingsPrototypeTest.cs Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Check EventComponents too --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Add test of objective-related console commands (#36400) * Add test of objective add/list/remove commands * Not sure why we're validating test prototypes, but sure * We don't need a map * Improvements and fixups for New Status Effect API (#38660) * Predict healing and bloodstream (#38690) * initial commit * reapply 38126 * fix rootable * someone missed an important minus sign here * try this * fix * fix * reenable crit hits * cleanup * fix status time dirtying * fix * camelCase * Healing and bloodstream prediction fixes. * Resolving Wizard casting recall on nuke disk making it impossible to disarm (#38661) * Resolving Wizard Recall on Nuke disk making it impossible to disarm - Adding a DisarmBomb case to nuke status update loop - Changing a few methods and parameters to properly follow formatting standards - Updating some names to follow camelCase * Updating missed tag * Reverting DataField change Should prevent this preventative bugfix being a breaking change. * Switch HSV to the default colorspace for character customization (#38434) * Made HSV default for character editor * Adds/fixes comments to HSV defaulting * Added dropbox fix, potentially cursed * Revert "Added dropbox fix, potentially cursed" This reverts commit a709883366fbee813e839742125e70844672af29. --------- Co-authored-by: TrixxedHeart <46364955+TrixxedBit@users.noreply.github.com> * Fix: Don't deploy foldables when clicking on items inside containers (#38709) * Fix * Apply suggestions from code review --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Pressure Relief Valve (#36708) * initial system (this math is probably WRONG) * General code cleanup and OnExamined support (holy moly this code sucks) * UICode and related events foundation TODO: - Actually write the XAML UI and the underlying system - Un-shitcode the entire thing - Actually test everything... * Working UI code TODO: Make predicted, as this certainly isn't predicted. Even though I said it was. It isn't. * Remove one TODO for unshitcoding the examine code * Add reminder yea * Make predicted (defenitely isn't) (also defenitely isn't a copypaste from pressure pump code) * It's predicted! TODO: - Give it snazzy predicted visuals! - Have a different field for pressure entry, lest it gets bulldozed every UI update. * Improve gas pressure relief valve UI TODO: Reminder to reduce amount of dirties using deltafields * Implement DirtyField prediction * Entity<T> cleanup A lot of Entity<T> conversions and lukewarm cleanup. Also got caught copy pasting code in 4K UHD but it's not like you couldn't tell. * More cleanup and comments * Remove TODO comment on bulldozing window title * """refactoring""" - Move appearance out of shared and finally fix it. Pointless to predict appearance in this instance. - More Entity<T> conversions because I like them. - Move UI creation handling over entirely to the ActivatableUI system. - Fix a hardcoded locale string (why????). * Add visuals * Revert debugging variable replacememt yea * Revert skissue * Remove unused using directives and remove TODO * Localize, cleanup, document * Fix adminlogging discrepancy * Add ability to construct, add guidebook entry * Clear up comment * Add guidebook tooltip to valve * Convert GasPressureReliefValveBoundUserInterface declaration into primary constructor * Adds more input handling and adds autofill on open * Un-deepfry input validator shitcode Genuinely what was I smoking * improve visuals logic * Refactor again - Update math to the correct implementation - Moved code that could be re-used in the future into a helper method under AtmosphereSystem.Gases.cs * I'm sorry but I hate warnings * Remove unused using directive in AtmosphereSystem.Gases.cs * Review and cleanup * Lukewarm UI glossup * Maintainer for the upstream project btw * Remove redundant state sets and messy logic * Unduplicate valve updater code * Redo UI (im sorry Slarti) * run tests * Test refactored UI messaging * Second round of UI improvements - God please find a way to improve this system. Feels bad. * Update loop implementation * Further predict UI * Clear up SetToCurrentThreshold * cleanup * Update to master + pipe layers and bug fixes want to run tests * fixes * Deploy rename pipebomb * Documentation and requested changes * Rename the method that wiggled away * Undo rounding changes * Fix comment * Rename and cleanup * Apply suggestions from code review --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Fix TextLinkTag (#32203) * Adjust uplink buy button to be under item icon (#38596) * Adjusted uplink buy button to be under item icon * Put the discount subtext under the icon * Indent fixes, added margin --------- Co-authored-by: TrixxedHeart <46364955+TrixxedBit@users.noreply.github.com> * Scurrets - Audio Improvements (#38482) * Scurret audio tuning * Add new sfx * Update sneezing sfx * YAML support * Rename a folder * make telesci wreck easier (#37569) rel * Validate `ShaderPrototype` IDs (#38728) * Convert all shader prototype string literals to protoids in overlays * Convert more shader prototype literal strings to protoids * Convert ValidatePrototypeId to ProtoId * Later * [BUGFIX] Fixed revenant malfunction ability not working properly only MediBots and Stasis bed (#38664) * fixed * clean up * orks fix smart * review fix 1 * more requested changes * less cursed * more descriptive description * better wording * Tiny Tiny Cleanup of the EyeClosingSystem. (#38734) Update EyeClosingSystem.cs * Fix human skin tone distribution (#38701) * fix: Use PredictedQueueDel for gib spell (#38729) * fix: don't default to uncharged sprite state for cells (#38730) * Fix Hristov description - remove inaccurate technical specs (#38746) - Removes inaccurate 'armor piercing 14.5mm shells' reference - Replaces it with a more funny description, matching the style of the other snipers and guns - Keeps ammunition type '.60 anti-materiel ammo' specification - Fixes issue #38590 Co-authored-by: Arthur Fiorese de Andrade <aandrade@cmcxs.gov.br> * feat: allow mopping evaporating puddles (#38743) * Validate remaining `ProtoId` strings (#38747) Validate remaining ProtoId strings * Validate `ProtoId`s in tests (#38745) * Convert string literals to protoids in Content.Tests * Convert string literals to protoids or consts in Content.IntegrationTests * Fix linter failures Tricksy static using misled me * Cleanup warning in StomachSystem (#38748) you did not see this * Vox scars (#38592) * Added vox scars n'stuff, renamed vox_tattoos.ftl to just vox.ftl * Revert "Added vox scars n'stuff, renamed vox_tattoos.ftl to just vox.ftl" This reverts commit c73da55ba3b39ddf93b493aecd85604c54dd8a15. * locale key fix * Changed top surgery scar names to be more generalized * Adjusted face scars * Formatting fixes --------- Co-authored-by: TrixxedHeart <46364955+TrixxedBit@users.noreply.github.com> * UnlockNode command to LEC. (#38751) * commit * Update UnlockNodeCommand.cs * commit * move command locale to its own file. * Update Content.Server/Xenoarchaeology/Artifact/UnlockNodeCommand.cs --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Typofixes for figurine dialogue (#38737) * Typofixes for figurine dialogue * Forgot two * Janitor Tool: Wire Brush (#38667) * Wow! It's -brush- * spacing. * Update Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Update Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * fixed changes --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Minor escape menu UX improvements (#38650) * fix: spellbooks can have infinite charges (#38376) * fix: spellbooks can have infinite charges * refactor: indicate infinite spellbook charges with null Not sure if I like this much better... |
||
 Kyle Tyo
|
965ec9269d |
Command resolve killing, LEC conversions, and general cleanup. (#38338)
* i'm just gonna put this here. * I'm just gonna do it. * Update ShowHTNCommand.cs * I feel dumb. * may as well with this too. * this does in fact not work * :/ |
||
 Kara
|
b93f956353 |
Resolve 'EntitySystem.Get<T>()' is obsolete in content (#27936)
* PROJECT 0 WARNINGS: Resolve `'EntitySystem.Get<T>()' is obsolete` in content * pass entman * dog ass test * webeditor |
||
 Pieter-Jan Briers
|
ccea85136b |
Random spontaneous cleanup PR (#25131)
* Use new Subs.CVar helper
Removes manual config OnValueChanged calls, removes need to remember to manually unsubscribe.
This both reduces boilerplate and fixes many issues where subscriptions weren't removed on entity system shutdown.
* Fix a bunch of warnings
* More warning fixes
* Use new DateTime serializer to get rid of ISerializationHooks in changelog code.
* Get rid of some more ISerializationHooks for enums
* And a little more
* Apply suggestions from code review
Co-authored-by: 0x6273 <0x40@keemail.me>
---------
Co-authored-by: 0x6273 <0x40@keemail.me>
(cherry picked from commit
|
||
|
Pieter-Jan Briers
|
973d06aea5 |
Use item status extension method (#23884)
Just removes some lines of code.
(cherry picked from commit
|
||
 Leon Friedrich
|
bc75826187 |
Try fix invalid entities in device networks (#22845)
* Try fix invalid entities in device networks * more fixes * a * fix device merging |
||
 DrSmugleaf
|
9cc8a7fc81 | Remove 700 usages of Component.Owner (#21100) | ||
 Leon Friedrichandmetalgearsloth
|
cd2489bff4 |
Action container rejig (#20260)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> |
||
|
DrSmugleaf
|
c71f97e3a2 | Refactor actions to be entities with components (#19900) | ||
|
Leon Friedrich
|
ef0248cd78 | Remove static ILocalizationManager resolves. (#17392) | ||
    
|
6ebd784cb6 |
Device Linking and better linking ui (#13645)
Co-authored-by: AJCM-git <60196617+AJCM-git@users.noreply.github.com> Co-authored-by: Visne <39844191+Visne@users.noreply.github.com> Co-authored-by: ElectroJr <leonsfriedrich@gmail.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> |
||
 Flipp Syder
|
9ace52a6c1 |
Device link visualizer (#11054)
* shuffles devicelist to shared, adds an overlay for devicelist * adds space property to overlay * moves networkconfigurator to shared, makes devicelistsystem clientside check activedevicelist * dirties components upon change, adds networkedcomponent to sharednetworkconfigurator * state handlers for networked components * whoops * lots of shuffling, renaming, and access changes * randomizes color for every new entity added to the overlay * adds a client-side action to clear all network overlays if they're active * clones action (oops) * localization, adds a command for clearing network link overlays (in case the action disappears) * moves the entity manager up into the bui fields * makes that a dependency * attempts to just directly get the color from the dict when drawing, now * fixes up a few comments * adds dirty on init to devicelistcomponent * hacky solution related to mapping with a networkconfigurator * more stricter bound on that hacky solution * just checks if the life stage is initialized instead of if the entity was initialized * moves getalldevices to shared * readds linq import * tries to ensure that the show button is toggled on if the device we're trying to configure is currently being tracked by the overlay * some reorganization |