diff --git a/code/datums/uplink_items/uplink_general.dm b/code/datums/uplink_items/uplink_general.dm index 86f1748e4a6..982eee6abe4 100644 --- a/code/datums/uplink_items/uplink_general.dm +++ b/code/datums/uplink_items/uplink_general.dm @@ -179,7 +179,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) /datum/uplink_item/dangerous/rapid name = "Gloves of the North Star" - desc = "These gloves let the user punch people very fast. Does not improve weapon attack speed." + desc = "These gloves let the user help, shove, grab, and punch people very fast. Does not improve weapon attack speed. Can be combined with martial arts for a deadly weapon." reference = "RPGD" item = /obj/item/clothing/gloves/fingerless/rapid cost = 8 diff --git a/code/datums/uplink_items/uplink_traitor.dm b/code/datums/uplink_items/uplink_traitor.dm index 6cc5fc092c0..4e49bd1795d 100644 --- a/code/datums/uplink_items/uplink_traitor.dm +++ b/code/datums/uplink_items/uplink_traitor.dm @@ -516,7 +516,7 @@ name = "CQC Manual" desc = "A manual that teaches a single user tactical Close-Quarters Combat before self-destructing. \ Changes your unarmed damage to deal non-lethal stamina damage. \ - Does not restrict weapon usage, but cannot be used alongside Gloves of the North Star." + Does not restrict weapon usage, and can be used alongside Gloves of the North Star." reference = "CQC" item = /obj/item/CQC_manual cost = 10 diff --git a/code/modules/clothing/gloves/misc_gloves.dm b/code/modules/clothing/gloves/misc_gloves.dm index 40a6aa8e8df..b220bebf81a 100644 --- a/code/modules/clothing/gloves/misc_gloves.dm +++ b/code/modules/clothing/gloves/misc_gloves.dm @@ -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