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..fc672642bdb 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 # Omu edit end, 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