Fixes a couple Initialize procs

2017-12-13 18:12:37 -02:00
parent b03e606d35
commit 77aa84af1d
2 changed files with 9 additions and 1 deletions
@@ -27,7 +27,12 @@
 	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()
@@ -52,7 +57,10 @@
 		P.card_icon = "cas_white"
 		cards += P
 	shuffle_inplace(cards) // distribute blank cards throughout deck
+<<<<<<< HEAD
 	..()
+=======
+>>>>>>> cfb0b8a... Merge pull request #33493 from vuonojenmustaturska/initializefixes

 /obj/item/toy/cards/deck/cas/attack_hand(mob/user)
 	if(user.lying)