-
Notifications
You must be signed in to change notification settings - Fork 373
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
HoP gets back his armored coat #570
Merged
Colin-Tel
merged 3 commits into
DeltaV-Station:master
from
Adrian16199:HoP-armour-in-locker
Dec 21, 2023
Merged
HoP gets back his armored coat #570
Colin-Tel
merged 3 commits into
DeltaV-Station:master
from
Adrian16199:HoP-armour-in-locker
Dec 21, 2023
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
My beloved.
DEATHB4DEFEAT
changed the title
HoP gets back his amoured coat.
HoP gets back his armored coat
Dec 17, 2023
Colin-Tel
reviewed
Dec 21, 2023
Signed-off-by: Colin-Tel <[email protected]>
Colin-Tel
approved these changes
Dec 21, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fixed missing comment
DeltaV-Bot
pushed a commit
that referenced
this pull request
Dec 21, 2023
DebugOk
pushed a commit
to DebugOk/Delta-v
that referenced
this pull request
Jan 20, 2024
* HoP gets back his amoured coat. My beloved. * Update Resources/Prototypes/Catalog/Fills/Lockers/heads.yml Signed-off-by: Colin-Tel <[email protected]> --------- Signed-off-by: Colin-Tel <[email protected]> Co-authored-by: Colin-Tel <[email protected]> (cherry picked from commit e5141b7)
DebugOk
pushed a commit
to DebugOk/Delta-v
that referenced
this pull request
Jan 20, 2024
(cherry picked from commit 6ecfa78)
Timemaster99
pushed a commit
to Timemaster99/Delta-v
that referenced
this pull request
Aug 20, 2024
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)
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]>
LaryNevesPR
pushed a commit
to LaryNevesPR/Estacao-Andromeda
that referenced
this pull request
Jan 3, 2025
# Description 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)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
My beloved.
Why / Balance
I believe that drip is very important and HoP deserves the best.
Media
Changelog
Make sure to take this Changelog template out of the comment block in order for it to show up.
🆑