mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-27 14:08:44 +01:00
Fixes up shuffle procs
This commit is contained in:
@@ -211,8 +211,8 @@
|
||||
|
||||
..()
|
||||
|
||||
/obj/item/deck/attack_self()
|
||||
shuffle()
|
||||
/obj/item/deck/attack_self(mob/user)
|
||||
shuffle(user)
|
||||
|
||||
|
||||
/obj/item/deck/verb/verb_shuffle()
|
||||
@@ -220,10 +220,9 @@
|
||||
set name = "Shuffle"
|
||||
set desc = "Shuffle the cards in the deck."
|
||||
set src in view(1)
|
||||
shuffle()
|
||||
shuffle(usr)
|
||||
|
||||
/obj/item/deck/proc/shuffle()
|
||||
var/mob/living/user = usr
|
||||
/obj/item/deck/proc/shuffle(mob/user)
|
||||
if (cooldown < world.time - 10) // 15 ticks cooldown
|
||||
var/list/newcards = list()
|
||||
while(cards.len)
|
||||
|
||||
@@ -80,8 +80,7 @@
|
||||
P.back_icon = "dark_back_tarot"
|
||||
cards += P
|
||||
|
||||
/obj/item/deck/dark_tarot/shuffle()
|
||||
var/mob/living/user = usr
|
||||
/obj/item/deck/dark_tarot/shuffle(mob/user)
|
||||
if (cooldown < world.time - 10)
|
||||
var/list/newcards = list()
|
||||
while(cards.len)
|
||||
|
||||
Reference in New Issue
Block a user