Add new null rods for various religions. #31393

alfalfascout · 2026-01-03T02:01:17Z

What Does This PR Do

Adds some new null rods.

Scimitar: bulky, sharp, can be sheathed or equipped on the belt.
Vajra and ghanta: medium, a duo of mace and bell, requires two hands to equip. The mace attacks and the bell blesses tiles.
Elephant goad: bulky, sharp, can parry.
Kirpan: medium, sharp, can be sheathed or equipped on the belt.
Gohei: bulky, purifies.
Horsetail whisk: bulky, knocks back flying enemies on harm intent, purifies on help intent.

I and CRUNCH-Borg have been working on the code. I did most of the sprites Darkmight9 made inhand sprites for whisker, goad, and gohei.

Why It's Good For The Game

Just another part of my ongoing work towards religious diversity on Paradise.

Images of changes

Will add these once I have all the pictures and also once they work.

Testing

Will add this once the items work.

Declaration

I confirm that I either do not require pre-approval for this PR, or I have obtained such approval and have included a screenshot to demonstrate this below.

Changelog

🆑AlfalfaScout, CRUNCH-Borg, Darkmight9
add: Added six or seven new null rods: a saber, vajra and ghanta, elephant goad, kirpan, gohei, and whisker.
/:cl:

Gatchapod · 2026-01-03T08:05:00Z

As much as I hate to bring balance up this early, vajra and ghanta seem to be possibly a little too good?
You maintain the whooping 15 force on vajra (even more terrifying for sanctified version), ghanta is fully functional prayer beads and the two actually combine into one tiny class item when stored.

alfalfascout · 2026-01-04T00:12:31Z

As much as I hate to bring balance up this early, vajra and ghanta seem to be possibly a little too good? You maintain the whooping 15 force on vajra (even more terrifying for sanctified version), ghanta is fully functional prayer beads and the two actually combine into one tiny class item when stored.

Idk why you're saying you hate to do something that would make the PR better. It's a draft. I can reduce the force any time, or make any other change you like.

- Modify weight classes for kirpan, vajra, ganta, gohei, and whisk - Reduce force of vajra - Nudge kirpan sheath sprite in belt slot - More progress on getting vajra and ghanta to equip properly (should be one in each hand when equipped and none inhand if not) (still needs work)

Gatchapod · 2026-01-04T03:31:28Z

As much as I hate to bring balance up this early, vajra and ghanta seem to be possibly a little too good? You maintain the whooping 15 force on vajra (even more terrifying for sanctified version), ghanta is fully functional prayer beads and the two actually combine into one tiny class item when stored.

Idk why you're saying you hate to do something that would make the PR better. It's a draft. I can reduce the force any time, or make any other change you like.

I just don't like discussing balance, really. Especially when the goal is clearly to just add more flavour and variety to the game.
I just do think you should reach out to the design team regarding that specific item. I'm admittedly not sure how to balance it given how it effectively combines two null rod variants into one but I imagine they'd like to have some input, maybe even have a better idea on how to handle it.

Contrabang · 2026-01-04T04:25:31Z

code/game/objects/items/weapons/holy_weapons.dm

+/obj/item/nullrod/vajra
+	name = "vajra and ghanta"
+	desc = "A set of inseparable ritual tools."
+	icon_state = "vajra_and_ghanta"
+	worn_icon_state = null
+	righthand_file = 'icons/mob/inhands/religion_righthand.dmi'
+	inhand_icon_state = "vajra"
+	force = 5
+	w_class = WEIGHT_CLASS_NORMAL
+	attack_verb = list("bludgeoned", "hit", "struck")
+	var/obj/item/nullrod/cleansing/ghanta/bound_ghanta = null


I dont like how this basically reimplements the two-handed component. However, that component doesn't have support for multiple items like this. There should probably be a better solution to this before merge, but i have no good ideas yet

I would love a better solution! This isn't working.

Coolrune206 · 2026-01-04T06:30:17Z

Could the Islamic Curved Saber be named "Curved Saber" in-game so it can be reasonably used for any player-made religions without seeming out of place name-wise?

alfalfascout · 2026-01-04T17:24:54Z

Could the Islamic Curved Saber be named "Curved Saber" in-game so it can be reasonably used for any player-made religions without seeming out of place name-wise?

I suppose.

- Correctly stores the two items together without creating a quantum duplicate when putting into storage items. - Correctly stores the two items together if either is dropped. - Correctly stores the two items together if either is thrown (even correctly transfers the state of being thrown to the other). - Correctly drops the item if you're holding something in the right hand.

Signed-off-by: Alan <alfalfascout@users.noreply.github.com>

alfalfascout · 2026-01-06T22:54:09Z

!wiki_label

Komrad822 · 2026-01-07T21:34:58Z

The curved blade can be named scimitar, shamshir, saif, jambiya, or talwar. Most people know them as scimitars.

And have to agree with gatcha, please increase their size to not fit in pockets and lower to like 10 dmg due to the duo functionality.

Other than that, very nice and creative. Look forward to this pr.

More ideas could be the macuahuitl, the obsidian sword of the aztecs.

alfalfascout · 2026-01-07T23:07:19Z

And have to agree with gatcha, please increase their size to not fit in pockets and lower to like 10 dmg due to the duo functionality.

I was advised by another design team member to remove all force or give them a non-rosary, non-full-antimagic effect. I am still thinking about this.

CRUNCH-Borg and others added 4 commits December 28, 2025 23:08

Update holy_weapons.dm

f3cda21

Update holy_weapons.dm

96cbe5b

Merge master

6d17da0

Add some new nullrods for various religions.

2177ffa

ParadiseSS13-Bot added Sprites This PR modifies the game sprites -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally labels Jan 3, 2026

Update inhands for gohei, whisk, goad.

aa015a8

Contrabang reviewed Jan 4, 2026

View reviewed changes

rod of null

788cb59

CRUNCH-Borg and others added 3 commits January 4, 2026 17:51

Update holy_weapons.dm

925ef19

Remove force from cleansing nullrods. Rename curved saber.

abe8fff

Signed-off-by: Alan <alfalfascout@users.noreply.github.com>

github-actions bot added the Requires Wiki Update Useful for Wiki Contributers to search for things that need updating label Jan 6, 2026

ParadiseSS13-Bot added -Status: Awaiting approval This PR is waiting for approval internally and removed -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally labels Jan 7, 2026

Remove unknown proc 'is_in_inactive_hand'.

3e5ce9d

ParadiseSS13-Bot added -Status: Awaiting review This PR is awaiting review from the review team and removed -Status: Awaiting approval This PR is waiting for approval internally labels Jan 8, 2026

alfalfascout added 3 commits January 8, 2026 12:52

Partially fix whisk knockback.

39fc1fa

Fix whisker knockback.

9586aa8

Thanks, linters! part 2

31259e2

alfalfascout added 5 commits January 8, 2026 17:27

Change vajra to weapon and ghanta to tile blessing.

af1dcd7

Thanks, linters. part 3

53bf187

Call ghanta's activate_self() parent more wisely.

0a93f2c

Tweak visible and audible messages.

b7e12db

Thanks, linters!

851c3ae

github-actions bot added the Merge Conflict This PR is merge conflicted label Jan 11, 2026

Resolve merge conflict in icons/obj/clothing/belts.dmi

63e7e94

github-actions bot removed the Merge Conflict This PR is merge conflicted label Jan 12, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Add new null rods for various religions. #31393

Add new null rods for various religions. #31393

Uh oh!

alfalfascout commented Jan 3, 2026 •

edited

Loading

Uh oh!

Gatchapod commented Jan 3, 2026

Uh oh!

alfalfascout commented Jan 4, 2026

Uh oh!

Gatchapod commented Jan 4, 2026

Uh oh!

Contrabang Jan 4, 2026

Uh oh!

alfalfascout Jan 4, 2026

Uh oh!

Coolrune206 commented Jan 4, 2026

Uh oh!

alfalfascout commented Jan 4, 2026

Uh oh!

alfalfascout commented Jan 6, 2026

Uh oh!

Komrad822 commented Jan 7, 2026

Uh oh!

alfalfascout commented Jan 7, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Uh oh!

Add new null rods for various religions. #31393

Are you sure you want to change the base?

Add new null rods for various religions. #31393

Uh oh!

Conversation

alfalfascout commented Jan 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What Does This PR Do

Why It's Good For The Game

Images of changes

Testing

Declaration

Changelog

Uh oh!

Gatchapod commented Jan 3, 2026

Uh oh!

alfalfascout commented Jan 4, 2026

Uh oh!

Gatchapod commented Jan 4, 2026

Uh oh!

Contrabang Jan 4, 2026

Choose a reason for hiding this comment

Uh oh!

alfalfascout Jan 4, 2026

Choose a reason for hiding this comment

Uh oh!

Coolrune206 commented Jan 4, 2026

Uh oh!

alfalfascout commented Jan 4, 2026

Uh oh!

alfalfascout commented Jan 6, 2026

Uh oh!

Komrad822 commented Jan 7, 2026

Uh oh!

alfalfascout commented Jan 7, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

alfalfascout commented Jan 3, 2026 •

edited

Loading