From dbd8fc2308aacf1b65190bc85e8da99cd9e863e2 Mon Sep 17 00:00:00 2001 From: deltanedas <@deltanedas:kde.org> Date: Mon, 12 Feb 2024 08:58:24 +0000 Subject: [PATCH 1/3] fix fish labeler crafting --- Resources/Prototypes/Entities/Objects/Fun/toys.yml | 3 +++ .../Prototypes/Entities/Objects/Specific/rehydrateable.yml | 2 ++ Resources/Prototypes/Nyanotrasen/tags.yml | 3 +++ 3 files changed, 8 insertions(+) diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 75259bfaf76..5d655eb2b68 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -439,6 +439,9 @@ path: /Audio/Effects/bite.ogg angle: 0 animation: WeaponArcBite # Rrrr! + - type: Tag + tags: + - PlushieCarp # DeltaV - fish labeler craft - type: entity parent: BasePlushie diff --git a/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml b/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml index 2adce1e66b3..b51517786f0 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml @@ -204,6 +204,8 @@ handle: false sound: path: /Audio/Effects/bite.ogg + - type: Tag + tags: [] # DeltaV - remove PlushieCarp tag to prevent wasting - type: entity parent: BaseItem diff --git a/Resources/Prototypes/Nyanotrasen/tags.yml b/Resources/Prototypes/Nyanotrasen/tags.yml index 54f39b7b6ef..ff3b901b1cc 100644 --- a/Resources/Prototypes/Nyanotrasen/tags.yml +++ b/Resources/Prototypes/Nyanotrasen/tags.yml @@ -12,3 +12,6 @@ - type: Tag id: NormalityCrystal + +- type: Tag + id: PlushieCarp From edbefc0a882119146e16f6056e476887ddea520b Mon Sep 17 00:00:00 2001 From: deltanedas <@deltanedas:kde.org> Date: Mon, 12 Feb 2024 09:08:10 +0000 Subject: [PATCH 2/3] hand labeler tag --- Resources/Prototypes/Entities/Objects/Tools/hand_labeler.yml | 3 +++ Resources/Prototypes/Nyanotrasen/tags.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/Resources/Prototypes/Entities/Objects/Tools/hand_labeler.yml b/Resources/Prototypes/Entities/Objects/Tools/hand_labeler.yml index 1d9bb47e0e6..7e883953363 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/hand_labeler.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/hand_labeler.yml @@ -25,3 +25,6 @@ - Item tags: - Structure + - type: Tag + tags: + - HandLabeler # DeltaV - fish labeler diff --git a/Resources/Prototypes/Nyanotrasen/tags.yml b/Resources/Prototypes/Nyanotrasen/tags.yml index ff3b901b1cc..b93695437e7 100644 --- a/Resources/Prototypes/Nyanotrasen/tags.yml +++ b/Resources/Prototypes/Nyanotrasen/tags.yml @@ -10,6 +10,9 @@ - type: Tag id: BluespaceCrystal +- type: Tag + id: HandLabeler + - type: Tag id: NormalityCrystal From d886e1b19c998eebd97d09d24e555a717b635df4 Mon Sep 17 00:00:00 2001 From: deltanedas <@deltanedas:kde.org> Date: Tue, 13 Feb 2024 17:05:04 +0000 Subject: [PATCH 3/3] remove dupe tag --- Resources/Prototypes/Nyanotrasen/tags.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/Resources/Prototypes/Nyanotrasen/tags.yml b/Resources/Prototypes/Nyanotrasen/tags.yml index b93695437e7..ff3b901b1cc 100644 --- a/Resources/Prototypes/Nyanotrasen/tags.yml +++ b/Resources/Prototypes/Nyanotrasen/tags.yml @@ -10,9 +10,6 @@ - type: Tag id: BluespaceCrystal -- type: Tag - id: HandLabeler - - type: Tag id: NormalityCrystal