From 7388bdc56c61624d5f83cc48a367b7a48b220e5e Mon Sep 17 00:00:00 2001 From: Sir_CannonFodder Date: Sat, 23 May 2026 18:32:15 -0700 Subject: [PATCH 1/4] Plasmamen can now enable wizard and nukie in there customization screen since speciesOverride will turn them into humans anyway. --- Resources/Prototypes/Roles/Antags/nukeops.yml | 12 ------------ .../_Goobstation/Wizard/gamerules_wizard.yml | 5 +++++ Resources/Prototypes/_Goobstation/Wizard/wizard.yml | 4 ---- 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/Resources/Prototypes/Roles/Antags/nukeops.yml b/Resources/Prototypes/Roles/Antags/nukeops.yml index 9cdc0bfed27..5bb9a74dda6 100644 --- a/Resources/Prototypes/Roles/Antags/nukeops.yml +++ b/Resources/Prototypes/Roles/Antags/nukeops.yml @@ -106,10 +106,6 @@ - !type:DepartmentTimeRequirement department: Security time: 36000 # 10h Goobstation - - !type:SpeciesRequirement - inverted: true - species: - - Plasmaman guides: [ NuclearOperatives ] - type: antag @@ -130,10 +126,6 @@ - !type:RoleTimeRequirement role: JobBrigmedic # added Brigmedic requirement - Omu change time: 18000 #5hr Omu change - - !type:SpeciesRequirement - inverted: true - species: - - Plasmaman guides: [ NuclearOperatives ] - type: antag @@ -152,10 +144,6 @@ department: Command time: 18000 # 5h Goobstation # should be changed to nukie playtime when thats tracked (wyci) - - !type:SpeciesRequirement - inverted: true - species: - - Plasmaman guides: [ NuclearOperatives ] - type: startingGear diff --git a/Resources/Prototypes/_Goobstation/Wizard/gamerules_wizard.yml b/Resources/Prototypes/_Goobstation/Wizard/gamerules_wizard.yml index a12c1d77f23..8819532e760 100644 --- a/Resources/Prototypes/_Goobstation/Wizard/gamerules_wizard.yml +++ b/Resources/Prototypes/_Goobstation/Wizard/gamerules_wizard.yml @@ -154,6 +154,11 @@ - type: NpcFactionMember factions: - Wizard + - type: AntagLoadProfileRule + speciesOverride: Human + speciesOverrideBlacklist: + - Yowie # Penalized by wearing robes, still should be possible to select them in magic mirror. + - Plasmaman # EE - type: entity parent: BaseGameRule diff --git a/Resources/Prototypes/_Goobstation/Wizard/wizard.yml b/Resources/Prototypes/_Goobstation/Wizard/wizard.yml index 341057d7add..7deea598fef 100644 --- a/Resources/Prototypes/_Goobstation/Wizard/wizard.yml +++ b/Resources/Prototypes/_Goobstation/Wizard/wizard.yml @@ -36,10 +36,6 @@ requirements: - !type:OverallPlaytimeRequirement time: 126000 # 35h - - !type:SpeciesRequirement - inverted: true - species: - - Plasmaman guides: [ Wizard ] - type: antag From 20330dd20b3f0b05cc5e08c3f7095d1f344032bf Mon Sep 17 00:00:00 2001 From: SirCannonFodder <66926794+SirCannonFodder@users.noreply.github.com> Date: Sat, 6 Jun 2026 15:49:23 -0700 Subject: [PATCH 2/4] Revert "Plasmamen can now enable wizard and nukie in there customization screen since speciesOverride will turn them into humans anyway." This reverts commit 7388bdc56c61624d5f83cc48a367b7a48b220e5e. --- Resources/Prototypes/Roles/Antags/nukeops.yml | 12 ++++++++++++ .../_Goobstation/Wizard/gamerules_wizard.yml | 5 ----- Resources/Prototypes/_Goobstation/Wizard/wizard.yml | 4 ++++ 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/Roles/Antags/nukeops.yml b/Resources/Prototypes/Roles/Antags/nukeops.yml index 5bb9a74dda6..9cdc0bfed27 100644 --- a/Resources/Prototypes/Roles/Antags/nukeops.yml +++ b/Resources/Prototypes/Roles/Antags/nukeops.yml @@ -106,6 +106,10 @@ - !type:DepartmentTimeRequirement department: Security time: 36000 # 10h Goobstation + - !type:SpeciesRequirement + inverted: true + species: + - Plasmaman guides: [ NuclearOperatives ] - type: antag @@ -126,6 +130,10 @@ - !type:RoleTimeRequirement role: JobBrigmedic # added Brigmedic requirement - Omu change time: 18000 #5hr Omu change + - !type:SpeciesRequirement + inverted: true + species: + - Plasmaman guides: [ NuclearOperatives ] - type: antag @@ -144,6 +152,10 @@ department: Command time: 18000 # 5h Goobstation # should be changed to nukie playtime when thats tracked (wyci) + - !type:SpeciesRequirement + inverted: true + species: + - Plasmaman guides: [ NuclearOperatives ] - type: startingGear diff --git a/Resources/Prototypes/_Goobstation/Wizard/gamerules_wizard.yml b/Resources/Prototypes/_Goobstation/Wizard/gamerules_wizard.yml index 8819532e760..a12c1d77f23 100644 --- a/Resources/Prototypes/_Goobstation/Wizard/gamerules_wizard.yml +++ b/Resources/Prototypes/_Goobstation/Wizard/gamerules_wizard.yml @@ -154,11 +154,6 @@ - type: NpcFactionMember factions: - Wizard - - type: AntagLoadProfileRule - speciesOverride: Human - speciesOverrideBlacklist: - - Yowie # Penalized by wearing robes, still should be possible to select them in magic mirror. - - Plasmaman # EE - type: entity parent: BaseGameRule diff --git a/Resources/Prototypes/_Goobstation/Wizard/wizard.yml b/Resources/Prototypes/_Goobstation/Wizard/wizard.yml index 7deea598fef..341057d7add 100644 --- a/Resources/Prototypes/_Goobstation/Wizard/wizard.yml +++ b/Resources/Prototypes/_Goobstation/Wizard/wizard.yml @@ -36,6 +36,10 @@ requirements: - !type:OverallPlaytimeRequirement time: 126000 # 35h + - !type:SpeciesRequirement + inverted: true + species: + - Plasmaman guides: [ Wizard ] - type: antag From 794993faa2395f07726a0facbd7541afda3bf59f Mon Sep 17 00:00:00 2001 From: SirCannonFodder <66926794+SirCannonFodder@users.noreply.github.com> Date: Sat, 6 Jun 2026 16:30:10 -0700 Subject: [PATCH 3/4] requested changes --- Resources/Prototypes/Roles/Antags/nukeops.yml | 24 +++++++++---------- .../_Goobstation/Wizard/gamerules_wizard.yml | 5 ++++ .../Prototypes/_Goobstation/Wizard/wizard.yml | 8 +++---- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/Resources/Prototypes/Roles/Antags/nukeops.yml b/Resources/Prototypes/Roles/Antags/nukeops.yml index 9cdc0bfed27..cbaf1022f08 100644 --- a/Resources/Prototypes/Roles/Antags/nukeops.yml +++ b/Resources/Prototypes/Roles/Antags/nukeops.yml @@ -106,10 +106,10 @@ - !type:DepartmentTimeRequirement department: Security time: 36000 # 10h Goobstation - - !type:SpeciesRequirement - inverted: true - species: - - Plasmaman +# - !type:SpeciesRequirement #Omu edit start +# inverted: true +# species: +# - Plasmaman #Omu edit end guides: [ NuclearOperatives ] - type: antag @@ -130,10 +130,10 @@ - !type:RoleTimeRequirement role: JobBrigmedic # added Brigmedic requirement - Omu change time: 18000 #5hr Omu change - - !type:SpeciesRequirement - inverted: true - species: - - Plasmaman +# - !type:SpeciesRequirement #Omu edit start +# inverted: true +# species: +# - Plasmaman #Omu edit end guides: [ NuclearOperatives ] - type: antag @@ -152,10 +152,10 @@ department: Command time: 18000 # 5h Goobstation # should be changed to nukie playtime when thats tracked (wyci) - - !type:SpeciesRequirement - inverted: true - species: - - Plasmaman + # - !type:SpeciesRequirement #Omu edit start + # inverted: true + # species: + # - Plasmaman #Omu edit end guides: [ NuclearOperatives ] - type: startingGear diff --git a/Resources/Prototypes/_Goobstation/Wizard/gamerules_wizard.yml b/Resources/Prototypes/_Goobstation/Wizard/gamerules_wizard.yml index a12c1d77f23..033e5e0a101 100644 --- a/Resources/Prototypes/_Goobstation/Wizard/gamerules_wizard.yml +++ b/Resources/Prototypes/_Goobstation/Wizard/gamerules_wizard.yml @@ -154,6 +154,11 @@ - type: NpcFactionMember factions: - Wizard + - type: AntagLoadProfileRule # Omu edit, a failsafe in case a plasmaman takes a apprentice role + speciesOverride: Human + speciesOverrideBlacklist: + - Yowie # Penalized by wearing robes, still should be possible to select them in magic mirror. + - Plasmaman # EE - type: entity parent: BaseGameRule diff --git a/Resources/Prototypes/_Goobstation/Wizard/wizard.yml b/Resources/Prototypes/_Goobstation/Wizard/wizard.yml index 341057d7add..05e3e82500f 100644 --- a/Resources/Prototypes/_Goobstation/Wizard/wizard.yml +++ b/Resources/Prototypes/_Goobstation/Wizard/wizard.yml @@ -36,10 +36,10 @@ requirements: - !type:OverallPlaytimeRequirement time: 126000 # 35h - - !type:SpeciesRequirement - inverted: true - species: - - Plasmaman + # - !type:SpeciesRequirement #Omu edit start + # inverted: true + # species: + # - Plasmaman #Omu edit end guides: [ Wizard ] - type: antag From 7f440bd3415fbdbe457c7ec25d7145fb65473292 Mon Sep 17 00:00:00 2001 From: SirCannonFodder <66926794+SirCannonFodder@users.noreply.github.com> Date: Mon, 8 Jun 2026 18:10:18 -0700 Subject: [PATCH 4/4] Update Resources/Prototypes/_Goobstation/Wizard/gamerules_wizard.yml Co-authored-by: feistyfedora <12000170+feistyfedora@users.noreply.github.com> --- Resources/Prototypes/_Goobstation/Wizard/gamerules_wizard.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Goobstation/Wizard/gamerules_wizard.yml b/Resources/Prototypes/_Goobstation/Wizard/gamerules_wizard.yml index 033e5e0a101..fc672642bdb 100644 --- a/Resources/Prototypes/_Goobstation/Wizard/gamerules_wizard.yml +++ b/Resources/Prototypes/_Goobstation/Wizard/gamerules_wizard.yml @@ -158,7 +158,7 @@ speciesOverride: Human speciesOverrideBlacklist: - Yowie # Penalized by wearing robes, still should be possible to select them in magic mirror. - - Plasmaman # EE + - Plasmaman # Omu edit end, EE - type: entity parent: BaseGameRule