cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-26 13:37:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Makes disabled martial arts not block north-star (#16838)

Browse Source
This commit is contained in:
Farie82
2021-10-01 21:52:28 +01:00
committed by GitHub
parent 209e2848c9
commit 56c1f81642
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/gloves/miscellaneous.dm
+4 -6
View File
@@ -165,12 +165,10 @@
/obj/item/clothing/gloves/fingerless/rapid/Touch(mob/living/target, proximity = TRUE)
var/mob/living/M = loc
if(M.a_intent in accepted_intents)
if(M.mind.martial_art || HAS_TRAIT(M, TRAIT_HULK))
M.changeNext_move(CLICK_CD_MELEE)//normal attack speed for hulk, CQC and Carp.
else
M.changeNext_move(click_speed_modifier)
.= FALSE
if((M.a_intent in accepted_intents) && !M.mind.martial_art?.can_use(M) && !HAS_TRAIT(M, TRAIT_HULK))
M.changeNext_move(click_speed_modifier)
return FALSE
/obj/item/clothing/gloves/fingerless/rapid/admin
name = "advanced interactive gloves"