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

Chaplain Update: Other Religions and Trinkets #2176

Draft
wants to merge 9 commits into
base: master
Choose a base branch
from

Conversation

Unkn0wnGh0st333
Copy link
Contributor

@Unkn0wnGh0st333 Unkn0wnGh0st333 commented Nov 12, 2024

About the PR

Adds several new bibles that the chaplain can choose from alongside new religious-themed trinkets. Also reworks and changes a few things about Chaplain.

This PR is still in working progress and I would appreciate any tips and help with it :D

Why / Balance

I felt the Chaplain, which is a large "Roleplay" role, was very limited because the player could only choose from the Christian-based Bible. This gives the player more choice when playing Chaplain.

Religious Trinkets can be used by Chaplains but will also be available to the general populace to encourage more religious-based role-play.

Technical details

Bibles

  • Qur'an
  • Torah
  • Tripitaka
  • Holy Bibble (10 hours Chaplain Playtime)
  • Athiest Bible
  • Pride bible
  • Stone Tablet
  • Scroll
  • Electronic Bible
  • Religious Book
  • Nanotrasen Manual (20 hours Command Playtime)
  • Evil Syndicate Manual (Has to be spawned)
  • Toolbox "Bible"
  • Satanic Bible
  • Book of Lorgar (Chaos Gods)
  • Hymns of the Honkmother (2 Hours Clown Playtime)
  • Vows of the Silentfather (2 Hours Mime Playtime)
  • "Discount" Necronomicon
  • Bible Spawner

Religious Items

Clothing Changes

  • Chaplain shoes have been changed to choice in character menu between black shoes, dress shoes (leather too) and all sandals.
  • Added Honk Mother Robes and Clown Mask to Chaplain (Requires 10 hours Clown Time)
  • Added Mime Mask (Requires 10 hour Mime Time)
  • Add "Tech Priest Robes and Hood" (Requires 10 hours Roboticist)
  • Chaplain Sash spawns on round start and will let the chaplain carry around important items

Minor Changes

  • Brings back the Faith Pistol (Maybe... still debatable)

Media

image
image

Requirements

  • I have tested all added content and changes.
  • I have added media to this PR or it does not require an ingame showcase.

Breaking changes

Chaplain sash is broken rn
uhhh prayer mat construction graph need fixy

Changelog
Reminder to add this later

@github-actions github-actions bot added Changes: YML Changes any yml files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi labels Nov 12, 2024
Copy link
Contributor

github-actions bot commented Nov 12, 2024

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

Resources/Textures/DeltaV/Objects/Specific/Chapel/gildedbible.rsi

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

Resources/Textures/DeltaV/Objects/Specific/Chapel/hymnshonkmother.rsi

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

Resources/Textures/DeltaV/Objects/Specific/Chapel/nanotrasenbible.rsi

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

Resources/Textures/DeltaV/Objects/Specific/Chapel/pridebible.rsi

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

Resources/Textures/DeltaV/Objects/Specific/Chapel/redditbible.rsi

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

Resources/Textures/DeltaV/Objects/Specific/Chapel/rosary.rsi

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

Resources/Textures/DeltaV/Objects/Specific/Chapel/satanicbible.rsi

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

Resources/Textures/DeltaV/Objects/Specific/Chapel/syndicatebible.rsi

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

Resources/Textures/DeltaV/Objects/Specific/Chapel/torah.rsi

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

Resources/Textures/DeltaV/Objects/Specific/Chapel/vowssilentfather.rsi

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

Resources/Textures/DeltaV/Structures/Funiture/prayermat.rsi

State Old New Status
BlackPrayerMat Added
BluePrayerMat Added
RedPrayerMat Added

Resources/Textures/_Goobstation/Objects/Specific/Chapel/tripitaka.rsi

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

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/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/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
paper Added

Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/crossbow_bolts.rsi

State Old New Status
charge Added
icon-bolt-baguette-drawn Added
icon-bolt-baguette Added
icon-bolt-broadhead Added
icon-bolt-drawn Added
icon-bolt-emp Added
icon-bolt-explosive Added
icon-bolt-glass Added
icon-bolt-glassp Added
icon-bolt-glassu Added
icon-bolt-incendiary Added
icon-bolt-mail-drawn Added
icon-bolt-mail Added
icon-bolt-plasteel Added
icon-bolt-plunger-drawn Added
icon-bolt-plunger Added
icon-bolt-shell Added
icon-bolt-sponge Added
icon-bolt-stake-drawn Added
icon-bolt-stake Added
icon-bolt-syringe Added
icon-bolt Added
inhand-left Added
inhand-right Added
rod Added
solution1 Added
solutionSyringe1 Added
tail Added
tip-syringe Added
tip-terminal Added
tip 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
solution1 Added
wielded-inhand-left Added
wielded-inhand-right Added

Edit: diff updated after 9670517

@Bonktrauma
Copy link
Contributor

There ought to be more ss13 religions in here, like the book of lorgar for the chaos gods, hyms to the honkmother, and stuff like that

@Unkn0wnGh0st333
Copy link
Contributor Author

There ought to be more ss13 religions in here, like the book of lorgar for the chaos gods, hyms to the honkmother, and stuff like that

I was looking at TGstation bibles, and I'm trying to make more bibles related to altars if it helps. I will put those two on my list though

@github-actions github-actions bot added the S: Merge Conflict Fix your PR! label Dec 1, 2024
Copy link
Contributor

github-actions bot commented Dec 1, 2024

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

@github-actions github-actions bot added size/L 256-1023 lines and removed S: Merge Conflict Fix your PR! labels Dec 17, 2024
Chaplain Sash is broken
@github-actions github-actions bot added size/XL Over 1024 lines and removed size/L 256-1023 lines labels Dec 17, 2024
@github-actions github-actions bot added the S: Merge Conflict Fix your PR! label Dec 22, 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 Fix your PR! label Dec 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files size/XL Over 1024 lines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants