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

Gloves of the North Star now allow Martial Arts (#21545)

Browse Source 
* gotns

* uplink desc changes

* gdn review + M to L
This commit is contained in:
Contrabang
2023-07-17 05:48:17 -04:00
committed by GitHub
parent 80c63cc954
commit 4bcb907e91
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/gloves/misc_gloves.dm
+12 -5
View File
@@ -175,21 +175,28 @@
/obj/item/clothing/gloves/fingerless/rapid
name = "gloves of the North Star"
desc = "Just looking at these fills you with an urge to beat the shit out of people."
var/accepted_intents = list(INTENT_HARM)
var/accepted_intents = list(INTENT_HELP, INTENT_DISARM, INTENT_GRAB, INTENT_HARM)
var/click_speed_modifier = CLICK_CD_RAPID
/obj/item/clothing/gloves/fingerless/rapid/Touch(mob/living/target, proximity = TRUE)
var/mob/living/M = loc
var/mob/living/L = loc
if(HAS_TRAIT(L, TRAIT_HULK))
return 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)
// We don't use defines here so admingloves can work
if(L.mind.martial_art?.can_use(L))
click_speed_modifier = initial(click_speed_modifier) * 2 // 4
else
click_speed_modifier = initial(click_speed_modifier) // 2
if((L.a_intent in accepted_intents))
L.changeNext_move(click_speed_modifier)
return FALSE
/obj/item/clothing/gloves/fingerless/rapid/admin
name = "advanced interactive gloves"
desc = "The gloves are covered in indecipherable buttons and dials, your mind warps by merely looking at them."
accepted_intents = list(INTENT_HELP, INTENT_DISARM, INTENT_GRAB, INTENT_HARM)
click_speed_modifier = 0
siemens_coefficient = 0