Revert "Merge branch 'master' into robotic-limbs-PT2"

This reverts commit 73b5267425, reversing
changes made to 2e780bfff2.
This commit is contained in:
DeltaFire
2020-10-11 00:51:39 +02:00
parent c5bb85d794
commit 27a099c6bf
207 changed files with 3486 additions and 8567 deletions
+2 -1
View File
@@ -160,7 +160,8 @@
/obj/machinery/ticket_machine/proc/reset_cooldown()
ready = TRUE
/obj/machinery/ticket_machine/on_attack_hand(mob/living/carbon/user)
/obj/machinery/ticket_machine/attack_hand(mob/living/carbon/user)
. = ..()
INVOKE_ASYNC(src, .proc/attempt_ticket, user)
/obj/machinery/ticket_machine/proc/attempt_ticket(mob/living/carbon/user)