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

Cappy the NFSD Cat #1291

Merged
merged 21 commits into from
May 20, 2024
Merged

Conversation

dvir001
Copy link
Contributor

@dvir001 dvir001 commented Apr 28, 2024

About the PR

Added Cappy, a new pet for NFSD, whitelisted ghost job.
Equipped with claws that do small amount of stun, security hud and plush persistent eyes.
And a security webbing on his back to provide ammo carry for the rest of NFSD.

Cappy is ready to join the good fight!

Why / Balance

NFSD Dedicated cat.

How to test

Run the game and find him in NFSD.

Media

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

image

image

image

image

Breaking changes

N/A

Changelog
🆑 dvir01

  • add: Cappy has joined the NFSD, a veteran war hero cat augmented for tactical operations.
  • tweak: Installed radio inside Clippy for Service radio.

@github-actions github-actions bot added S: Needs Review This PR is awaiting reviews No C# Sprites YML FTL and removed S: Needs Review This PR is awaiting reviews labels Apr 28, 2024
Copy link
Contributor

github-actions bot commented Apr 28, 2024

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

Resources/Textures/_NF/Clothing/Belt/nfsd_webbing.rsi

State Old New Status
equipped-BELT-cat Added

Resources/Textures/_NF/Clothing/Head/Hats/nfsd_beret_brown.rsi

State Old New Status
equipped-HELMET-cat Added

Resources/Textures/_NF/Clothing/Head/Hats/nfsd_beret_cream.rsi

State Old New Status
equipped-HELMET-cat Added

Resources/Textures/_NF/Clothing/Head/Hats/nfsd_beret_green.rsi

State Old New Status
equipped-HELMET-cat Added

Resources/Textures/_NF/Clothing/Head/Hats/nfsd_campaign_small.rsi

State Old New Status
equipped-HELMET-cat Added

Resources/Textures/_NF/Clothing/Mask/nfsd.rsi

State Old New Status
equipped-MASK-cat Added

Resources/Textures/_NF/Mobs/Pets/cat.rsi

State Old New Status
nfsdcat Added
nfsdcat_dead Added
nfsdcat_rest Added
nfsdcat_sit Added

Edit: diff updated after 1593013

@github-actions github-actions bot added Map-POI Map - POI and removed YML labels Apr 28, 2024
@github-actions github-actions bot added the S: Merge Conflict This PR has conflicts that prevent merging label May 15, 2024
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the S: Merge Conflict This PR has conflicts that prevent merging label May 15, 2024
@dvir001 dvir001 added the S: Needs Review This PR is awaiting reviews label May 19, 2024
@Cheackraze Cheackraze merged commit 9eeb231 into new-frontiers-14:master May 20, 2024
14 checks passed
FrontierATC added a commit that referenced this pull request May 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
FTL Map-POI Map - POI No C# S: Needs Review This PR is awaiting reviews Sprites
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants