Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos

code/controllers/subsystem/job.dm

@@ -490,6 +490,43 @@ SUBSYSTEM_DEF(job)
 		job.after_spawn(H, M, joined_late) // note: this happens before the mob has a key! M will always have a client, H might not.
 		equip_loadout(N, H, TRUE)//CIT CHANGE - makes players spawn with in-backpack loadout items properly. A little hacky but it works
 
+	if(ishuman(H) && H.client && N)
+		if(H.client && H.client.prefs && length(H.client.prefs.tcg_cards))
+			var/obj/item/tcgcard_binder/binder = new(get_turf(H))
+			H.equip_to_slot_if_possible(binder, SLOT_IN_BACKPACK, disable_warning = TRUE, bypass_equip_delay_self = TRUE)
+			for(var/card_type in H.client.prefs.tcg_cards)
+				if(card_type)
+					if(islist(H.client.prefs.tcg_cards[card_type]))
+						for(var/duplicate in H.client.prefs.tcg_cards[card_type])
+							var/obj/item/tcg_card/card = new(get_turf(H), card_type, duplicate)
+							card.forceMove(binder)
+							binder.cards.Add(card)
+					else
+						var/obj/item/tcg_card/card = new(get_turf(H), card_type, H.client.prefs.tcg_cards[card_type])
+						card.forceMove(binder)
+						binder.cards.Add(card)
+			binder.check_for_exodia()
+			if(length(H.client.prefs.tcg_decks))
+				binder.decks = H.client.prefs.tcg_decks
+	else
+		if(H && N.client.prefs && length(N.client.prefs.tcg_cards))
+			var/obj/item/tcgcard_binder/binder = new(get_turf(H))
+			H.equip_to_slot_if_possible(binder, SLOT_IN_BACKPACK, disable_warning = TRUE, bypass_equip_delay_self = TRUE)
+			for(var/card_type in N.client.prefs.tcg_cards)
+				if(card_type)
+					if(islist(H.client.prefs.tcg_cards[card_type]))
+						for(var/duplicate in N.client.prefs.tcg_cards[card_type])
+							var/obj/item/tcg_card/card = new(get_turf(H), card_type, duplicate)
+							card.forceMove(binder)
+							binder.cards.Add(card)
+					else
+						var/obj/item/tcg_card/card = new(get_turf(H), card_type, N.client.prefs.tcg_cards[card_type])
+						card.forceMove(binder)
+						binder.cards.Add(card)
+			binder.check_for_exodia()
+			if(length(N.client.prefs.tcg_decks))
+				binder.decks = N.client.prefs.tcg_decks
+
 	return H
 /*
 /datum/controller/subsystem/job/proc/handle_auto_deadmin_roles(client/C, rank)

code/controllers/subsystem/persistence/_persistence.dm

@@ -349,3 +349,15 @@ SUBSYSTEM_DEF(persistence)
 		if(!ending_human.client)
 			return
 		ending_human.client.prefs.save_character()
+
+/datum/controller/subsystem/persistence/proc/SaveTCGCards()
+	for(var/i in GLOB.joined_player_list)
+		var/mob/living/carbon/human/ending_human = get_mob_by_ckey(i)
+		if(!istype(ending_human) || !ending_human.mind || !ending_human.client || !ending_human.client.prefs || !ending_human.client.prefs.tcg_cards)
+			continue
+
+		var/mob/living/carbon/human/original_human = ending_human.mind.original_character
+		if(!original_human || original_human.stat == DEAD || !(original_human == ending_human))
+			continue
+
+		ending_human.SaveTCGCards()

code/controllers/subsystem/vote.dm

@@ -68,6 +68,10 @@ SUBSYSTEM_DEF(vote)
 	//get the highest number of votes
 	var/greatest_votes = 0
 	var/total_votes = 0
+	if(mode == "gamemode" && CONFIG_GET(flag/must_be_readied_to_vote_gamemode))
+		for(var/mob/dead/new_player/P in GLOB.player_list)
+			if(P.ready != PLAYER_READY_TO_PLAY && voted[P.ckey])
+				choices[choices[voted[P.ckey]]]--
 	for(var/option in choices)
 		var/votes = choices[option]
 		total_votes += votes
@@ -101,6 +105,10 @@ SUBSYSTEM_DEF(vote)
 
 /datum/controller/subsystem/vote/proc/calculate_condorcet_votes(var/blackbox_text)
 	// https://en.wikipedia.org/wiki/Schulze_method#Implementation
+	if((mode == "gamemode" || mode == "dynamic") && CONFIG_GET(flag/must_be_readied_to_vote_gamemode))
+		for(var/mob/dead/new_player/P in GLOB.player_list)
+			if(P.ready != PLAYER_READY_TO_PLAY && voted[P.ckey])
+				voted -= P.ckey
 	var/list/d[][] = new/list(choices.len,choices.len) // the basic vote matrix, how many times a beats b
 	for(var/ckey in voted)
 		var/list/this_vote = voted[ckey]
@@ -147,6 +155,10 @@ SUBSYSTEM_DEF(vote)
 	for(var/choice in choices)
 		scores_by_choice += "[choice]"
 		scores_by_choice["[choice]"] = list()
+	if((mode == "gamemode" || mode == "dynamic") && CONFIG_GET(flag/must_be_readied_to_vote_gamemode))
+		for(var/mob/dead/new_player/P in GLOB.player_list)
+			if(P.ready != PLAYER_READY_TO_PLAY && voted[P.ckey])
+				voted -= P.ckey
 	for(var/ckey in voted)
 		var/list/this_vote = voted[ckey]
 		var/list/pretty_vote = list()