From b2ffb07fc6ccee460fd8d2ca4a3485b7ae9478e8 Mon Sep 17 00:00:00 2001 From: "ProjectKoi-Kalo\\Kalo" Date: Wed, 25 Sep 2024 13:58:51 +0800 Subject: [PATCH] =?UTF-8?q?Changes=20=E7=A7=8D=E6=97=8Fmergefix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/traits/RG_machine_species_trait.txt | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/common/traits/RG_machine_species_trait.txt b/common/traits/RG_machine_species_trait.txt index 826f0cd..3cb7eb6 100644 --- a/common/traits/RG_machine_species_trait.txt +++ b/common/traits/RG_machine_species_trait.txt @@ -9,7 +9,11 @@ rg_machine_maid_trait = { RG_tradition5_or_gray_owner_trigger = yes } } - species_possible_remove = { always = no } + species_possible_remove = { + FROM = { + RG_tradition5_or_gray_owner_trigger = yes + } + } species_possible_merge_add = { FROM = { RG_tradition5_or_gray_owner_trigger = yes @@ -85,6 +89,18 @@ trait_rg_machine_unit = { always = no } + species_possible_merge_add = { + FROM = { + RG_tradition5_or_gray_owner_trigger = yes + } + } + + species_possible_merge_remove = { + FROM = { + RG_tradition5_or_gray_owner_trigger = yes + } + } + icon = "gfx/interface/icons/traits/trait_machine_unit.dds" allowed_archetypes = { RG_MACHINE }