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

Make felinids scream in agony when sprayed with water. #556

Merged
merged 9 commits into from
Feb 12, 2024

Conversation

Adrian16199
Copy link
Contributor

@Adrian16199 Adrian16199 commented Dec 14, 2023

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

Why / Balance

Because thats how it should be

Media

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

Changelog

Make sure to take this Changelog template out of the comment block in order for it to show up.
🆑

  • add: Felinids now scream in agony from water.

Their screams will be heard thro walls and halls. You will hear a felinid scream in a shift atleast once. Their sheer agony.
@github-actions github-actions bot added the Changes: YML Changes any yml files label Dec 14, 2023
@Adrian16199 Adrian16199 marked this pull request as ready for review December 16, 2023 18:57
@DebugOk
Copy link
Contributor

DebugOk commented Dec 29, 2023

Does this not have the ability to trigger several times from a single spray?

@Adrian16199
Copy link
Contributor Author

Does this not have the ability to trigger several times from a single spray?

A probability was given and the 0.2 makes it so that it doesnt trigger (usually) the multiple screams, yes it makes the scream not always trigger but its better than to pretend that multiple screams constantly would be fine themselfs. Of course, I could not be a lazy idiot and make a cooldown system for it. However such thing should probably be done upstream.

@Adrian16199 Adrian16199 marked this pull request as draft February 1, 2024 11:44
@Adrian16199 Adrian16199 marked this pull request as ready for review February 5, 2024 12:03
@DebugOk DebugOk enabled auto-merge (squash) February 12, 2024 21:02
@DebugOk DebugOk merged commit 3b8c4a4 into DeltaV-Station:master Feb 12, 2024
10 checks passed
DeltaV-Bot pushed a commit that referenced this pull request Feb 12, 2024
@Adrian16199 Adrian16199 deleted the screaming_Pain_in_my_soul branch February 13, 2024 12:27
Timemaster99 pushed a commit to Timemaster99/Delta-v that referenced this pull request Aug 17, 2024
This will be my third sprite update pack for Harpies, with new sprites
courtesy of StillxIcarus (Discord). These include owl wings, and forked
tails. I've also personally made a new "Large Ear Tufts" variation. Many
sprites have been split between Huescale and Whitescale variations, with
Huescale offering greater variety of colors, while Whitescale offers
better pure whites(A notable weakness of having only huescale options
was that white winged harpies ended up a yellow-cream color).

Additionally, I have updated all of the Harpy Hardsuit and Softsuit
variations to now include **Wing Sleeves**, with some hardsuits even
having personalized color schemes for their sleeves, depending on how
important the wearer may be. Of course, all of the syndicate hardsuits
have received their own unique schemes for each suit, including for the
first time a species-specific Elite Syndicate Suit.

![image](https://github.com/user-attachments/assets/f4e90e0d-6869-47de-bd26-a6668f8e3e2b)

![image](https://github.com/user-attachments/assets/ecc98a25-936c-46a4-bddc-ff3a25b27b25)

Additionally, I am taking this as a convenient time to move a majority
of the Harpy files to the core EE Directory, as I am taking direct
responsibility for maintaining my creation here, rather than anywhere
else.

:cl:
- add: Harpy Update 3, New markings for Harpies, all new
species-specific hardsuit & softsuit variations that feature wing
sleeves.
ghost pushed a commit that referenced this pull request Aug 27, 2024
* Harpy Peacock Tail (#428)

Courtesy of @StillIcarus

This adds a new Peacock tail marking to Harpies. I'm also taking this
time to update them to the recent DeltaV changes to the birbs.

![image](https://github.com/Simple-Station/Einstein-Engines/assets/16548818/4f776006-700e-4d92-802c-03e6dd201491)

![image](https://github.com/Simple-Station/Einstein-Engines/assets/16548818/5fd143ab-069f-4d1c-b5e0-ee982a95b4b6)

The backside is semi cursed, but that's something I can't do within the
scope of this PR due to sprite system limitations that Death has planned
improvements for. Just ignore them. :)

Have a birb as consolation.

![faridaiscute](https://github.com/Simple-Station/Einstein-Engines/assets/16548818/09373a57-f32f-48eb-b52b-6d12143f62ff)

:cl: VMSolidus
- add: Peacock Tails have been added for Harpies

---------

Signed-off-by: VMSolidus <[email protected]>
Co-authored-by: Danger Revolution! <[email protected]>

* Birbs Have Wings Too (#477)

# Description

During PR #464, somehow Moth's got back their ability to move with their
wings whenever the gravity gets shut off. Well, I'm here to correct the
injustice by also putting it on Harpies. In fact, Harpies have a much
bigger claim to it, their wings are absolutely massive compared to
Moths.

# Changelog

:cl:
- add: Harpies remembered that just like moths; they also have wings,
and can zoom whenever the gravity turns off.

Co-authored-by: Danger Revolution! <[email protected]>

* Harpy Sprite Update 3 (#556)

This will be my third sprite update pack for Harpies, with new sprites
courtesy of StillxIcarus (Discord). These include owl wings, and forked
tails. I've also personally made a new "Large Ear Tufts" variation. Many
sprites have been split between Huescale and Whitescale variations, with
Huescale offering greater variety of colors, while Whitescale offers
better pure whites(A notable weakness of having only huescale options
was that white winged harpies ended up a yellow-cream color).

Additionally, I have updated all of the Harpy Hardsuit and Softsuit
variations to now include **Wing Sleeves**, with some hardsuits even
having personalized color schemes for their sleeves, depending on how
important the wearer may be. Of course, all of the syndicate hardsuits
have received their own unique schemes for each suit, including for the
first time a species-specific Elite Syndicate Suit.

![image](https://github.com/user-attachments/assets/f4e90e0d-6869-47de-bd26-a6668f8e3e2b)

![image](https://github.com/user-attachments/assets/ecc98a25-936c-46a4-bddc-ff3a25b27b25)

Additionally, I am taking this as a convenient time to move a majority
of the Harpy files to the core EE Directory, as I am taking direct
responsibility for maintaining my creation here, rather than anywhere
else.

:cl:
- add: Harpy Update 3, New markings for Harpies, all new
species-specific hardsuit & softsuit variations that feature wing
sleeves.

* White Dream Harpy Markings (#696)

ONIKS was kind enough to provide me with several new Harpy markings,
consisting of alternate Bat-wings, Haven Tail, Long Forked Tail, and
Swallow Tail. I have also taken the liberty of actually making a basic
set of "Bionic Wings", which are just a slightly edited version of the
"harpsuit" wing sleeve, including hardsuit lights. Unfortunately due to
limitations in the game's code concerning markings, I couldn't make the
lights use the unshaded shader. This limitation irritates me. I'll
probably fix that in a separate PR.

I actually also received a pack of Arachnid and Felinid sprites! But I'm
going to add those in a different PR entirely.

<details><summary><h1>Media</h1></summary>
<p>

Bionic wings

![image](https://github.com/user-attachments/assets/6acc64a9-be6b-435b-9c61-91287ef65c10)

Bat Wings

![image](https://github.com/user-attachments/assets/e44fe12e-8410-47ca-a4c1-5e644fd36b8a)

Haven tail

![image](https://github.com/user-attachments/assets/2adadcdd-04fc-458d-8491-61bd52a3b4d1)

Swallow tail

![image](https://github.com/user-attachments/assets/615391eb-0314-4e6d-a87b-101d0a307955)

Long Forked Tail

![image](https://github.com/user-attachments/assets/e3d672f7-b8cb-4497-a2a3-87d0c224847d)

</p>
</details>

:cl:
- add: The following new markings have been added for Harpies: Bat
Wings, Simple Bionic Wings, Haven Tail, Swallow tail, and Long Forked
Tail

* Split files

* Harpy Hotfix (Cherry-Pick Broke Things) (#570)

Captain's Carapace inherited HidesHarpyWings because wizden made it
parent off Large outerwear for reasons. I've moved HidesHarpyWings to
only LargeOuterwear that actually have harpy sprites so that this won't
happen again.

![image](https://github.com/user-attachments/assets/84ee06e3-eeeb-4193-8cb0-492bd1d3d82e)

![image](https://github.com/user-attachments/assets/ac9493b3-75e7-4696-b531-18b00d1332a5)

* Uncommented digitigrade inv template

* Removed duplicate locale entry

* Add comment

---------

Signed-off-by: VMSolidus <[email protected]>
Co-authored-by: VMSolidus <[email protected]>
Co-authored-by: Danger Revolution! <[email protected]>
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.

3 participants