mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-28 15:47:15 +01:00
hand items have no attack cooldown with northstar gloves (#91888)
## About The Pull Request closes https://github.com/tgstation/tgstation/issues/84319 ## Why It's Good For The Game consistency ## Changelog 🆑 fix: all hand items will now have no cooldown when used with northstar gloves, including circle hand /🆑
This commit is contained in:
@@ -10,6 +10,10 @@
|
||||
. = ..()
|
||||
ADD_TRAIT(src, TRAIT_NO_STORAGE_INSERT, TRAIT_GENERIC)
|
||||
|
||||
/obj/item/hand_item/attack(mob/living/target_mob, mob/living/user)
|
||||
. = ..()
|
||||
SEND_SIGNAL(user, COMSIG_LIVING_HAND_ITEM_ATTACK, target_mob)
|
||||
|
||||
/obj/item/hand_item/circlegame
|
||||
name = "circled hand"
|
||||
desc = "If somebody looks at this while it's below your waist, you get to bop them."
|
||||
@@ -217,6 +221,7 @@
|
||||
AddElement(/datum/element/high_fiver)
|
||||
|
||||
/obj/item/hand_item/slapper/attack(mob/living/slapped, mob/living/carbon/human/user)
|
||||
. = ..()
|
||||
SEND_SIGNAL(user, COMSIG_LIVING_SLAP_MOB, slapped)
|
||||
SEND_SIGNAL(slapped, COMSIG_LIVING_SLAPPED, user)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user