From c3a6c98c69b1ed605676b3897dc8b929687254ac Mon Sep 17 00:00:00 2001 From: Helm4142 Date: Sat, 18 Jan 2025 23:05:20 +0600 Subject: [PATCH 1/4] FixMatchBox --- Resources/Prototypes/Entities/Objects/Tools/matches.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Prototypes/Entities/Objects/Tools/matches.yml b/Resources/Prototypes/Entities/Objects/Tools/matches.yml index e8601fcf355d..c85246268f57 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/matches.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/matches.yml @@ -85,6 +85,12 @@ - type: Storage grid: - 0,0,2,1 + #SS220-FixMatchBox-begin + whitelist: + tags: + - Matchstick + - MatchstickSpent + #SS220-FixMatchBox-end - type: StorageFill contents: - id: Matchstick From dd3a3aad00c44fa9b45cba429a5b593151239235 Mon Sep 17 00:00:00 2001 From: Helm4142 Date: Sat, 18 Jan 2025 23:44:45 +0600 Subject: [PATCH 2/4] Fix1 --- Resources/Prototypes/Entities/Objects/Tools/matches.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Resources/Prototypes/Entities/Objects/Tools/matches.yml b/Resources/Prototypes/Entities/Objects/Tools/matches.yml index c85246268f57..27389a7935e7 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/matches.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/matches.yml @@ -47,6 +47,11 @@ id: MatchstickSpent suffix: spent components: + #SS220-FixMatchBox-begin + - type: Tag + tags: + - MatchstickSpent + #SS220-FixMatchBox-end - type: Sprite layers: - state: match_burnt From 17569c91cea80e22d05d42b9ee0c15b1e44e0186 Mon Sep 17 00:00:00 2001 From: Helm4142 Date: Sat, 18 Jan 2025 23:57:06 +0600 Subject: [PATCH 3/4] Fix2 --- Resources/Prototypes/tags.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 4da3833b1b0e..78def0de311e 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -852,6 +852,11 @@ - type: Tag id: Matchstick +#SS220-FixMatchBox-begin +- type: Tag + id: Matchstick +#SS220-FixMatchBox-end + - type: Tag id: Mayo From 593e82c89a6bd726014a2d33a42acb2069e76ead Mon Sep 17 00:00:00 2001 From: Helm4142 Date: Sun, 19 Jan 2025 00:03:22 +0600 Subject: [PATCH 4/4] Fix3 --- Resources/Prototypes/Entities/Objects/Tools/matches.yml | 6 ------ Resources/Prototypes/tags.yml | 5 ----- 2 files changed, 11 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Tools/matches.yml b/Resources/Prototypes/Entities/Objects/Tools/matches.yml index 27389a7935e7..b5b4abc05b13 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/matches.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/matches.yml @@ -47,11 +47,6 @@ id: MatchstickSpent suffix: spent components: - #SS220-FixMatchBox-begin - - type: Tag - tags: - - MatchstickSpent - #SS220-FixMatchBox-end - type: Sprite layers: - state: match_burnt @@ -94,7 +89,6 @@ whitelist: tags: - Matchstick - - MatchstickSpent #SS220-FixMatchBox-end - type: StorageFill contents: diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 78def0de311e..4da3833b1b0e 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -852,11 +852,6 @@ - type: Tag id: Matchstick -#SS220-FixMatchBox-begin -- type: Tag - id: Matchstick -#SS220-FixMatchBox-end - - type: Tag id: Mayo