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

Crucifix, a Null Rod variant #37315

Merged
merged 5 commits into from
Nov 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions code/game/objects/items/weapons/null_rod.dm
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,29 @@
item_state = "katana"
fluff_pickup = "bisect"

/obj/item/weapon/nullrod/crucifix
name = "crucifix"
desc = "A shiny gold crucifix."
icon_state = "crucifix"
item_state = "crucifix"
fluff_pickup = "turn"

/obj/item/weapon/nullrod/crucifix/examine(mob/user)
if(user.mind?.assigned_role == "Chaplain")
desc = "What you are about to do has not been approved by the Space Vatican."
else
desc = initial(desc)
..()

/obj/item/weapon/nullrod/crucifix/attack_self(mob/user) //For larping during an exorcism
if(user.mind?.assigned_role == "Chaplain")
if(user.attack_delayer.blocked())
return
user.visible_message("[user] raises the cross in a show of faith.",\
"You raise your cross in a show of true faith!")
user.delayNextAttack(1 SECONDS)
else //What happens if non-Chaplain uses the cross
..()

/obj/item/weapon/nullrod/toolbox //Syndicate/Robust religion
name = "nullbox"
Expand Down
Binary file modified icons/mob/in-hand/left/items_lefthand.dmi
Binary file not shown.
Binary file modified icons/mob/in-hand/right/items_righthand.dmi
Binary file not shown.
Binary file modified icons/obj/weapons.dmi
Binary file not shown.
Loading