Skip to content
This repository has been archived by the owner on Nov 1, 2024. It is now read-only.

Upstream02052024 #109

Merged
merged 28 commits into from
May 2, 2024
Merged

Upstream02052024 #109

merged 28 commits into from
May 2, 2024

Conversation

Vonsant
Copy link
Collaborator

@Vonsant Vonsant commented May 2, 2024

About the PR

Why / Balance

How to test

Media

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog

VMSolidus and others added 27 commits May 2, 2024 00:37
* 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 <[email protected]>
Signed-off-by: Adrian16199 <[email protected]>

* Doin the changes.

* Renaming.

* Renaming notes.

---------

Signed-off-by: Adrian16199 <[email protected]>
Co-authored-by: Debug <[email protected]>

* 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 <[email protected]>

* "Fix felinid sprite shit"

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

---------

Signed-off-by: Adrian16199 <[email protected]>
Co-authored-by: Adrian16199 <[email protected]>
Co-authored-by: Debug <[email protected]>
* Update mailpod.yml

* Update mailpod.yml
* 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 <[email protected]>
Signed-off-by: Adrian16199 <[email protected]>

* Doin the changes.

* Renaming.

* Renaming notes.

---------

Signed-off-by: Adrian16199 <[email protected]>
Co-authored-by: Debug <[email protected]>

* 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 <[email protected]>

* "Fix felinid sprite shit"

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

---------

Signed-off-by: Adrian16199 <[email protected]>
Co-authored-by: Adrian16199 <[email protected]>
Co-authored-by: Debug <[email protected]>
@Vonsant Vonsant merged commit 7264ad9 into master May 2, 2024
13 checks passed
@Vonsant Vonsant deleted the upstream02052024 branch May 11, 2024 23:38
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants