Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Shark Race - Feroxi #1669

Open
wants to merge 128 commits into
base: master
Choose a base branch
from

Conversation

BlitzTheSquishy
Copy link
Contributor

@BlitzTheSquishy BlitzTheSquishy commented Aug 23, 2024

About the PR

Adding a new race! One that as far as I recall its "type" not present in any English SS14 server, that being aquatic species.
The above statement isnt entirely true anymore, but still very little aquatic representation

ALSO!! FOR ANY FORKS THAT ARE NOT RUNNING ON APGL, you may also have the sharks, this is my consent here- uhhh you can also ask me on discord too if you need something more formal (Intended to be Dual licensed APGL and MIT)

Why / Balance

Well, we lack any true aquatic type species, though lizards can be argued to be semiaquatic in terms of salamanders, and aquatic markings, its not really versatile for the purpose of other aquatic types. Though the base of this race WILL be for sharks, they could very well be adapted to other fish, and even dolphins and whales if one so desired! Though I dont currently hold the skills to be able to make such markings to do this at this moment (or probably ever)
In terms of balancing

Technical details

Addition of a new system and component to allow for a somewhat unique mechanic for this race based on its thirst. Flipping the metabolizer when a certain point is met with the thirst threshold. (Credit to Milon and Orks for helping me here)
There is also a new feature courtesy of the above mechanic basically requiring it, and it making sense but it allows for an organ to use the organcomponent to state weather the given organ is able to be removed or not, And in this case it is the lungs. (Credit to Tadeo (funky staff member (i forgot rank oops)) for help with this one)

Media

image
image
image
image
image
Non-thirsty ^
image
Parched^

Requirements

  • I have read and I am following the Pull Request Guidelines. I understand that not doing so may get my pr closed at maintainer’s discretion
  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog

🆑

  • add: Feroxi are here! A collection of shark-like peoples, who can use Water Vapor instead of oxygen!

@github-actions github-actions bot added Changes: YML Changes any yml files Changes: Sprite Changes any png or json in an rsi labels Aug 23, 2024
Copy link
Contributor

github-actions bot commented Aug 23, 2024

RSI Diff Bot; head commit b87d326 merging into b2a1da2
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_DV/Effects/creampie.rsi

State Old New Status
creampie_feroxi Added

Resources/Textures/_DV/Effects/speech.rsi

State Old New Status
feroxi0 Added
feroxi1 Added
feroxi2 Added

Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi

State Old New Status
feroxi-arm-stripes-blitz Added
feroxi-arm-stripes-tiger Added
feroxi-head-stripes-tiger Added
feroxi-leg-stripes-blitz Added
feroxi-leg-stripes-tiger Added
feroxi-torso-countershading-f Added
feroxi-torso-countershading-m Added
feroxi-torso-stripes-blitz Added
feroxi-torso-stripes-tiger Added

Resources/Textures/_DV/Mobs/Customization/Feroxi/ear_markings.rsi

State Old New Status
feroxi-ears-inner Added
feroxi-ears-tips Added
feroxi-ears Added

Resources/Textures/_DV/Mobs/Customization/Feroxi/snout_markings.rsi

State Old New Status
feroxi-snout-countershading Added
feroxi-snout-nurse Added
feroxi-snout-stripe Added
feroxi-snout Added

Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi

State Old New Status
feroxi-dorsal-stripes Added
feroxi-dorsal-tip Added
feroxi-dorsal Added
feroxi-tail-bottom-tip Added
feroxi-tail-second-dorsal-tip Added
feroxi-tail-stripes Added
feroxi-tail-top-tip Added
feroxi-tail-under Added
feroxi-tail Added

Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi

State Old New Status
full Added
head_f Added
head_m Added
l_arm Added
l_foot Added
l_hand Added
l_leg Added
r_arm Added
r_foot Added
r_hand Added
r_leg Added
torso_f Added
torso_m Added

Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi

State Old New Status
equipped-BELT Added
equipped-SUITSTORAGE-cat Added
equipped-SUITSTORAGE-dog Added
equipped-SUITSTORAGE-fox Added
equipped-SUITSTORAGE-hamster Added
equipped-SUITSTORAGE-kangaroo Added
equipped-SUITSTORAGE-pig Added
equipped-SUITSTORAGE-possum Added
equipped-SUITSTORAGE-puppy Added
equipped-SUITSTORAGE-sloth Added
equipped-SUITSTORAGE Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi

State Old New Status
equipped-BELT Added
equipped-SUITSTORAGE-cat Added
equipped-SUITSTORAGE-dog Added
equipped-SUITSTORAGE-fox Added
equipped-SUITSTORAGE-hamster Added
equipped-SUITSTORAGE-kangaroo Added
equipped-SUITSTORAGE-pig Added
equipped-SUITSTORAGE-possum Added
equipped-SUITSTORAGE-puppy Added
equipped-SUITSTORAGE-sloth Added
equipped-SUITSTORAGE Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi

State Old New Status
equipped-BELT Added
equipped-SUITSTORAGE-cat Added
equipped-SUITSTORAGE-dog Added
equipped-SUITSTORAGE-fox Added
equipped-SUITSTORAGE-hamster Added
equipped-SUITSTORAGE-kangaroo Added
equipped-SUITSTORAGE-pig Added
equipped-SUITSTORAGE-possum Added
equipped-SUITSTORAGE-puppy Added
equipped-SUITSTORAGE-sloth Added
equipped-SUITSTORAGE Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi

State Old New Status
equipped-BACKPACK Added
equipped-SUITSTORAGE-cat Added
equipped-SUITSTORAGE-dog Added
equipped-SUITSTORAGE-fox Added
equipped-SUITSTORAGE-hamster Added
equipped-SUITSTORAGE-kangaroo Added
equipped-SUITSTORAGE-pig Added
equipped-SUITSTORAGE-possum Added
equipped-SUITSTORAGE-puppy Added
equipped-SUITSTORAGE-secdog Added
equipped-SUITSTORAGE-sloth Added
equipped-SUITSTORAGE Added
icon Added
inhand-left Added
inhand-right Added

Edit: diff updated after b87d326

@BlitzTheSquishy
Copy link
Contributor Author

Something about i like sharks, idk

draft pr cause im stupid and this will take me a while (as well as needing people help)

currently for a base uses a mix of human and vulpkanin stuff...

THIS IS DEFINITELY A MESS

@github-actions github-actions bot added the Changes: Localization Changes any ftl files label Aug 23, 2024
@BlitzTheSquishy BlitzTheSquishy changed the title Shark race delta v (oh god this is actual pain) locales are cool Aug 23, 2024
@BlitzTheSquishy BlitzTheSquishy changed the title locales are cool Shark race delta v (oh god this is actual pain Aug 23, 2024
@BlitzTheSquishy
Copy link
Contributor Author

oops

@jimmy12or
Copy link
Contributor

Oh! With rodents and IPCs likely joining in the near future, looks like the sharks have smelled the metaphorical blood in the water! Welcome, aquatic scaled friends!

@BlitzTheSquishy
Copy link
Contributor Author

Oh! With rodents and IPCs likely joining in the near future, looks like the sharks have smelled the metaphorical blood in the water! Welcome, aquatic scaled friends!

Been planning to get these added for AAAAGES

also as far as I can tell this would be the first for aquatic friendos to exist on any ss14 server (unless one of the russian ones already has akula)

@Tmanzxd
Copy link

Tmanzxd commented Aug 27, 2024

Do you have a list of items you want to complete for this Morphotype?

@BlitzTheSquishy
Copy link
Contributor Author

Do you have a list of items you want to complete for this Morphotype?

when i die :3

a few things

Damage resist/vuln are basically done
Suffocation when in that yellow tier of thirst
thorsty is also basically done

Not sure of upsides just yet

@github-actions github-actions bot added the Changes: Documentation Changes any xml or md files label Aug 27, 2024
@BlitzTheSquishy BlitzTheSquishy changed the title Shark race delta v (oh god this is actual pain Shark race delta v (oh god this is actual pain) Aug 27, 2024
@BlitzTheSquishy BlitzTheSquishy changed the title Shark race delta v (oh god this is actual pain) Shark Race - Feroxi Aug 28, 2024
@BlitzTheSquishy
Copy link
Contributor Author

I do need ideas for upsides!

@jimmy12or
Copy link
Contributor

Maybe able to sate hydration while in an area with water vapor? Very niche, I know but it would at least be something small that could be added.

@Tmanzxd
Copy link

Tmanzxd commented Aug 29, 2024

you could make them regenerate brute damage slightly faster

@ThataKat
Copy link
Contributor

Just updating you on where we're at,

This should be up for merge once we've had enough time to ensure Thaven is stable, since that's being merged shortly. We'll get back to you then. (If you really want updates you can ping me, I don't mind)

@github-actions github-actions bot added the S: Merge Conflict Fix your PR! label Feb 25, 2025
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the S: Merge Conflict Fix your PR! label Feb 25, 2025
@BlitzTheSquishy
Copy link
Contributor Author

correct me if im wrong for that last commit (i dont want people to profit off of the shargs (I cant relicense the parts that ive edited from so body sprites remain under the same license))

If this is not legally doable they can be reverted to their old license in that field.

@github-actions github-actions bot added the S: Merge Conflict Fix your PR! label Mar 1, 2025
Copy link
Contributor

github-actions bot commented Mar 1, 2025

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the S: Merge Conflict Fix your PR! label Mar 1, 2025
Copy link
Contributor

github-actions bot commented Mar 4, 2025

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the S: Merge Conflict Fix your PR! label Mar 4, 2025
@ThataKat
Copy link
Contributor

ThataKat commented Mar 4, 2025

We've started our final review, with intent to have this merged this weekend. Any final tweaks hopefully coming in the next 2-3 days

@github-actions github-actions bot removed the S: Merge Conflict Fix your PR! label Mar 4, 2025
@BlitzTheSquishy
Copy link
Contributor Author

Gonna throw in some extra markings as i feel im not doing our REALLY stripey friends justice.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: C# Changes any cs files Changes: Documentation Changes any xml or md files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files S: Needs Review size/XL Over 1024 lines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants