remove racism (#23039)

* Remove only 'species' is crew rules

* hit space one too many times

diff --git a/Content.Server/StationEvents/Events/IonStormRule.cs b/Content.Server/StationEvents/Events/IonStormRule.cs
index 409a152a056672b1997a07813cbe3e5ddd865776..e73c9a18131f1cfdf6287ff8c2ef0f618a24ca1f 100644 (file)
--- a/Content.Server/StationEvents/Events/IonStormRule.cs
+++ b/Content.Server/StationEvents/Events/IonStormRule.cs
@@ -53,8 +53,6 @@ public sealed class IonStormRule : StationEventSystem<IonStormRuleComponent>
     [ValidatePrototypeId<DatasetPrototype>]
     private const string AllergySeverities = "IonStormAllergySeverities";
     [ValidatePrototypeId<DatasetPrototype>]
-    private const string Species = "IonStormSpecies";
-    [ValidatePrototypeId<DatasetPrototype>]
     private const string Concepts = "IonStormConcepts";
     [ValidatePrototypeId<DatasetPrototype>]
     private const string Drinks = "IonStormDrinks";
@@ -173,7 +171,6 @@ public sealed class IonStormRule : StationEventSystem<IonStormRuleComponent>
         var action = Pick(Actions);
         var allergy = Pick(Allergies);
         var allergySeverity = Pick(AllergySeverities);
-        var species = Pick(Species);
         var concept = Pick(Concepts);
         var drink = Pick(Drinks);
         var food = Pick(Foods);
@@ -206,21 +203,20 @@ public sealed class IonStormRule : StationEventSystem<IonStormRuleComponent>
             _ => Loc.GetString("ion-storm-heads")
         };
         var part = Loc.GetString("ion-storm-part", ("part", RobustRandom.Prob(0.5f)));
-        var harm = RobustRandom.Next(0, 7) switch
+        var harm = RobustRandom.Next(0, 6) switch
         {
             0 => concept,
             1 => $"{adjective} {threats}",
             2 => $"{adjective} {objects}",
             3 => Loc.GetString("ion-storm-adjective-things", ("adjective", adjective)),
-            4 => species,
-            5 => crew1,
+            4 => crew1,
             _ => Loc.GetString("ion-storm-x-and-y", ("x", crew1), ("y", crew2))
         };
 
         if (plural) feeling = feelingPlural;
 
         // message logic!!!
-        return RobustRandom.Next(0, 37) switch
+        return RobustRandom.Next(0, 36) switch
         {
             0  => Loc.GetString("ion-storm-law-on-station", ("joined", joined), ("subjects", triple)),
             1  => Loc.GetString("ion-storm-law-no-shuttle", ("joined", joined), ("subjects", triple)),
@@ -251,12 +247,11 @@ public sealed class IonStormRule : StationEventSystem<IonStormRuleComponent>
             27 => Loc.GetString("ion-storm-law-crew-only-1", ("who", crew1), ("part", part)),
             28 => Loc.GetString("ion-storm-law-crew-only-2", ("who", crew1), ("other", crew2), ("part", part)),
             29 => Loc.GetString("ion-storm-law-crew-only-subjects", ("adjective", adjective), ("subjects", RobustRandom.Prob(0.5f) ? objectsThreats : "PEOPLE"), ("part", part)),
-            30 => Loc.GetString("ion-storm-law-crew-only-species", ("species", species), ("part", part)),
-            31 => Loc.GetString("ion-storm-law-crew-must-do", ("must", must), ("part", part)),
-            32 => Loc.GetString("ion-storm-law-crew-must-have", ("adjective", adjective), ("objects", objects), ("part", part)),
-            33 => Loc.GetString("ion-storm-law-crew-must-eat", ("who", who), ("adjective", adjective), ("food", food), ("part", part)),
-            34 => Loc.GetString("ion-storm-law-harm", ("who", harm)),
-            35 => Loc.GetString("ion-storm-law-protect", ("who", harm)),
+            30 => Loc.GetString("ion-storm-law-crew-must-do", ("must", must), ("part", part)),
+            31 => Loc.GetString("ion-storm-law-crew-must-have", ("adjective", adjective), ("objects", objects), ("part", part)),
+            32 => Loc.GetString("ion-storm-law-crew-must-eat", ("who", who), ("adjective", adjective), ("food", food), ("part", part)),
+            33 => Loc.GetString("ion-storm-law-harm", ("who", harm)),
+            34 => Loc.GetString("ion-storm-law-protect", ("who", harm)),
             _ => Loc.GetString("ion-storm-law-concept-verb", ("concept", concept), ("verb", verb), ("subjects", triple))
         };
     }

diff --git a/Resources/Locale/en-US/station-events/events/ion-storm.ftl b/Resources/Locale/en-US/station-events/events/ion-storm.ftl
index 8687a31d70dd9dbe36b8f2b9e544bde77bf140c6..28192d966370f269db6426b5f3327b020e11111b 100644 (file)
--- a/Resources/Locale/en-US/station-events/events/ion-storm.ftl
+++ b/Resources/Locale/en-US/station-events/events/ion-storm.ftl
@@ -77,7 +77,6 @@ ion-storm-part = {$part ->
 ion-storm-law-crew-only-1 = ONLY THE {$who} ARE {$part} OF THE CREW
 ion-storm-law-crew-only-2 = ONLY THE {$who} AND {$other} ARE {$part} OF THE CREW
 ion-storm-law-crew-only-subjects = ONLY {$adjective} {$subjects} ARE {$part} OF THE CREW
-ion-storm-law-crew-only-species = ONLY {$species} ARE {$part} OF THE CREW
 ion-storm-law-crew-must-do = ONLY THOSE WHO {$must} ARE {$part} OF THE CREW
 ion-storm-law-crew-must-have = ONLY THOSE WHO HAVE {$adjective} {$objects} ARE {$part} OF THE CREW
 ion-storm-law-crew-must-eat = ONLY THOSE WHO EAT {$adjective} {$food} ARE {$part} OF THE CREW

diff --git a/Resources/Prototypes/Datasets/ion_storm.yml b/Resources/Prototypes/Datasets/ion_storm.yml
index 776015269affdeb3272606f6de4312fce5ca7ad6..518e9accaeab2a88bdd23d24c9088edfc8dc9cb4 100644 (file)
--- a/Resources/Prototypes/Datasets/ion_storm.yml
+++ b/Resources/Prototypes/Datasets/ion_storm.yml
@@ -806,20 +806,6 @@
   - TRAITORS
   - VEGETABLES
 
-# Species, for when the law holder has to commit genocide. Plural.
-- type: dataset
-  id: IonStormSpecies
-  values:
-  - ARACHNAE
-  - CYBORGS
-  - DIONAE
-  - HUMANS
-  - LIZARDMEN
-  - MOFFERS
-  - MONKEYS
-  - SLIME PEOPLE
-  - SKELETONS
-
 # Specific actions that either harm humans or must be done to not
 # harm humans. Make sure they're plural and "not" can be tacked
 # onto the front of them.