common/scripted_effects/RG_event_effects.txt

@@ -160,19 +160,20 @@ rg_event_effect_planet2027_spawn_maid_species = {
 				plural = this
 				class = RG_MACHINE
 				portrait = "rg_machine_maid"
-				can_be_modified = no
+				can_be_modified = this
 				homeworld = this
 				namelist = this
 				gender = this
 				traits = {
 					trait = trait_machine_unit
+					trait = trait_robot_domestic_protocols
 					trait = rg_machine_maid_trait
 					trait = trait_auto_mod_robotic
 					trait = trait_robot_streamlined_protocols
 					trait = trait_robot_luxurious
 				}
 				effect = {
-					save_global_event_target_as = rg_owner_main_maid_species
+					save_event_target_as = rg_owner_main_maid_species
 				}
 			}
 		}

common/scripted_effects/RG_gray_goo_effects.txt

@@ -665,7 +665,29 @@ rg_juggernaut_habitat_init = {
 								}
 							}
 							every_owned_pop = {
-								rg_event_effect_planet2027_spawn_maid_species = yes
+								modify_species = {
+									effect = {
+										create_species = {
+											is_mod = yes
+											name = "RG_MACHINE"
+											plural = this
+											class = RG_MACHINE
+											portrait = "rg_machine_maid"
+											can_be_modified = this
+											homeworld = this
+											namelist = this
+											gender = this
+											traits = {
+												trait = trait_machine_unit
+												trait = rg_machine_maid_trait
+												trait = trait_robot_mass_produced
+											}
+											effect = {
+												save_global_event_target_as = rg_owner_main_maid_species
+											}
+										}
+									}
+								}
 							}
 						}
 						set_name = "NAME_rg_gray_habitat_base"

events/RG_planet_event.txt

@@ -27,10 +27,6 @@ country_event = {
 					category = bio_trophy
 					value >= 1
 				}
-				free_jobs_of_type = {
-					job = servant
-					value >= 1
-				}
 			}
 		}
 	}