cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 09:54:52 +00:00
Code Issues 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

4
code/modules/games/cas.dm
View File

@@ -27,12 +27,8 @@
decksize = 50
card_text_file = "strings/cas_black.txt"
<<<<<<< HEAD
/obj/item/toy/cards/deck/cas/New()
=======
/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"))
allcards = cards_against_space[card_face]
var/list/possiblecards = allcards.Copy()