From e925aea45471c1e61e53ce6f2c8e357f9b214dbe Mon Sep 17 00:00:00 2001 From: SmArtKar <44720187+SmArtKar@users.noreply.github.com> Date: Tue, 23 Feb 2021 12:44:11 +0300 Subject: [PATCH 1/5] Fixes --- code/__HELPERS/roundend.dm | 2 ++ code/controllers/subsystem/job.dm | 24 ++++++++++++++----- .../subsystem/persistence/_persistence.dm | 1 - code/modules/tcg/cards.dm | 16 ++++++++++++- 4 files changed, 35 insertions(+), 8 deletions(-) diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm index a860a8cd3f..6f7eeb95c3 100644 --- a/code/__HELPERS/roundend.dm +++ b/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 diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm index 0ba6076be2..c090d7367c 100644 --- a/code/controllers/subsystem/job.dm +++ b/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 diff --git a/code/controllers/subsystem/persistence/_persistence.dm b/code/controllers/subsystem/persistence/_persistence.dm index 9b2c019db4..d494561d0f 100644 --- a/code/controllers/subsystem/persistence/_persistence.dm +++ b/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. diff --git a/code/modules/tcg/cards.dm b/code/modules/tcg/cards.dm index ff7d2fee2a..b581e1d5b4 100644 --- a/code/modules/tcg/cards.dm +++ b/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) @@ -796,7 +804,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 From 60011f339d8f7f0978d72b234d70ac3a6e8670b1 Mon Sep 17 00:00:00 2001 From: Vynzill Date: Sun, 28 Feb 2021 00:33:10 -0600 Subject: [PATCH 2/5] Jungle Gateway Quickfix haha, whoops! forgot I left a cursed rice hat in front of gate during my testing --- _maps/RandomZLevels/away_mission/jungleresort.dmm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/_maps/RandomZLevels/away_mission/jungleresort.dmm b/_maps/RandomZLevels/away_mission/jungleresort.dmm index 4afe638edb..9ff92b619a 100644 --- a/_maps/RandomZLevels/away_mission/jungleresort.dmm +++ b/_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 "} - From d22856c6a5212ff8786e7461adc07ea5d46e1cb2 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 28 Feb 2021 02:26:58 -0600 Subject: [PATCH 3/5] Automatic changelog generation for PR #14293 [ci skip] --- html/changelogs/AutoChangeLog-pr-14293.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-14293.yml diff --git a/html/changelogs/AutoChangeLog-pr-14293.yml b/html/changelogs/AutoChangeLog-pr-14293.yml new file mode 100644 index 0000000000..046e486ac9 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-14293.yml @@ -0,0 +1,6 @@ +author: "SmArtKar" +delete-after: True +changes: + - bugfix: "Fixes decks breaking your screen" + - bugfix: "Fixes binders not saving cards" + - bugfix: "Fixes binders not saving multiple cards of the same type" From d8b1878feae3a4737e1271284a350c31f2268397 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 28 Feb 2021 03:23:03 -0600 Subject: [PATCH 4/5] Automatic changelog generation for PR #14340 [ci skip] --- html/changelogs/AutoChangeLog-pr-14340.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-14340.yml diff --git a/html/changelogs/AutoChangeLog-pr-14340.yml b/html/changelogs/AutoChangeLog-pr-14340.yml new file mode 100644 index 0000000000..6d6e06d3ec --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-14340.yml @@ -0,0 +1,4 @@ +author: "Vynzill" +delete-after: True +changes: + - bugfix: "cursed rice hat right in front of the jungle gateway's entrance is now removed from this dimensional plane" From 8700b98a718d529e243187dd5d03dbdb8b89dbbf Mon Sep 17 00:00:00 2001 From: Changelogs Date: Mon, 1 Mar 2021 00:15:08 +0000 Subject: [PATCH 5/5] Automatic changelog compile [ci skip] --- html/changelog.html | 12 ++++++++++++ html/changelogs/.all_changelog.yml | 8 ++++++++ html/changelogs/AutoChangeLog-pr-14293.yml | 6 ------ html/changelogs/AutoChangeLog-pr-14340.yml | 4 ---- 4 files changed, 20 insertions(+), 10 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-14293.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-14340.yml diff --git a/html/changelog.html b/html/changelog.html index 65e2d571a2..6e7ba6ea84 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -50,6 +50,18 @@ -->
+

01 March 2021

+

SmArtKar updated:

+
    +
  • Fixes decks breaking your screen
    • +
  • Fixes binders not saving cards
    • +
  • Fixes binders not saving multiple cards of the same type
    • +
+

Vynzill updated:

+
    +
  • cursed rice hat right in front of the jungle gateway's entrance is now removed from this dimensional plane
    • +
+

28 February 2021

Putnam3145 updated:

    diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 6ba2436d94..a6f4010d75 100644 --- a/html/changelogs/.all_changelog.yml +++ b/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 diff --git a/html/changelogs/AutoChangeLog-pr-14293.yml b/html/changelogs/AutoChangeLog-pr-14293.yml deleted file mode 100644 index 046e486ac9..0000000000 --- a/html/changelogs/AutoChangeLog-pr-14293.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: "SmArtKar" -delete-after: True -changes: - - bugfix: "Fixes decks breaking your screen" - - bugfix: "Fixes binders not saving cards" - - bugfix: "Fixes binders not saving multiple cards of the same type" diff --git a/html/changelogs/AutoChangeLog-pr-14340.yml b/html/changelogs/AutoChangeLog-pr-14340.yml deleted file mode 100644 index 6d6e06d3ec..0000000000 --- a/html/changelogs/AutoChangeLog-pr-14340.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Vynzill" -delete-after: True -changes: - - bugfix: "cursed rice hat right in front of the jungle gateway's entrance is now removed from this dimensional plane"