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

New clothing options for Chaplains [FIXED]. #728

Merged
merged 12 commits into from
Dec 25, 2023

Conversation

ErhardSteinhauer
Copy link
Contributor

@ErhardSteinhauer ErhardSteinhauer commented Dec 20, 2023

About the PR

Added some new (mostly old actually) clothes for Chaplains. Accessible through PietyVend. Stuff added:

  • New hats: kippah, wide-brimmed hat, cardinal's hat, bishop's mitre, witch hunter hat, pilgrim hat.
  • New neck pieces: chaplain's stole (purple scarf thingy), crucifix.
  • New coats: cardinal's robes (has toggleable hood), bishop's robes, witch hunter's coat (has toggleable hood).
  • New jumpsuits: pilgrim's jumpsuit.
  • New belt: chaplain's sash, that can hold job related items (censer, bible, bottle, crucifix, wooden stake).
  • Misc items: censer (can be filled with ground tobacco/cannabis and lit for exactly zero benefits), wooden stake (for, uh, camping in the woods, I swear. Need to emag PietyVent to get it though. Or craft it.), mortuary urn (can store ash/ectoplasm, can attach paper label).

Why / Balance

RP. Smoking censer! RP!

Technical details

New .yml and .rsi, changes to PietyVend catalogue.

Media

image
Fig. 1 - New clothes.
image
image
Fig. 2 - Mortuary urn.

  • I have added screenshots/videos to this PR showcasing its changes ingame.

Changelog
🆑 erhardsteinhauer

  • add: Added new clothes for Chaplains. Check nearest PietyVend.

Copy link
Contributor

github-actions bot commented Dec 20, 2023

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

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

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

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

State Old New Status
book Added
bottle Added
censer Added
crucifix Added
stake Added

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

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

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

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

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

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

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

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

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

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

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

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

Resources/Textures/_NF/Clothing/Head/Hoods/cardinal_hood.rsi

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

Resources/Textures/_NF/Clothing/Neck/Misc/crucifix.rsi

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

Resources/Textures/_NF/Clothing/Neck/Scarfs/chaplain_stole.rsi

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

Resources/Textures/_NF/Clothing/OuterClothing/Misc/bishop_robe.rsi

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

Resources/Textures/_NF/Clothing/OuterClothing/Misc/cardinal_robe.rsi

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

Resources/Textures/_NF/Clothing/OuterClothing/Misc/witch_hunter_coat.rsi

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

Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/chaplain-pilgrim.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Added
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Objects/Misc/censer.rsi

State Old New Status
burnt-icon Added
icon Added
inhand-left Added
inhand-right Added
lit-icon Added
lit-inhand-left Added
lit-inhand-right Added
unlit-icon Added
unlit-inhand-left Added
unlit-inhand-right Added

Resources/Textures/_NF/Objects/Misc/mortuary_urn.rsi

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

Resources/Textures/_NF/Objects/Weapons/Melee/wooden_stake.rsi

State Old New Status
equipped-BELT Added
icon Added
inhand-left Added
inhand-right Added
spear Added
spear1 Added
wielded-inhand-left Added
wielded-inhand-right Added

Edit: diff updated after 7defa26

@ErhardSteinhauer
Copy link
Contributor Author

Fixed YAML errors.

@ErhardSteinhauer
Copy link
Contributor Author

And made wooden stake craftable.

attackRate: 1.5
damage:
types:
Piercing: 8
Copy link
Contributor

Choose a reason for hiding this comment

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

How is this compering to other stuff consider you can build it for cheap
This vs glass shiv for say?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

OP, needs nerfing.

Copy link
Contributor Author

@ErhardSteinhauer ErhardSteinhauer Dec 20, 2023

Choose a reason for hiding this comment

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

I think glass shiv is 5.5 of slashing damage. And brand new crowbar from vendomat is 10 brute dmg.
But I'd also argue that wooden plank is less readily available than glass with a bit of cloth.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Eh, I'll bring it down to 6. This thing should not be equal to Crusher Dagger.

@Everturning
Copy link

are the stakes able to be thrown? possibly make it so that it's a throwable weapon that disappears on contact (stake gets lodged deep in the enemy, farther than can be pulled out), but up its damage somewhat

@ErhardSteinhauer
Copy link
Contributor Author

are the stakes able to be thrown? possibly make it so that it's a throwable weapon that disappears on contact (stake gets lodged deep in the enemy, farther than can be pulled out), but up its damage somewhat

Stakes are throwable and they break when you try to pull them out.

@github-actions github-actions bot added S: Merge Conflict This PR has conflicts that prevent merging labels Dec 24, 2023
Copy link
Contributor

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

1 similar comment
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 24, 2023
Copy link
Contributor

@dvir001 dvir001 left a comment

Choose a reason for hiding this comment

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

All working fine now

@dvir001 dvir001 merged commit 9aabca7 into new-frontiers-14:master Dec 25, 2023
10 of 11 checks passed
FrontierATC added a commit that referenced this pull request Dec 25, 2023
@ErhardSteinhauer ErhardSteinhauer deleted the Chaplain-Drip-v2 branch January 31, 2024 05:57
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