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 18:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4357 from Citadel-Station-13/upstream-merge-33493

Browse Source 
[MIRROR] Fixes a couple Initialize procs
This commit is contained in:
deathride58
2017-12-14 03:53:50 +00:00
committed by GitHub
parent e720dfb483 81d30a08e6
commit a4fafb2b51
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,7 +27,8 @@
decksize = 50 decksize = 50
card_text_file = "strings/cas_black.txt" card_text_file = "strings/cas_black.txt"
/obj/item/toy/cards/deck/cas/New() /obj/item/toy/cards/deck/cas/Initialize()
. = ..()
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()
@@ -52,7 +53,6 @@
P.card_icon = "cas_white" P.card_icon = "cas_white"
cards += P cards += P
shuffle_inplace(cards) // distribute blank cards throughout deck shuffle_inplace(cards) // distribute blank cards throughout deck
..()
/obj/item/toy/cards/deck/cas/attack_hand(mob/user) /obj/item/toy/cards/deck/cas/attack_hand(mob/user)
if(user.lying) if(user.lying)

2
code/modules/integrated_electronics/subtypes/input.dm
View File

@@ -483,7 +483,7 @@
var/datum/radio_frequency/radio_connection var/datum/radio_frequency/radio_connection
/obj/item/integrated_circuit/input/signaler/Initialize() /obj/item/integrated_circuit/input/signaler/Initialize()
..() . = ..()
spawn(40) spawn(40)
set_frequency(frequency) set_frequency(frequency)
// Set the pins so when someone sees them, they won't show as null // Set the pins so when someone sees them, they won't show as null