diff --git a/code/game/objects/items/weapons/null_rod.dm b/code/game/objects/items/weapons/null_rod.dm index dbd3113a1b4d..6beb7218b90d 100644 --- a/code/game/objects/items/weapons/null_rod.dm +++ b/code/game/objects/items/weapons/null_rod.dm @@ -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" diff --git a/icons/mob/in-hand/left/items_lefthand.dmi b/icons/mob/in-hand/left/items_lefthand.dmi index 6dc455af3fb3..48bb5223a4ee 100644 Binary files a/icons/mob/in-hand/left/items_lefthand.dmi and b/icons/mob/in-hand/left/items_lefthand.dmi differ diff --git a/icons/mob/in-hand/right/items_righthand.dmi b/icons/mob/in-hand/right/items_righthand.dmi index 14d384c6450f..f929f3639277 100644 Binary files a/icons/mob/in-hand/right/items_righthand.dmi and b/icons/mob/in-hand/right/items_righthand.dmi differ diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi index ac9f9aba9bed..4614b2757504 100644 Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ