cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-21 03:55:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Gives the bartender their own version of judo (#21886)

Browse Source
This commit is contained in:
GDN
2023-09-01 17:20:47 -05:00
committed by GitHub
parent 7336750e48
commit 08eb183875
4 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/batons.dm
+1 -1
View File
@@ -66,7 +66,7 @@
* * user - The attacking user
*/
/obj/item/melee/classic_baton/proc/baton_knockdown(mob/living/target, mob/living/user)
if(user.mind?.martial_art?.no_baton)
if(user.mind?.martial_art?.no_baton && user.mind?.martial_art?.can_use(user))
to_chat(user, user.mind.martial_art.no_baton_reason)
return
if(issilicon(target))
code/game/objects/items/weapons/stunbaton.dm
+1 -1
View File
@@ -170,7 +170,7 @@
user.visible_message("<span class='danger'>[user] accidentally hits [user.p_themselves()] with [src]!</span>",
"<span class='userdanger'>You accidentally hit yourself with [src]!</span>")
return
if(user.mind?.martial_art?.no_baton)
if(user.mind?.martial_art?.no_baton && user.mind?.martial_art?.can_use(user))
to_chat(user, user.mind.martial_art.no_baton_reason)
return
if(issilicon(M)) // Can't stunbaton borgs and AIs