* ITS ALL C# GOOD LORD
BORN TO PORT
WORLD IS A PR
鬼神 Merge Em All 2025
I am yaml man
410,757,864,530 UPSTREAM MERGE CONFLICTS
* that was, uh. too easy.
* very small tweak
* comment and reuse fixes
* forgot the guidebook Oops
* the guidebookening
* the reusening
* Set up _Shitmed groundwork for organ slot manipulation
* Groundwork for surgical augments
* Add tool panel augments
* sprite gaming
* code review gaming
* i think the textures got swapped
* localization gaming
* surgery localization gaming
* crafting gaming
* fix tests
* fix tests actually
* now we deal with ouroboros
* she feed on my back til i
* relocation
* nuke felinid
* augment fixes
* event-based battery search
* descriptionned
---------
Co-authored-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>
* 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>
* full fucking send
* ope forgot to remove the EE scripts
* fix test
* fix shitcode fail
* DELTA THAT VALUE IS NULLABLE
* whoopsie daysie
* fixed???
* chat is this real
* dont allow attaching invalid limbs
* add more surgeries for organs and limbs
* fix harpies being immune to surgery
* update organs and shit
* make a bunch of animals operatable
* malf ai
* fix slime
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
Vanessa
KOTOB
deltanedas
pathetic meowmeow
Blitz
gluesniffler