Merge remote-tracking branch 'upstream/master'

_maps/RandomZLevels/away_mission/jungleresort.dmm

@@ -413,10 +413,6 @@
 /obj/item/toy/figure/chef,
 /turf/open/floor/wood,
 /area/awaymission/jungleresort)
-"gC" = (
-/obj/item/clothing/head/rice_hat/cursed,
-/turf/open/floor/plating/dirt/jungle,
-/area/awaymission/jungleresort)
 "gK" = (
 /obj/structure/table/wood,
 /obj/item/gun/ballistic/automatic/c20r/toy/unrestricted,
@@ -13828,7 +13824,7 @@ io
 du
 YF
 io
-gC
+io
 io
 io
 ia
@@ -26666,4 +26662,3 @@ bG
 bG
 bG
 "}
-

code/__HELPERS/roundend.dm

@@ -242,6 +242,8 @@
 		SSpersistence.station_was_destroyed = TRUE
 	if(!mode.allow_persistence_save)
 		SSpersistence.station_persistence_save_disabled = TRUE
+	else
+		SSpersistence.SaveTCGCards()
 	SSpersistence.CollectData()
 
 	//stop collecting feedback during grifftime

code/controllers/subsystem/job.dm

@@ -496,9 +496,15 @@ SUBSYSTEM_DEF(job)
 			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)
-					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)
+					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
@@ -508,9 +514,15 @@ SUBSYSTEM_DEF(job)
 			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)
-					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)
+					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

code/controllers/subsystem/persistence/_persistence.dm

@@ -88,7 +88,6 @@ SUBSYSTEM_DEF(persistence)
 	SavePhotoPersistence()						//THIS IS PERSISTENCE, NOT THE LOGGING PORTION.
 	SavePaintings()
 	SaveScars()
-	SaveTCGCards()
 
 /**
  * Loads persistent data relevant to the current map: Objects, etc.

code/modules/tcg/cards.dm

@@ -381,6 +381,14 @@
 	. = ..()
 	LoadComponent(/datum/component/storage/concrete/tcg)
 
+/obj/item/tcgcard_deck/ComponentInitialize()
+	. = ..()
+	var/datum/component/storage/STR = GetComponent(/datum/component/storage/concrete/tcg)
+	STR.storage_flags = STORAGE_FLAGS_LEGACY_DEFAULT
+	STR.max_volume = DEFAULT_VOLUME_TINY * 30
+	STR.max_w_class = DEFAULT_VOLUME_TINY
+	STR.max_items = 30
+
 /obj/item/tcgcard_deck/update_icon_state()
 	. = ..()
 	if(flipped)
@@ -797,7 +805,13 @@
 	var/list/card_types = list()
 	for(var/obj/item/tcg_card/card in binder.cards)
 		//if(!card.illegal) //Uncomment if you want to block syndie cards from saving
-		card_types[card.datum_type] = card.illegal
+		if(!(card.datum_type in card_types))
+			card_types[card.datum_type] = card.illegal
+		else
+			if(islist(card_types[card.datum_type]))
+				card_types[card.datum_type] += card.illegal
+			else
+				card_types[card.datum_type] = list(card_types[card.datum_type], card.illegal)
 
 	client.prefs.tcg_decks = binder.decks
 	client.prefs.tcg_cards = card_types

html/changelog.html

@@ -50,6 +50,18 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">01 March 2021</h2>
+			<h3 class="author">SmArtKar updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixes decks breaking your screen</li>
+				<li class="bugfix">Fixes binders not saving cards</li>
+				<li class="bugfix">Fixes binders not saving multiple cards of the same type</li>
+			</ul>
+			<h3 class="author">Vynzill updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">cursed rice hat right in front of the jungle gateway's entrance is now removed from this dimensional plane</li>
+			</ul>
+
 			<h2 class="date">28 February 2021</h2>
 			<h3 class="author">Putnam3145 updated:</h3>
 			<ul class="changes bgimages16">

html/changelogs/.all_changelog.yml

@@ -28628,3 +28628,11 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - tweak: Body rejuvenation surgery will loop until the patient is completely healed.
   dzahlus:
   - bugfix: fixes toxinlovers dying from heretic stuff that should heal them instead
+2021-03-01:
+  SmArtKar:
+  - bugfix: Fixes decks breaking your screen
+  - bugfix: Fixes binders not saving cards
+  - bugfix: Fixes binders not saving multiple cards of the same type
+  Vynzill:
+  - bugfix: cursed rice hat right in front of the jungle gateway's entrance is now
+      removed from this dimensional plane