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

Felinid (DeltaV Update) #1307

Merged
merged 4 commits into from
May 2, 2024

Conversation

dvir001
Copy link
Contributor

@dvir001 dvir001 commented Apr 29, 2024

About the PR

Updated Felinids to match DeltaV new stuff.

DeltaV-Station/Delta-v#865
DeltaV-Station/Delta-v#808
DeltaV-Station/Delta-v#666
DeltaV-Station/Delta-v#556

Why / Balance

Long time coming.

How to test

Spawn as Felinid

Media

N/A

Breaking changes

N/A

Changelog
🆑 DeltaV

  • add: Felinids now scream in agony from water.
  • tweak: Felinid's thieving gloves have been removed for Soft paws mechanic.
  • add: Added a speech bubble to felinids. Mraow!

Adrian16199 and others added 4 commits April 29, 2024 19:57
* Felinid changes.

A plan

* Just slappin it together

for a friend to see and help

* Somethin somethin

Cos I could be at yours on friday
Tonight's at the place we started
It's a long way back from sorry
But here I go ....
How does it feel, how does it feel
Just tell me something

I don't know what to tell you
I don't know what to say
I got into my head, i'm sorry i threw it away
But i'm so glad you came back, even through all the pain
Let me try and mend it, i can promise that i have changed
Oh, let me give you all of me
Can we just sort it out for real

* just makin this less messy.... I guess

* Just tell me somethin.

How does it feel, how does it feel.

* .

* cleaning....

* Makes it work. Yey.

* just a small change tbh.

* okay maybe just a bit.

* Hm, maybe....

* This feels bit better.

* hopefully fixes yaml linter

* Update Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml

Co-authored-by: Debug <49997488+DebugOk@users.noreply.github.com>
Signed-off-by: Adrian16199 <144424013+Adrian16199@users.noreply.github.com>

* Doin the changes.

* Renaming.

* Renaming notes.

---------

Signed-off-by: Adrian16199 <144424013+Adrian16199@users.noreply.github.com>
Co-authored-by: Debug <49997488+DebugOk@users.noreply.github.com>
It has bothered me and today felt like fixin it.
…-14#556)

* Make felinids scream in agony when sprayed with water.

Their screams will be heard thro walls and halls. You will hear a felinid scream in a shift atleast once. Their sheer agony.

* Giving probability as the best possible implementation as of now

---------

Co-authored-by: Debug <49997488+DebugOk@users.noreply.github.com>
Copy link
Contributor

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

Resources/Textures/DeltaV/Mobs/Customization/Felinid/felinid_tails.rsi

State Old New Status
felinid_fluffy_tail_rings Modified

Resources/Textures/DeltaV/Effects/speech.rsi

State Old New Status
felinid0 Added
felinid1 Added
felinid2 Added

@Cheackraze Cheackraze merged commit 1c649f3 into new-frontiers-14:master May 2, 2024
17 checks passed
FrontierATC added a commit that referenced this pull request May 2, 2024
Vonsant pushed a commit to Corvax-Frontier/corvax-frontier-14 that referenced this pull request May 2, 2024
* Felinid changes. (new-frontiers-14#666)

* Felinid changes.

A plan

* Just slappin it together

for a friend to see and help

* Somethin somethin

Cos I could be at yours on friday
Tonight's at the place we started
It's a long way back from sorry
But here I go ....
How does it feel, how does it feel
Just tell me something

I don't know what to tell you
I don't know what to say
I got into my head, i'm sorry i threw it away
But i'm so glad you came back, even through all the pain
Let me try and mend it, i can promise that i have changed
Oh, let me give you all of me
Can we just sort it out for real

* just makin this less messy.... I guess

* Just tell me somethin.

How does it feel, how does it feel.

* .

* cleaning....

* Makes it work. Yey.

* just a small change tbh.

* okay maybe just a bit.

* Hm, maybe....

* This feels bit better.

* hopefully fixes yaml linter

* Update Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml

Co-authored-by: Debug <49997488+DebugOk@users.noreply.github.com>
Signed-off-by: Adrian16199 <144424013+Adrian16199@users.noreply.github.com>

* Doin the changes.

* Renaming.

* Renaming notes.

---------

Signed-off-by: Adrian16199 <144424013+Adrian16199@users.noreply.github.com>
Co-authored-by: Debug <49997488+DebugOk@users.noreply.github.com>

* Fixes the 2 pixels in the fluffy tail. (new-frontiers-14#865)

It has bothered me and today felt like fixin it.

* Make felinids scream in agony when sprayed with water. (new-frontiers-14#556)

* Make felinids scream in agony when sprayed with water.

Their screams will be heard thro walls and halls. You will hear a felinid scream in a shift atleast once. Their sheer agony.

* Giving probability as the best possible implementation as of now

---------

Co-authored-by: Debug <49997488+DebugOk@users.noreply.github.com>

* "Fix felinid sprite shit"

This PR
DeltaV-Station/Delta-v@89383ab

---------

Signed-off-by: Adrian16199 <144424013+Adrian16199@users.noreply.github.com>
Co-authored-by: Adrian16199 <144424013+Adrian16199@users.noreply.github.com>
Co-authored-by: Debug <49997488+DebugOk@users.noreply.github.com>
Vonsant pushed a commit to Corvax-Frontier/corvax-frontier-14 that referenced this pull request May 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants