mirror of
https://github.com/DeltaV-Station/Delta-v.git
synced 2026-10-01 16:47:26 +00:00
daf03f45ede2b281c5bef207e3d5e4c4cc81cfcd
7
Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
  
|
abb13de3dd |
Move character preview handling into a specialized control (#41252)
* Move character preview handling into a specialized control Co-authored-by: Quantum-cross <7065792+Quantum-cross@users.noreply.github.com> * Restore job name that I accidentally removed from character picker buttons * Just resolve dependencies the standard way --------- Co-authored-by: Quantum-cross <7065792+Quantum-cross@users.noreply.github.com> Co-authored-by: Janet Blackquill <uhhadd@gmail.com> |
||
 BarryNorfolk
|
d62f7cef10 |
Revert "Nubody Merge" (#5807)
Revert "Nubody Merge (#5670)"
This reverts commit
|
||
    
|
b465cfb3fd |
Nubody Merge (#5670)
* Nubody (#42419) * Nubody * fix test fails * gibbing * lung test returns * doc comment * hand organ test * giblet test * yaml formatting * returning * relocate * trimming * re-smite * oops thusd tweak * arachnids have slower metabolism i guess * never mind the old behaviour is bad actually * rider whyyy * style changes and allat * fix collision --------- Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com> * C# files done * Visual nubody (humanoid appearance refactor) (#42476) * initial visual nubody * oops overlay * im so pheeming rn * conversion... * tests * comeback of the underwear * oops eyes * blabbl * zeds * yaml linted * search and visible count constraints * reordering * preserve previously selected markings colors * fix test * some ui niceties * ordering * make DB changes backwards-compatible/downgrade-friendly * fix things again * fix migration * vulpkanin markings limit increase * wrapping * code cleanup and more code cleanup and more code cleanup and more code cleanup and * fix slop ports * better sampling API * make filter work + use the method i made for its intended purpose * fix test fails real quick * magic mirror cleanup, remove TODO * don't 0-init the organ profile data * remove deltastates --------- Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com> * Let vox eat trash again (#42503) * C# complete port * Getting closer * Harpy Nubody Port * Port Feroxi, Kitsune. Fix some yml typos and remove ipcs stuff * Port Oni * Port Rest, except Motorkind * Port Motorkind * Remove more surgery, restore too much deleted stuff * Fix Typos and change some organ names. Need to split eyes next * Harpy HAve Wings again * Some fixes, More Surgeyr Removal, Copying of eye organs * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Use correct Body imports * Markings Refactoring, Harpy Layering * Motorkind doesn't crash anymore. Some layer remappings. * Allow Organs to have Markings Displacements again. (#43604) * first shtep * readd markings support --------- Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com> * Fix STalk eyes and several layerings * Fix sexed organs (#42554) * Fix markings for several species, fit them for sexed organs and rename some files to fit them for it * Additional IPC-related removals * Vulpkanin eyes are now correct again * Fix Subtle Cultist Marks on species * Fix Asakim Sprites (sexed) and make CD imports work * Migration, error fixes, and Height * Fix humanoid profile voice being broken (#42550) Fix humanoid appearance voice being broken * Change Kitsune SexChanged Event to with ref * Fix asakim issue, Respirator fix * Simplify hands UI code (#42534) * Simplify hands UI code * i remembered about SortedHands in the component * minor cleanup --------- Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com> * Set size of Analyzer back to 350, Kitsune can't gib themselves no more. Migration * yml linter errors and an rudimentary onAdd Organ Functionality * Fixing it trying to remove nothing * midpoint migration * Why do you put so many organs everywhere * More missing prototypes * Migration of more organs * Forgot lungs * Move character preview handling into a specialized control (#41252) * Move character preview handling into a specialized control Co-authored-by: Quantum-cross <7065792+Quantum-cross@users.noreply.github.com> * Restore job name that I accidentally removed from character picker buttons * Just resolve dependencies the standard way --------- Co-authored-by: Quantum-cross <7065792+Quantum-cross@users.noreply.github.com> Co-authored-by: Janet Blackquill <uhhadd@gmail.com> * Drop ICharacterProfile/ICharacterAppearance interfaces (#42661) * Ensure profile loading only returns valid species (#42842) (Stable merge) (#42865) Co-authored-by: pathetic meowmeow <uhhadd@gmail.com> * Changes to make it work for us. * No more bald Harpy * OperatingTables instead of null * Adding Delta V Comments, commenting out instead of deleting * Fix broken Height Scale. * Remove HumanoidSilicon Mention * Did an error. Readded, uncommented. * Clean up Marking data structure, add tests for Zombie transformation (#42756) * Clean up Marking data structure, add tests for Zombie transformation * empty * AAAAAAAAAAAAAAAA --------- Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com> * Fix markings colour setting (#42771) * Fix: Markings Color For Downstream * Comment out A Leg. Remove Todo * Revert to original hidden species code --------- Co-authored-by: pathetic meowmeow <uhhadd@gmail.com> Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com> Co-authored-by: Absotively <jen@jenpollock.ca> Co-authored-by: Quantum-cross <7065792+Quantum-cross@users.noreply.github.com> Co-authored-by: Myra <vasilis@pikachu.systems> |
||
 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> |
||
|
Absotively
|
0479936c5e |
Make CharacterPickerButton the same height for dwarves as for non-dwarves (#35297)
Character picker button height equality for dwarves |
||
  Pieter-Jan Briersandslarticodefast
|
18ec5acfdd |
Give silicons proper lobby/character editor previews (#33763)
* Give silicons proper lobby/character editor previews No more naked dummies, properly show a borg/AI sprite now. This means taking the JobEntity into account when spawning the dummy. For AIs I had to add a "JobPreviewEntity" field because they'd look like a posibrain otherwise. AI therefore uses a custom dummy entity I defined. Also I had to add some margins to the UI, because otherwise the 32x32 sprite of the AI would look bad. * Update Content.Shared/Roles/JobPrototype.cs * Update Content.Client/Lobby/LobbyUIController.cs * Update Resources/Prototypes/Entities/Mobs/Player/silicon.yml --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> |
||
 metalgearsloth
|
25ce6c531b |
Lobby refactor + species loadouts support (#27576)
* Vox stuff * Species loadouts and lobby refactor The control flow for lobby is all over the shop so I pulled it all up from the individual controls so now they handle the bare minimum required and LobbyUIController handles the rest. * a * Bulk changes * a * weh * Character import / export * finalise * woops this stuff too * Also datafield exporting * comments * Review |