cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 20:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fix playing card memory (#27448)

Browse Source 
* Fix playing card memory (#82834)

## About The Pull Request

`/datum/memory/playing_cards` accepts a list of other players, which it
uses to format into an english list.

But where it is applied, it takes a list of players, formats it into an
english list, and passes it in. Oops.

Also fixed some verbage for how the memories look in-story-form.

## Changelog

🆑 Melbert
fix: Playing Cards memory now reads better
/🆑

* Fix playing card memory

---------

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
This commit is contained in:
SkyratBot
2024-04-25 17:58:52 +02:00
committed by GitHub
co-authored by MrMelbert
parent e99d8a0cca
commit eb92fee542
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/cards/deck/deck.dm
+5 -3
View File
@@ -116,15 +116,17 @@
if(length(card_players) >= 2) // need at least 2 people to play a cardgame, duh!
for(var/mob/living/carbon/player in card_players)
var/other_players = english_list(card_players - player)
var/other_players = card_players - player
var/obj/item/toy/held_card_item = card_players[player]
player.add_mood_event("playing_cards", /datum/mood_event/playing_cards)
player.add_mob_memory(/datum/memory/playing_cards, \
player.add_mob_memory( \
/datum/memory/playing_cards, \
deuteragonist = dealer, \
game = cardgame_desc, \
protagonist_held_card = held_card_item, \
other_players = other_players)
other_players = other_players, \
)
/obj/item/toy/cards/deck/attack_hand(mob/living/user, list/modifiers, flip_card = FALSE)
if(!ishuman(user) || !user.can_perform_action(src, NEED_DEXTERITY|FORBID_TELEKINESIS_REACH))