Merge pull request #12138 from Fox-McCloud/ahhh-the-smell-of-adminbus-in-the-morning

Refactors Gloves of the North Star. Adds Gloves of Headpats
This commit is contained in:
variableundefined
2019-08-31 20:01:34 -04:00
committed by GitHub
2 changed files with 19 additions and 4 deletions
+1 -1
View File
@@ -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
+18 -3
View File
@@ -152,10 +152,25 @@
/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
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
/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