From 642b9d481e04d64c11008702b9db4a1dcdfcc4db Mon Sep 17 00:00:00 2001 From: SatinIsle Date: Tue, 12 Nov 2024 19:08:40 +0000 Subject: [PATCH 1/3] Fluff item [not approved yet] Do not merge yet, this application has not yet been approved, I will update the commit if/when it is. --- .../loadout/loadout_fluffitems_vr.dm | 7 +++ code/modules/games/tarot.dm | 56 ++++++++++++++++++ icons/obj/playing_cards.dmi | Bin 5738 -> 7317 bytes 3 files changed, 63 insertions(+) diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm index c63f709505..6db48e9160 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm @@ -1239,6 +1239,13 @@ ckeywhitelist = list("satinisle") character_name = list("Parriz Tavakdavi") +/datum/gear/fluff/dark_tarot + path = /obj/item/deck/dark_tarot + display_name = "dark rose tarot deck" + ckeywhitelist = list("satinisle") + character_name = list("Millie Orlen") + + // T CKEYS /datum/gear/fluff/ascian_medal path = /obj/item/clothing/accessory/medal/silver/unity/tabiranth diff --git a/code/modules/games/tarot.dm b/code/modules/games/tarot.dm index 44407c9ca2..4ba7b26498 100644 --- a/code/modules/games/tarot.dm +++ b/code/modules/games/tarot.dm @@ -41,3 +41,59 @@ cooldown = world.time else return + +///Fluff item, using a separate item rather than a subitem to customise New() + +/obj/item/deck/dark_tarot + name = "dark rose tarot deck" + desc = "A limited edition tarot deck for the scene-girl inclined!" + icon_state = "dark_tarot" + +/obj/item/deck/dark_tarot/New() + ..() + + var/datum/playingcard/P + for(var/name in list("fool","magician","high priestess","empress","emperor","hierophant","lovers","chariot","strength","hermit","wheel of fortune","justice","hanged man","death","temperance","devil","tower","star","moon","sun","judgement","world","white dragon with blue eyes","charred lizard","dark lotus","bash","reverse","rules","acid","abyss","maw")) + P = new() + P.name = "[name]" + if(name == "high priestess") + P.card_icon = "dark_high_priestess" + else if(name == "wheel of fortune") + P.card_icon = "dark_wheel" + else if(name == "hanged man") + P.card_icon = "dark_hanged" + else if(name == "white dragon with blue eyes") + P.card_icon = "dark_dragon" + else if(name == "charred lizard") + P.card_icon = "dark_lizard" + else if(name == "dark lotus") + P.card_icon = "dark_lotus" + else + P.card_icon = "dark_[name]" + P.back_icon = "dark_back_tarot" + cards += P + for(var/suit in list("wands","pentacles","cups","swords")) + for(var/number in list("ace","two","three","four","five","six","seven","eight","nine","ten","page","knight","queen","king")) + P = new() + P.name = "[number] of [suit]" + P.card_icon = "dark_[suit]" + P.back_icon = "dark_back_tarot" + cards += P + +/obj/item/deck/dark_tarot/shuffle() + var/mob/living/user = usr + if (cooldown < world.time - 10) + var/list/newcards = list() + while(cards.len) + var/datum/playingcard/P = pick(cards) + P.name = replacetext(P.name," reversed","") + if(prob(50)) + P.name += " reversed" + newcards += P + cards -= P + cards = newcards + playsound(src, 'sound/items/cardshuffle.ogg', 50, 1) + user.visible_message("\The [user] shuffles [src].") + cooldown = world.time + else + return diff --git a/icons/obj/playing_cards.dmi b/icons/obj/playing_cards.dmi index 0f2e51923a79205e7a1c29cefe4b17c3819c0bbf..fd1679a3235b1dc4e8ecfce31dacd51fff04cf92 100644 GIT binary patch literal 7317 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 From cc6a449af9dc4d394084c1c84dda591ca97980fd Mon Sep 17 00:00:00 2001 From: SatinIsle Date: Fri, 15 Nov 2024 19:31:01 +0000 Subject: [PATCH 2/3] Fixes up shuffle procs --- code/modules/games/cards.dm | 9 ++++----- code/modules/games/tarot.dm | 3 +-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/code/modules/games/cards.dm b/code/modules/games/cards.dm index 448ea34b5f..df4e50d63b 100644 --- a/code/modules/games/cards.dm +++ b/code/modules/games/cards.dm @@ -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) diff --git a/code/modules/games/tarot.dm b/code/modules/games/tarot.dm index 4ba7b26498..5489bb05fd 100644 --- a/code/modules/games/tarot.dm +++ b/code/modules/games/tarot.dm @@ -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) From 24e798346f2c6299e0eac927e1c9b8b0b2448160 Mon Sep 17 00:00:00 2001 From: SatinIsle Date: Sun, 17 Nov 2024 10:40:04 +0000 Subject: [PATCH 3/3] Another approved fluff item --- .../preference_setup/loadout/loadout_fluffitems_vr.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm index 6db48e9160..9635b17925 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm @@ -694,6 +694,12 @@ ckeywhitelist = list("john.wayne9392") character_name = list("Harmony Pretchl") +/datum/gear/fluff/vox_dylo_pills + path = /obj/item/storage/pill_bottle/dylovene + display_name = "Dylovene pill bottle" + ckeywhitelist = list("jparker890") + character_name = list("Krey-Timinine") + /datum/gear/fluff/koyo_box path = /obj/item/storage/box/fluff/koyoakimomi display_name = "Koyo's Box"