diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno/skrell.dm b/code/modules/client/preference_setup/loadout/loadout_xeno/skrell.dm index 79ce2184e8f..1977a8f1082 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno/skrell.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno/skrell.dm @@ -113,6 +113,20 @@ whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_DIONA, SPECIES_DIONA_COEUS) sort_category = "Xenowear - Skrell" +/datum/gear/homeworld_deck + display_name = "qweipaqui homeworld deck" + path = /obj/item/deck/tarot/jargon + whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_DIONA, SPECIES_DIONA_COEUS) + sort_category = "Xenowear - Skrell" + flags = GEAR_NO_SELECTION + +/datum/gear/colonist_deck // Intentionally separate from homeworld_deck, so that both can be chosen. -Lly + display_name = "qweipaqui colonist deck" + path = /obj/item/deck/tarot/nonjargon + whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_DIONA, SPECIES_DIONA_COEUS) + sort_category = "Xenowear - Skrell" + flags = GEAR_NO_SELECTION + /datum/gear/ears/skrell/goop display_name = "glowing algae" path = /obj/item/clothing/ears/skrell/goop diff --git a/code/modules/games/cards.dm b/code/modules/games/cards.dm index 6ad2209c6c9..6588369f1e9 100644 --- a/code/modules/games/cards.dm +++ b/code/modules/games/cards.dm @@ -1,5 +1,6 @@ /datum/playingcard var/name = "playing card" + var/desc = null var/card_icon = "card_back" var/back_icon = "card_back" @@ -275,9 +276,10 @@ /obj/item/hand/examine(mob/user) ..(user) if((!concealed || src.loc == user) && cards.len) - to_chat(user, "It contains: ") + if(cards.len > 1) + to_chat(user, "It contains: ") for(var/datum/playingcard/P in cards) - to_chat(user, "The [P.name].") + to_chat(user, "The [P.name]. [P.desc ? "[P.desc]" : ""]") /obj/item/hand/update_icon(var/direction = 0) diff --git a/code/modules/games/tarot.dm b/code/modules/games/tarot.dm index d88ea7e883c..9e87ad5c6ea 100644 --- a/code/modules/games/tarot.dm +++ b/code/modules/games/tarot.dm @@ -61,3 +61,100 @@ P.card_icon = "adhomai_[suit]" P.back_icon = "card_back_adhomai" cards += P + +/obj/item/deck/tarot/jargon + name = "qwei'paqui homeworld deck" + desc = "A Skrellian deck of tarot cards depicting the main constellations of Nralakk." + icon_state = "deck_jargon" + +/obj/item/deck/tarot/jargon/generate_deck() + var/datum/playingcard/P + for(var/name in list("Island","Hatching Egg","Star Chanter","Jiu'x'klua","Stormcloud","Gnarled Tree","Poet","Bloated Toad","Void","Qu'Poxii","Fisher","Mountain","Sraso","Nioh")) + P = new() + P.name = "[name]" + var/suit = "jargon" + switch(name) + if("Island") + P.desc = "One of the main constellations that is shared by both Qeblak and Weishii. It is associated with Loneliness. Introspection. Earth. Rising above or Sinking beneath. Reality." + if("Hatching Egg") + name = "egg" + P.desc = "One of the main constellations that is shared by both Qeblak and Weishii. It is associated with New beginnings. A fresh start. Youth. Life. Excitement. Ignorance. Foolishness. Joy." + if("Star Chanter") + name = "chanter" + P.desc = "One of the main constellations that is shared by both Qeblak and Weishii. It is associated with Wisdom. Spirituality. Connection with the stars. Connection to history. Aloofness. A rigid path. Air." + if("Jiu'x'klua") + name = "klua" + P.desc = "One of the main constellations that is shared by both Qeblak and Weishii. It is associated with Art. Creation. Loss. Sadness. Longing. Communication. The imaginary." + if("Stormcloud") + P.desc = "One of the main constellations that is shared by both Qeblak and Weishii. It is associated with Conflict. Shock. Surprises. Tension. Endurance. Strength. Force. Fire." + if("Gnarled Tree") + name = "gnarledtree" + P.desc = "One of the main constellations that is shared by both Qeblak and Weishii. It is associated with Age. Wisdom. Sickness. Frailty, or, in certain orientations, toughness. Rigidity. Tradition. Plantlife. Balance." + if("Poet") + P.desc = "One of the main constellations that is shared by both Qeblak and Weishii. it is associated with Communication. Progress. Science. Advancement. Longing. Art. Expression. Loneliness. Contentment. Dreams." + if("Bloated Toad") + name = "bloatedtoad" + P.desc = "One of the main constellations that is shared by both Qeblak and Weishii. it is associated with Greed. Arrogance. Wealth. Success. Smugness. Laziness. Accomplishment. Adulthood." + if("Void") + P.desc = "One of the main constellations that is shared by both Qeblak and Weishii. it is associated with Death. Endings. Mystery. The unknown. Fear. Danger. Creation." + if("Qu'Poxii") + name = "qupoxii" + P.desc = "One of the main constellations that is shared by both Qeblak and Weishii. it is associated with Love. Friendship. Company. Opposites. Teamwork. Happiness. The material. Safety. Progress. Support." + if("Fisher") + P.desc = "One of the main constellations that is shared by both Qeblak and Weishii. it is associated with Hard work. Stagnation. Embarrassment. Water. Patience. A long, but productive wait." + if("Mountain") + suit = "aweiji" + P.desc = "One of the local constellations on the planet Aweiji. It is associated with Self-analysis. Feelings of accomplishment. Clearer view." + if("Sraso") + suit = "aweiji" + P.desc = "One of the local constellations on the planet Aweiji. It is associated with Sustainability. Growth. Safety." + if("Nioh") + suit = "aweiji" + P.desc = "One of the local constellations on the planet Aweiji. It is associated with Trust. Reliance. Perseverance. Survival." + P.card_icon = "[suit]_[lowertext(name)]" + P.back_icon = "card_off_[suit]" + cards += P + +/obj/item/deck/tarot/nonjargon + name = "qwei'paqui colonist deck" + desc = "A Skrellian deck of tarot cards depicting the local constellations of planets outside Nralakk." + icon_state = "deck_nonjargon" + +/obj/item/deck/tarot/nonjargon/generate_deck() + var/datum/playingcard/P + for(var/name in list("Shell","Wave","Trident","Palm Tree","Pulque","Eel","Iqi Star","Sky-Grazer","Dyn")) + P = new() + P.name = "[name]" + var/suit = "slz" + switch(name) + if("Shell") + P.desc = "One of the local constellations revered by the Skrell of Mendell City's Starlight Zone. It is associated with Home, Family (Severson). Refuge, Safety (Lekan)." + if("Wave") + P.desc = "One of the local constellations revered by the Skrell of Mendell City's Starlight Zone. It is associated with Pilgrimage, Journey (Severson). Escape, Freedom (Lekan)." + if("Trident") + P.desc = "One of the local constellations revered by the Skrell of Mendell City's Starlight Zone. It is associated with Protection, Security (Severson). Oppression, Subjugation (Lekan)." + if("Palm Tree") + name = "palm" + suit = "mict" + P.desc = "One of the local constellations on the planet Mictlan. It is associated with Tranquility. Agitation. Anxiety. Peace." + if("Pulque") + suit = "mict" + P.desc = "One of the local constellations on the planet Mictlan. It is associated with Togetherness. Comraderie. Overindulgence. Celebration." + if("Eel") + suit = "mict" + P.desc = "One of the local constellations on the planet Mictlan. It is associated with Turncoat. The unanticipated. Intrigue. Forthcoming." + if("Iqi Star") + name = "iqi" + suit = "newgib" + P.desc = "One of the local constellations on the planet New Gibson. It is associated with Self-Advancement. Social standing. Success." + if("Sky-Grazer") + name = "skygrazer" + suit = "newgib" + P.desc = "One of the local constellations on the planet New Gibson. It is associated with Expressiveness. Freedom. Adventure." + if("Dyn") + suit = "newgib" + P.desc = "One of the local constellations on the planet New Gibson. It is associated with Survival. Generosity. Community." + P.card_icon = "[suit]_[lowertext(name)]" + P.back_icon = "card_off_[suit]" + cards += P + diff --git a/html/changelogs/llywelwyn-skrelltarot.yml b/html/changelogs/llywelwyn-skrelltarot.yml new file mode 100644 index 00000000000..9283d760607 --- /dev/null +++ b/html/changelogs/llywelwyn-skrelltarot.yml @@ -0,0 +1,6 @@ +author: Llywelwyn + +delete-after: True + +changes: + - rscadd: "Added two decks of Skrellian tarot cards to the loadout, selectable by Skrell and Diona." diff --git a/icons/obj/playing_cards.dmi b/icons/obj/playing_cards.dmi index 88f6716a790..3ebf26c05bb 100644 Binary files a/icons/obj/playing_cards.dmi and b/icons/obj/playing_cards.dmi differ