Commit Graph
5 Commits
Author SHA1 Message Date
Coryler 7b939bfd28 Fix files for upmerge changes. Notably Nubnody and Damagaeable 2026-06-29 12:44:06 +02:00
BarryNorfolk d62f7cef10 Revert "Nubody Merge" (#5807)
Revert "Nubody Merge (#5670)"

This reverts commit b465cfb3fd.
2026-05-12 21:05:30 +00:00
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>
2026-05-12 21:55:29 +02:00
Vanessa 2b375b5132 Fixed LungComponent reference 2025-12-29 11:39:19 -06:00
Blitzanddeltanedas ab71941033 Shark Race - Feroxi (#1669)
* creating a race, even a base on is a living hell

* creating a race, even a base on is a living hell

* correcting some things

* added damage vauln and resistances (only slightly blunt and cold resistant while slash vaulnerable

* thorsty fimshy

* A bunch of things, theres an error sitting here with water

* BREATHING WATERgit push origin shark-race-realgit push origin shark-race-real

* Speech verbs, Typing indicatorm Entities and enabling certain markings

* Water Vapour minorly hydrates, much slower than water due to how breathing works over drinking

* slightly more damage to the bite, shorm have strong jaw

* i hate rsi

* i forgot to remove some ======= somewhere when rodentia were added

* funny

* and now fixing what i did

* stuff!

* PAIN AGONY RAH!

* Tweaks + new organ, setting up for C#

* So uh, C# is a bitch, but PROGRESS! WOO!

* Emotes stuff

* C# time, not 100% working but it does (somewhat)
function!

* Fixed feroxi dehydration! Now onto more minor things and sprites.
With help of Milon and Orks!

* shark spriting progress! Please give me tips and tricks for this shit, cause i have no fucking clue with spriting

* SHARK TAILS, LETS FUCKING GOOOOOOOOOOOOOOOOOOOOOOO

* Shark tails are DONE also some ftl, fuck you localization! I hate making things legible!!

* BASE SHARK TEXTURES ARE DONE, Now I just need to do markings.

* Minor edit

* pushing this before starting miniproject

* end of file line

Signed-off-by: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com>

* untouch

Signed-off-by: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com>

* cleanup

Signed-off-by: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com>

* cleanup

Signed-off-by: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com>

* cleanup

Signed-off-by: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com>

* spaces

Signed-off-by: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com>

* whatever milon is yapping about

Signed-off-by: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com>

* pain

* Update speech_verbs.yml

Signed-off-by: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com>

* cleaning

* Cleanup

* fix

* Update medicine.yml

Signed-off-by: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com>

* AAAA

* a

* ow

* revert that

* Small edit

* weh

* DeltaV -> _DV for system

* wups

* Shitmed fixes, Tail tweaks, XML tweaks

* WAter TANKS

* Sprites for water vapor tanks.

* More

* Normal water vapor survival boxes work now!

* Holy shit am I done (I still need to fix *gnashes)

* bleh

* Commenting as well as changing the component from Aquatic to Feroxi

* hiding feroxi lungs

* hiding feroxi lungs

* extended tank fix

* added a way to get H2O tanks outside of survival boxes

* lowercase and removing uneeded files

* Sharg wiff da underw ear

* Deltaneds review fix

* line that wasnt intentional to delete

* relicense sprites (i have gained permission from Emily9031 for their part)

* forgot this in merge fix

* Shark markings! Not just Blitz markings.

* scar markings as well as bionics

* review fixes

* Lyndo dv coment

* whitespace fix

* 4 tab

* forgor

---------

Signed-off-by: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com>
Co-authored-by: deltanedas <@deltanedas:kde.org>
2025-03-08 23:38:31 +00:00