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

Add Blood Cult Cat #2563

Merged

Conversation

ErhardSteinhauer
Copy link
Contributor

@ErhardSteinhauer ErhardSteinhauer commented Dec 14, 2024

About the PR

  • Added blood cult cat, pet ghost role (whitelisted). Named after towns that hosted famous witch trials in the past.
  • Added blood cult cat to the Blood Moon bluespace event.
  • Has a small chance of spawning on vgroids.

Abilities:

  • Toggleable red light.
  • Dissonant whispers.
  • Eldritch Push: slow moving projectile, that deals 100 stamina damage. 5 minutes cooldown.

Changes to dev_map:

  • Added Scrap Processor with scrap chunks, Blueprint Lithograph and hacked mercenary techfab.
  • Added blood cult cat spawner.
  • Added turbolaser mk3, holopickaxe and holoflare pistol to weapon pile, holograffiti projector to tools pile

TODO:

  • Modest abilities for ghost to entertain themselves and those around them.
  • Spawns.

Why / Balance

Cats!

How to test

Media

image
image

Requirements

Breaking changes

Changelog
🆑 erhardsteinhauer

  • add: Added the blood cult cat ghost role (for players to pledge their allegiance to).

Copy link
Contributor

github-actions bot commented Dec 14, 2024

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

Resources/Textures/_NF/Effects/bloodcultprojectiles.rsi

State Old New Status
hand Added

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

State Old New Status
cultcat Added
cultcat_dead Added
cultcat_rest Added
cultcat_rest_unshaded Added
cultcat_sit Added
cultcat_sit_unshaded Added
cultcat_unshaded Added
mask_null Added

Edit: diff updated after ad7b3bd

@github-actions github-actions bot added the Map-Bluespace Map - Bluespace Event label Dec 14, 2024
@ErhardSteinhauer ErhardSteinhauer marked this pull request as ready for review December 14, 2024 13:01
Copy link
Contributor

@whatston3 whatston3 left a comment

Choose a reason for hiding this comment

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

Neat stuff - left a few comments about the cat's usage, but seems like a nice addition to the blood cult.

Copy link
Contributor

@whatston3 whatston3 left a comment

Choose a reason for hiding this comment

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

Pushed a small set of changes - rule description spelling fix, no "parent: invalid", clarpy & blood cult cat crit/dead sprite use the live ones (hats look odd otherwise). Seems good, give it a look when you can.

@github-actions github-actions bot added the S: Merge Conflict This PR has conflicts that prevent merging label Dec 18, 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 Dec 20, 2024
Copy link
Contributor

@whatston3 whatston3 left a comment

Choose a reason for hiding this comment

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

Reapproving, merging when tests pass.

@whatston3 whatston3 merged commit 6fcb545 into new-frontiers-14:master Dec 20, 2024
14 checks passed
FrontierATC added a commit that referenced this pull request Dec 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants