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

Mystabible, Shockcollar, Fish Labeler, Tinfoil craft #112

Merged
merged 10 commits into from
Oct 11, 2023

Conversation

FluffiestFloof
Copy link
Contributor

About the PR

Added the Mystagogue's bible, shock collar, fish labeller, tinfoil hat craft graph.
Soulbreaker is now in the proper research

Why / Balance

Technical details

Media

ss (2023-10-05 at 10 17 14)

Breaking changes

Changelog

🆑

  • add: Added shock collar, Mystagogue's bible and the fish labeler.

@github-actions
Copy link
Contributor

github-actions bot commented Oct 5, 2023

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

Signed-off-by: Fluffiest Floofers <[email protected]>
@github-actions
Copy link
Contributor

github-actions bot commented Oct 5, 2023

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

Resources/Textures/Nyanotrasen/Objects/Specific/Chapel/holylight.rsi

State Old New Status
icon Added
inhand-left Added
inhand-right Added

Edit: diff updated after c8e0e5b

@github-actions github-actions bot removed the S: Merge Conflict Fix your PR! label Oct 5, 2023
@Colin-Tel
Copy link
Contributor

 Failed TestStartReachesValidTarget [87 ms]
  Error Message:
     The next node (tinfoilhat) in the path from the start node (start) to the target node (tinfoilhat) specified an entity prototype (Content.Shared.Construction.NodeEntities.StaticNodeEntity) without a ConstructionComponent.
  Expected: True
  But was:  False

Valid test failure, looks like it involves the construction of the tinfoil hat.

@Colin-Tel
Copy link
Contributor

image
looks like you'll need to uncomment some stuff here

@github-actions github-actions bot added the S: Merge Conflict Fix your PR! label Oct 8, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Oct 8, 2023

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

Signed-off-by: Fluffiest Floofers <[email protected]>
@github-actions github-actions bot removed the S: Merge Conflict Fix your PR! label Oct 9, 2023
@github-actions github-actions bot added the S: Merge Conflict Fix your PR! label Oct 9, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Oct 9, 2023

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

Signed-off-by: Fluffiest Floofers <[email protected]>
@github-actions github-actions bot removed the S: Merge Conflict Fix your PR! label Oct 9, 2023
@@ -12,7 +12,7 @@
recipeUnlocks:
- ClothingHeadHelmetInsulated
- ClothingHeadCage
# - ShellSoulbreaker
# - ShellSoulbreaker # DeltaV - Placing it under Exotic Ammunition because that's what it is.
Copy link
Contributor

Choose a reason for hiding this comment

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

Did you intend to leave this line commented out?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah I moved it to another research during the creation of the .38 ammo type because it fit the whole "exotic ammo".
https://github.com/DeltaV-Station/Delta-v-rebase/blob/9b91b2b2edea2124f2c0b8509c20493d6f9c8418/Resources/Prototypes/DeltaV/Research/arsenal.yml#L4-L15
It's in this PR uncommented. I can move it back to this research if wanted.

@Colin-Tel Colin-Tel merged commit 725c742 into DeltaV-Station:master Oct 11, 2023
12 checks passed
DeltaV-Bot pushed a commit that referenced this pull request Oct 11, 2023
@FluffiestFloof FluffiestFloof deleted the mystabible branch October 11, 2023 10:24
@deltanedas
Copy link
Member

fish

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants