mirror of
https://github.com/DeltaV-Station/Delta-v.git
synced 2026-10-02 00:57:26 +00:00
94de555aa78be209933c0e50c9d843d719eaa915
3
Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
 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> |
||
 FruitsaladandPrincess Cheeseballs
|
036ed50b6e |
Cryo pod UI (#41850)
* Add CryoPodWindow (placeholder) * Change HealthAnalyzerWindow: split off reusable HealthAnalyzerControl for cryo pod UI * Improve CryoPodWindow: add health analyzer * Improve CryoPodWindow: add eject button This wasn't requested in the issue but I implemented it as practice with the UI system. * Rewrote GasAnalyzerWindow, split off reusable gas mix viewer for cryo pod * Change GasAnalyzerWindow: change back to three columns With two rows you get a layouting bug when there's a lot of different gases, which looks somewhat bad. I didn't feel like fixing the layouting bug (it's an engine issue) so we're going back to three columns. That way you don't ever get two rows in practice. * Change GasAnalyzerWindow: simplify by disabling Resizable I added a lot of complexity to make resizable work nicely with a derived max & min size, but it's not necessary. * Change GasAnalyzerWindow: file-wide namespace * Change GasAnalyzerSystem: add GenerateGasMixEntry * Split HealthAnalyzerUiState from HealthAnalyzerScannedUserMessage * Rewrote CryoPodWindow, add atmos info * Improve CryoPodWindow: add loading placeholder * Improve CryoPodWindow: add internationalization support * Fix GasAnalyzerControl: add missing translation * Improve CryoPodWindow: add beaker info, high temperature warning * Improve CryoPodWindow/System: inject button in window + necessary system changes * Fix CryoPodWindow: Entering cryopod now closes window This way you can't heal yourself with a cryopod. * Change CryoPodWindow: add & update comments * Change HealthAnalyzerComponent: remove `uiKey` property (no longer necessary) * Tiny fixes * Improve CryoPodUiMessage: replace string with enum * Change GasAnalyzerWindow: simplify Measure code * Change CryoPodComponent: rename Injecting to InjectionBuffer * Change CryoPodBUI: tiny code simplification * Fix HealthAnalyzerComponent: Removed stray import * Improve CryoPodWindow: Prettier, concise atmos * Improve CryoPodWindow: Chemicals bar chart * Improve CryoPodWindow: Add Ruler to reagents * Change CryoPodWindow: More horizontal layout * Improve CryoPodWindow: Reduce height jiggling The health analyzer's height changes a lot, which can be annoying with the buttons (for example when the oxygen damage label is popping in and out) * Improve CryoPodWindow: Add setup checklist This is mostly here to fill vertical space in the new horizontal layout. * Improve CryoPodWindow: Eject beaker button * Improve CryoPodWindow: Localization * Improve CryoPodWindow: Add BeakerBarChart An animated version of the chemicals chart * Fix CryoPodSystem: Ejecting beaker no longer clears injection buffer * Improve BeakerBarChart: Not animated on first frame * Fix CryoPodWindow: Fix broken translation * Improve CryoPodWindow: Reorder sections * Fix BeakerBarChart: Tooltips now show up * Change BeakerBarChart: Reorder functions * Change CryoPodWindow: Reorder sections, change margins * Change CryoPodWindow: Edit flavor text * Revert changes to GasAnalyzerWindow Since GasAnalyzerControl is no longer used in CryoPodWindow, these changes are no longer relevant to this PR. * Tidy CryoPodWindow: Remove old workarounds These are old layouting bug workarounds from the older version of CryoPodWindow that had a ScrollContainer in it. They're no longer necessary. Less ScrollContainers less problems. * Tidy up: Remove unused imports * Remove LabelledSplitBar It was replaced by BeakerBarChart, which is a lot fancier. * Tidy up: Tiny code style fix * Change CryoPodSystem: Move code from server to shared This is still without adding UI prediction * move a ton of stuff to shared. * one last thing * Improve BeakerBarChart: Keep visual entry width when swapping beakers * Improve BeakerBarChart: Respect beaker order of reagents * Improve CryoPodWindow: Ensure space for injection buffer We need to keep space on the chart for the injection buffer after swapping to a full beaker. * Improve CryoPodWindow: Prettier ejection error * Improve CryoPodWindow: Add "Cooling patient" status * BeakerBarChart: Fix UI scale bug * BeakerBarChart: Fix bluespace beaker ugliness * BeakerBarChart: Add more pod status strings * HealthAnalyzerControl: Filewide namespace, sort imports * Style fix: Replace `bool x = y` with `var x = y` * CryoPodUiMessage: Split off separate class for inject * SharedCryoPodSystem: Move message-related code into Subs.BuiEvents --------- Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com> |