shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update cas.dm

Browse Source
This commit is contained in:
deathride58
2017-12-13 16:44:34 -05:00
committed by GitHub
parent 77aa84af1d
commit 9f5cef7748
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/games/cas.dm
-4
View File
@@ -27,12 +27,8 @@
decksize = 50 decksize = 50
card_text_file = "strings/cas_black.txt" card_text_file = "strings/cas_black.txt"
<<<<<<< HEAD
/obj/item/toy/cards/deck/cas/New()
=======
/obj/item/toy/cards/deck/cas/Initialize() /obj/item/toy/cards/deck/cas/Initialize()
. = ..() . = ..()
>>>>>>> cfb0b8a... Merge pull request #33493 from vuonojenmustaturska/initializefixes
var/static/list/cards_against_space = list("cas_white" = world.file2list("strings/cas_white.txt"),"cas_black" = world.file2list("strings/cas_black.txt")) var/static/list/cards_against_space = list("cas_white" = world.file2list("strings/cas_white.txt"),"cas_black" = world.file2list("strings/cas_black.txt"))
allcards = cards_against_space[card_face] allcards = cards_against_space[card_face]
var/list/possiblecards = allcards.Copy() var/list/possiblecards = allcards.Copy()