Revert "Revert "Merge branch 'master' into robotic-limbs-PT2""
This reverts commit 27a099c6bf.
This commit is contained in:
@@ -160,8 +160,7 @@
|
||||
/obj/machinery/ticket_machine/proc/reset_cooldown()
|
||||
ready = TRUE
|
||||
|
||||
/obj/machinery/ticket_machine/attack_hand(mob/living/carbon/user)
|
||||
. = ..()
|
||||
/obj/machinery/ticket_machine/on_attack_hand(mob/living/carbon/user)
|
||||
INVOKE_ASYNC(src, .proc/attempt_ticket, user)
|
||||
|
||||
/obj/machinery/ticket_machine/proc/attempt_ticket(mob/living/carbon/user)
|
||||
|
||||
Reference in New Issue
Block a user