common/inline_scripts/pop_categories/trait_production.txt

@@ -1,11 +1,5 @@
 produces = {
     trigger = {
-        # exists = planet
-        # planet = {
-        #     OR = {
-        #         rg_is_pc_nano = yes
-        #     }
-        # }
         OR = {
             has_trait = rg_machine_maid_trait
         }

common/scripted_effects/RG_event_effects.txt

@@ -177,33 +177,4 @@ rg_event_effect_planet2027_spawn_maid_species = {
 			}
 		}
 	}
-}
-
-#Species
-rg_event_effect_planet2027_spawn_maid_species_non_gray = {
-	modify_species = {
-		effect = {
-			create_species = {
-				is_mod = yes
-				name = "RG_MACHINE"
-				plural = this
-				class = RG_MACHINE
-				portrait = "rg_machine_maid"
-				can_be_modified = no
-				homeworld = this
-				namelist = this
-				gender = this
-				traits = {
-					trait = trait_machine_unit
-					trait = rg_machine_maid_trait
-					trait = trait_auto_mod_robotic
-					trait = trait_robot_streamlined_protocols
-					trait = trait_robot_luxurious
-				}
-				effect = {
-					save_event_target_as = rg_maid_species
-				}
-			}
-		}
-	}
 }

events/RG_events.txt

@@ -1193,7 +1193,8 @@ country_event = { # Memorial Valuts Civic Paragon Level Tick / FROM = Leader
 	}
 
 	immediate = {
-		random_owned_pop = {
+		rg_create_gray_planetkiller_testship_2 = yes
+		every_owned_pop = {
 			limit = {
 				is_same_species = root
 				species = {
@@ -1202,7 +1203,11 @@ country_event = { # Memorial Valuts Civic Paragon Level Tick / FROM = Leader
 					}
 				}
 			}
-			rg_event_effect_planet2027_spawn_maid_species_non_gray = yes
+			modify_species = {
+				species = this
+				add_trait = rg_machine_maid_trait
+			}
+			species = { save_event_target_as = gray_owner_modded_species }
 		}
 	}
 }

events/RG_planet_event.txt

@@ -1,6 +1,4 @@
 namespace = rg_planet
-
-
 # Furnace Lvl 1
 country_event = {
 	id = rg_planet.1000
@@ -389,7 +387,6 @@ planet_event = {
 			limit = {
 				owner = {
 					is_same_value = event_target:gray_owner
-					exists = event_target:rg_owner_main_maid_species
 				}
 			}
 			while = {
@@ -400,29 +397,10 @@ planet_event = {
 			}
 		}
 		else = {
-			if = {
-				limit = {
-					owner= {
-						any_owned_species = {
-							has_trait = rg_machine_maid_trait
-							is_subspecies = owner_main_species
-						}
-					}
-				}
-				owner = {
-					random_owned_species = {
-						limit = {
-							has_trait = rg_machine_maid_trait
-							is_subspecies = owner_main_species
-						}
-						save_event_target_as = rg_maid_species
-					}
-				}
-				while = {
-					count = num_pops
-					create_pop = {
-						species = rg_maid_species
-					}
+			while = {
+				count = num_pops
+				create_pop = {
+					species = owner_main_species
 				}
 			}
 		}