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

Carpy the Legal Carp gets a suit for differentiation #1456

Merged
merged 14 commits into from Aug 12, 2024
Merged

Carpy the Legal Carp gets a suit for differentiation #1456

merged 14 commits into from Aug 12, 2024

Conversation

ghost
Copy link

@ghost ghost commented Jul 3, 2024

About the PR

Adds a RSI for the legal carp that adds a "suit" (big grey rectangle on the sprite) and a "tie" (barely see-able based on how carp coloring works.)
Furthermore, adds functionality for "BaseUnshadedAccessory" as a layer (thanks Timemaster!!!!)

Why / Balance

Wanted something that makes Carpy visually unique so that the local greytider doesn't kill him immediately because "CARP!!"

Technical details

RSI + meta.json + one line of YAML

Media

image
image

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

Breaking changes

Changelog

🆑 Adeinitas, Timemaster99

  • add: Gave Carpy the legal carp a suit or shirt.

adeinitas added 2 commits July 3, 2024 03:27
@github-actions github-actions bot added Changes: YML Changes any yml files Changes: Sprite Changes any png or json in an rsi labels Jul 3, 2024
@ghost ghost requested a review from deltanedas July 3, 2024 07:18
@ghost
Copy link
Author

ghost commented Jul 3, 2024

Deltanedas you're gonna love this one because it's fish

Copy link
Contributor

github-actions bot commented Jul 3, 2024

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

Resources/Textures/DeltaV/Mobs/Pets/lawyercarp.rsi

State Old New Status
alive Added
dead Added
dead_mouth Added
icon Added
mouth Added
suit Added
suit_dead Added

Edit: diff updated after aab1fac

@deltanedas
Copy link
Member

the suit is getting multiplied by the random colour which makes it very hard to see, put it in a separate layer (similar to how it uses an unshaded layer for glowing teeth)

Copy link
Contributor

@DangerRevolution DangerRevolution left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm on my phone so just check the indentation is correct

@github-actions github-actions bot added the Changes: C# Changes any cs files label Aug 12, 2024
@ghost
Copy link
Author

ghost commented Aug 12, 2024

thanks timemaster 👍

@ghost ghost requested a review from deltanedas August 12, 2024 21:45
@ghost
Copy link
Author

ghost commented Aug 12, 2024

my lord, is this funny fishe to your liking?

@deltanedas deltanedas merged commit 6d639d6 into DeltaV-Station:master Aug 12, 2024
13 of 14 checks passed
@ghost ghost deleted the Carpy-get-Suit branch August 12, 2024 22:50
LaryNevesPR pushed a commit to LaryNevesPR/Estacao-Andromeda that referenced this pull request Jan 11, 2025
…on#1456)

# Description
Fixed Shadow Shackles not activating when you melee hit the target.

The Problem: The code checked if the target wasn't stunned when you hit
someone, therefore not activating unless the target was already stunned.
I fixed it by removing the ! operator on
`HasComp<StunnedComponent>(target)` check.

---

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



https://github.com/user-attachments/assets/5ac1a5dd-5d62-4400-be64-56500c87ed5e



</p>
</details>

---

# Changelog

:cl:
- fix: Fixed Shadow Shackles spell not activating.
LaryNevesPR pushed a commit to LaryNevesPR/Estacao-Andromeda that referenced this pull request Jan 11, 2025
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: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files S: Needs Review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants