From 7087c029cf47889872505b52c9832c468c14c323 Mon Sep 17 00:00:00 2001 From: Fox McCloud Date: Thu, 29 Aug 2019 17:22:13 -0400 Subject: [PATCH 1/2] Refactors Gloves of the North Star --- code/modules/clothing/gloves/miscellaneous.dm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index a06b01de65d..77514cb4286 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -152,10 +152,19 @@ /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/click_speed_modifier = CLICK_CD_RAPID /obj/item/clothing/gloves/fingerless/rapid/Touch(mob/living/target, proximity = TRUE) var/mob/living/M = loc - if(M.a_intent == INTENT_HARM) - M.changeNext_move(CLICK_CD_RAPID) - .= FALSE \ No newline at end of file + if(M.a_intent in accepted_intents) + M.changeNext_move(click_speed_modifier) + .= 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 my merely looking at them." + accepted_intents = list(INTENT_HELP, INTENT_DISARM, INTENT_GRAB, INTENT_HARM) + click_speed_modifier = 0 + siemens_coefficient = 0 \ No newline at end of file From 1aa0049e55b7378d832e6fb6f1139240509c8cf8 Mon Sep 17 00:00:00 2001 From: Fox McCloud Date: Thu, 29 Aug 2019 17:41:42 -0400 Subject: [PATCH 2/2] what the heck, let's do it --- code/game/machinery/vending.dm | 2 +- code/modules/clothing/gloves/miscellaneous.dm | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index dd5772149a0..c2e4eb8273d 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -1599,7 +1599,7 @@ /obj/item/fish_eggs/electric_eel = 10, /obj/item/fish_eggs/shrimp = 5, /obj/item/toy/pet_rock = 100, ) contraband = list(/obj/item/fish_eggs/babycarp = 5) - premium = list(/obj/item/toy/pet_rock/fred = 1, /obj/item/toy/pet_rock/roxie = 1) + premium = list(/obj/item/toy/pet_rock/fred = 1, /obj/item/toy/pet_rock/roxie = 1, /obj/item/clothing/gloves/fingerless/rapid/headpat = 1) refill_canister = /obj/item/vending_refill/crittercare /obj/machinery/vending/crittercare/free diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index 77514cb4286..a47381f6bfd 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -167,4 +167,10 @@ desc = "The gloves are covered in indecipherable buttons and dials, your mind warps my merely looking at them." accepted_intents = list(INTENT_HELP, INTENT_DISARM, INTENT_GRAB, INTENT_HARM) click_speed_modifier = 0 - siemens_coefficient = 0 \ No newline at end of file + siemens_coefficient = 0 + +/obj/item/clothing/gloves/fingerless/rapid/headpat + name = "Gloves of Headpats" + desc = "You feel the irresistable urge to give headpats by merely glimpsing these." + accepted_intents = list(INTENT_HELP) + click_speed_modifier = 0 // That's some serious headpatting \ No newline at end of file