From 77aa84af1d048915112c255613b98a048a06f60c Mon Sep 17 00:00:00 2001 From: Leo Date: Wed, 13 Dec 2017 18:12:37 -0200 Subject: [PATCH 1/3] Fixes a couple Initialize procs --- code/modules/games/cas.dm | 8 ++++++++ code/modules/integrated_electronics/subtypes/input.dm | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/code/modules/games/cas.dm b/code/modules/games/cas.dm index ecdc1a641f..7c32e3235a 100644 --- a/code/modules/games/cas.dm +++ b/code/modules/games/cas.dm @@ -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) diff --git a/code/modules/integrated_electronics/subtypes/input.dm b/code/modules/integrated_electronics/subtypes/input.dm index 2cf44be975..276d3d9ca0 100644 --- a/code/modules/integrated_electronics/subtypes/input.dm +++ b/code/modules/integrated_electronics/subtypes/input.dm @@ -483,7 +483,7 @@ var/datum/radio_frequency/radio_connection /obj/item/integrated_circuit/input/signaler/Initialize() - ..() + . = ..() spawn(40) set_frequency(frequency) // Set the pins so when someone sees them, they won't show as null From 9f5cef7748ea322d38bcba2a28c6ab3f3dcb36b1 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Wed, 13 Dec 2017 16:44:34 -0500 Subject: [PATCH 2/3] Update cas.dm --- code/modules/games/cas.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/games/cas.dm b/code/modules/games/cas.dm index 7c32e3235a..62ac2fab1a 100644 --- a/code/modules/games/cas.dm +++ b/code/modules/games/cas.dm @@ -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() From 81d30a08e62049cfaf95a378776f0ad53a03c604 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Wed, 13 Dec 2017 16:44:52 -0500 Subject: [PATCH 3/3] Update cas.dm --- code/modules/games/cas.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/games/cas.dm b/code/modules/games/cas.dm index 62ac2fab1a..00e513dcbd 100644 --- a/code/modules/games/cas.dm +++ b/code/modules/games/cas.dm @@ -53,10 +53,6 @@ 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)