cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-22 00:02:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4629 from DaveTheHeadcrab/chaplain_stuff

Browse Source 
Prayer Bead Fix
This commit is contained in:
Fox McCloud
2016-06-09 23:49:21 -04:00
committed by GitHub
parent 1f02da25a0 3664fe6b7f
commit 0d627d3213
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/objects/items/weapons/holy_weapons.dm
View File

@@ -349,13 +349,13 @@
to_chat(user, "<span class='notice'>You are not close enough with [ticker.Bible_deity_name] to use [src].</span>") to_chat(user, "<span class='notice'>You are not close enough with [ticker.Bible_deity_name] to use [src].</span>")
return return
if(in_use) if(praying)
to_chat(user, "<span class='notice'>You are already using [src].</span>") to_chat(user, "<span class='notice'>You are already using [src].</span>")
user.visible_message("<span class='info'>[user] kneels[M == user ? null : " next to [M]"] and begins to utter a prayer to [ticker.Bible_deity_name].</span>", \ user.visible_message("<span class='info'>[user] kneels[M == user ? null : " next to [M]"] and begins to utter a prayer to [ticker.Bible_deity_name].</span>", \
"<span class='info'>You kneel[M == user ? null : " next to [M]"] and begin a prayer to [ticker.Bible_deity_name].</span>") "<span class='info'>You kneel[M == user ? null : " next to [M]"] and begin a prayer to [ticker.Bible_deity_name].</span>")
in_use = 1 praying = 1
if(do_after(user, 150, target = M)) if(do_after(user, 150, target = M))
if(istype(M, /mob/living/carbon/human)) // This probably should not work on vulps. They're unholy abominations. if(istype(M, /mob/living/carbon/human)) // This probably should not work on vulps. They're unholy abominations.
var/mob/living/carbon/human/target = M var/mob/living/carbon/human/target = M