cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-25 04:57:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10350 from datlo/fingergunfix

Browse Source 
Fix a couple of finger gun issues
This commit is contained in:
variableundefined
2018-11-26 08:13:36 +08:00
committed by GitHub
parent eae3a442bd 2c3541b95f
commit d05cd11608
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/spells/mime.dm
+7 -5
View File
@@ -92,7 +92,7 @@
/obj/effect/proc_holder/spell/targeted/mime/fingergun
name = "Finger Gun"
desc = "Shoot stunning, invisible bullets out of your fingers! 6 bullets available per cast."
desc = "Shoot stunning, invisible bullets out of your fingers! 6 bullets available per cast. Use your fingers to holster them manually."
school = "mime"
panel = "Mime"
clothes_req = 0
@@ -116,7 +116,7 @@
revert_cast(user)
/obj/effect/proc_holder/spell/targeted/mime/fingergun/fake
desc = "Pretend you're shooting bullets out of your fingers! 6 bullets available per cast."
desc = "Pretend you're shooting bullets out of your fingers! 6 bullets available per cast. Use your fingers to holster them manually."
gun = /obj/item/gun/projectile/revolver/fingergun/fake
// Mime Spellbooks
@@ -130,9 +130,11 @@
/obj/item/spellbook/oneuse/mime/attack_self(mob/user)
var/obj/effect/proc_holder/spell/S = new spell
if(locate(S) in user.mind.spell_list)
to_chat(user, "<span class='notice'>You've already read this one.</span>")
return
for(var/obj/effect/proc_holder/spell/knownspell in user.mind.spell_list)
if(knownspell.type == S.type)
if(user.mind)
to_chat(user, "<span class='notice'>You've already read this one.</span>")
return
if(used)
recoil(user)
else
code/modules/projectiles/guns/projectile/revolver.dm
+1 -1
View File
@@ -172,7 +172,7 @@
/obj/item/gun/projectile/revolver/fingergun/afterattack(atom/target, mob/living/user, flag, params)
if(!user.mind.miming)
to_chat(usr, "<span class='warning'>You must dedicate yourself to silence first.</span>")
to_chat(usr, "<span class='warning'>You must dedicate yourself to silence first. Use your fingers if you wish to holster them.</span>")
return
..()