Renames all mob IDs from stupid old format (#4789)

Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.cs

@@ -32,7 +32,7 @@ namespace Content.Client.Lobby.UI
             IClientPreferencesManager preferencesManager)
         {
             _preferencesManager = preferencesManager;
-            _previewDummy = entityManager.SpawnEntity("HumanMob_Dummy", MapCoordinates.Nullspace);
+            _previewDummy = entityManager.SpawnEntity("MobHumanDummy", MapCoordinates.Nullspace);
 
             var header = new NanoHeading
             {

Content.Client/Preferences/UI/CharacterSetupGui.cs

@@ -245,7 +245,7 @@ namespace Content.Client.Preferences.UI
                 ToggleMode = true;
                 Group = group;
 
-                _previewDummy = entityManager.SpawnEntity("HumanMob_Dummy", MapCoordinates.Nullspace);
+                _previewDummy = entityManager.SpawnEntity("MobHumanDummy", MapCoordinates.Nullspace);
                 _previewDummy.GetComponent<HumanoidAppearanceComponent>().UpdateFromProfile(profile);
                 var humanoid = profile as HumanoidCharacterProfile;
                 if (humanoid != null)

Content.Client/Preferences/UI/HumanoidProfileEditor.cs

@@ -679,7 +679,7 @@ namespace Content.Client.Preferences.UI
 
             #region Preview
 
-            _previewDummy = entityManager.SpawnEntity("HumanMob_Dummy", MapCoordinates.Nullspace);
+            _previewDummy = entityManager.SpawnEntity("MobHumanDummy", MapCoordinates.Nullspace);
             var sprite = _previewDummy.GetComponent<SpriteComponent>();
 
             // Front

Content.IntegrationTests/Tests/Interaction/InRangeUnobstructed.cs

@@ -16,7 +16,7 @@ namespace Content.IntegrationTests.Tests.Interaction
     [TestOf(typeof(UnobstructedExtensions))]
     public class InRangeUnobstructed : ContentIntegrationTest
     {
-        private const string HumanId = "BaseHumanMob_Content";
+        private const string HumanId = "MobHumanBase";
 
         private const float InteractionRange = SharedInteractionSystem.InteractionRange;
 

Content.Server/Cloning/Components/CloningPodComponent.cs

@@ -134,7 +134,7 @@ namespace Content.Server.Cloning.Components
                         return; // If we can't track down the client, we can't offer transfer. That'd be quite bad.
                     }
 
-                    var mob = Owner.EntityManager.SpawnEntity("HumanMob_Content", Owner.Transform.MapPosition);
+                    var mob = Owner.EntityManager.SpawnEntity("MobHuman", Owner.Transform.MapPosition);
 
                     mob.GetComponent<HumanoidAppearanceComponent>().UpdateFromProfile(dna.Profile);
                     mob.Name = dna.Profile.Name;

Content.Server/GameTicking/GameTicker.Spawning.cs

@@ -29,7 +29,7 @@ namespace Content.Server.GameTicking
 {
     public partial class GameTicker
     {
-        private const string PlayerPrototypeName = "HumanMob_Content";
+        private const string PlayerPrototypeName = "MobHuman";
         private const string ObserverPrototypeName = "MobObserver";
 
         [ViewVariables(VVAccess.ReadWrite)]

Resources/Prototypes/Catalog/Fills/Crates/npc.yml

@@ -5,7 +5,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: BeeMob_Content
+      - id: MobBee
         amount: 8
 
 
@@ -16,7 +16,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: ButterflyMob_Content
+      - id: MobButterfly
         amount: 5
 
 
@@ -27,7 +27,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: CatMob_Content
+      - id: MobCat
         amount: 1
 
 
@@ -38,7 +38,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: ChickenMob_Content
+      - id: MobChicken
         amount: 4
 
 
@@ -49,7 +49,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: CorgiMob_Content
+      - id: MobCorgi
         amount: 1
 
 - type: entity
@@ -59,7 +59,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: CowMob_Content
+      - id: MobCow
         amount: 1
 
 
@@ -70,7 +70,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: GoatMob_Content
+      - id: MobGoat
         amount: 1
 
 
@@ -81,7 +81,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: GooseMob_Content
+      - id: MobGoose
         amount: 2
 
 
@@ -92,7 +92,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: GorillaMob_Content
+      - id: MobGorilla
         amount: 1
 
 
@@ -114,7 +114,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: ParrotMob_Content
+      - id: MobParrot
         amount: 3
 
 
@@ -125,7 +125,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: PenguinMob_Content
+      - id: MobPenguin
         amount: 2
 
 
@@ -136,5 +136,5 @@
   components:
   - type: StorageFill
     contents:
-      - id: SnakeMob_Content
+      - id: MobSnake
         amount: 3

Resources/Prototypes/Entities/Markers/Spawners/Conditional/timed.yml

@@ -29,7 +29,7 @@
         - state: ai
     - type: TimedSpawner
       prototypes:
-        - XenoMob_Content
+        - MobXeno
       chance: 0.85
       intervalSeconds: 30
       minimumEntitiesSpawned: 2

Resources/Prototypes/Entities/Markers/Spawners/mobs.yml

@@ -12,9 +12,9 @@
       - state: ai
   - type: ConditionalSpawner
     prototypes:
-      - MouseMob_Content
+      - MobMouse
-      - MouseMob1_Content
+      - MobMouse1
-      - MouseMob2_Content
+      - MobMouse2
 
 - type: entity
   name: Cat Spawner
@@ -27,9 +27,9 @@
       - state: ai
   - type: ConditionalSpawner
     prototypes:
-      - CatMob_Content
+      - MobCat
-      - CatCalicoMob_Content
+      - MobCatCalico
-      - CatCaracalMob_Content
+      - MobCatCaracal
 
 - type: entity
   name: Corgi Spawner
@@ -42,5 +42,5 @@
       - state: ai
   - type: ConditionalSpawner
     prototypes:
-      - CorgiMob_Content
+      - MobCorgi
-      - IanMob_Content
+      - MobCorgiOld

Resources/Prototypes/Entities/Mobs/NPCs/animals.yml

@@ -4,7 +4,7 @@
 - type: entity
   name: bat
   parent: SimpleMobBase
-  id: BatMob_Content
+  id: MobBat
   description: Some cultures find them terrifying, others crunchy on the teeth.
   components:
   - type: MovementSpeedModifier
@@ -38,7 +38,7 @@
 - type: entity
   name: bee
   parent: SimpleMobBase
-  id: BeeMob_Content
+  id: MobBee
   description: Nice to have, but you can't build a civilization on a foundation of honey alone.
   components:
   - type: MovementSpeedModifier
@@ -73,7 +73,7 @@
 - type: entity
   name: chicken
   parent: SimpleMobBase
-  id: ChickenMob_Content
+  id: MobChicken
   description: Comes before an egg, and IS a dinosaur!
   components:
   - type: Sprite
@@ -104,7 +104,7 @@
 - type: entity
   name: butterfly
   parent: SimpleMobBase
-  id: ButterflyMob_Content
+  id: MobButterfly
   description: Despite popular misconceptions, it's not actually made of butter.
   components:
   - type: MovementSpeedModifier
@@ -148,7 +148,7 @@
 - type: entity
   name: cow
   parent: SimpleMobBase
-  id: CowMob_Content
+  id: MobCow
   description: Moo.
   components:
   - type: Sprite
@@ -179,7 +179,7 @@
 - type: entity
   name: crab
   parent: SimpleMobBase
-  id: CrabMob_Content
+  id: MobCrab
   description: A folk legend goes around that his claw snaps spacemen out of existance over distasteful remarks. Be polite and tolerant for your own safety.
   components:
   - type: Sprite
@@ -211,7 +211,7 @@
 - type: entity
   name: goat
   parent: SimpleMobBase
-  id: GoatMob_Content
+  id: MobGoat
   description: His spine consists of long sharp segments, no wonder he is so grumpy.
   components:
   - type: Sprite
@@ -243,7 +243,7 @@
 - type: entity
   name: goose
   parent: SimpleMobBase
-  id: GooseMob_Content
+  id: MobGoose
   description: Its stomach and mind are an enigma beyond human comprehension.
   components:
   - type: Sprite
@@ -274,7 +274,7 @@
 - type: entity
   name: gorilla
   parent: SimpleMobBase
-  id: GorillaMob_Content
+  id: MobGorilla
   description: Smashes, roars, looks cool. Don't stand near one.
   components:
   - type: Sprite
@@ -304,7 +304,7 @@
 
 - type: entity
   name: monkey
-  id: MonkeyMob_Content
+  id: MobMonkey
   parent: SimpleMobBase
   description: New church of neo-darwinists actually believe that EVERY animal evolved from a monkey. Tastes like pork, and killing them is both fun and relaxing.
   components:
@@ -339,7 +339,7 @@
 - type: entity
   name: mouse
   parent: SimpleMobBase
-  id: MouseMob_Content
+  id: MobMouse
   description: Squeak!
   components:
   - type: GhostTakeoverAvailable
@@ -395,8 +395,8 @@
   - type: MouseAccent
 
 - type: entity
-  parent: MouseMob_Content
+  parent: MobMouse
-  id: MouseMob1_Content
+  id: MobMouse1
   components:
   - type: Sprite
     drawdepth: Mobs
@@ -415,8 +415,8 @@
       dead: splat-1
 
 - type: entity
-  parent: MouseMob_Content
+  parent: MobMouse
-  id: MouseMob2_Content
+  id: MobMouse2
   components:
   - type: Sprite
     drawdepth: Mobs
@@ -438,7 +438,7 @@
 - type: entity
   name: parrot
   parent: SimpleMobBase
-  id: ParrotMob_Content
+  id: MobParrot
   description: Infiltrates your domain, spies on you, and somehow still a cool pet.
   components:
   - type: MovementSpeedModifier
@@ -472,7 +472,7 @@
 - type: entity
   name: penguin
   parent: SimpleMobBase
-  id: PenguinMob_Content
+  id: MobPenguin
   description: Their lives are constant pain due to their inner-body knees.
   components:
   - type: Sprite
@@ -503,7 +503,7 @@
 - type: entity
   name: snake
   parent: SimpleMobBase
-  id: SnakeMob_Content
+  id: MobSnake
   description: Hissss! Bites aren't poisonous.
   components:
   - type: Sprite
@@ -537,7 +537,7 @@
 - type: entity
   name: tarantula
   parent: SimpleMobBase
-  id: GiantSpiderMob_Content
+  id: MobGiantSpider
   description: Widely recognized to be the literal worst thing in existence.
   components:
   - type: Sprite

Resources/Prototypes/Entities/Mobs/NPCs/carp.yml

@@ -1,6 +1,6 @@
 - type: entity
   name: space carp
-  id: CarpMob_Content
+  id: MobCarp
   parent: SimpleMobBase
   description: It's a space carp.
   components:
@@ -44,8 +44,8 @@
 
 - type: entity
   name: magicarp
-  parent: CarpMob_Content
+  parent: MobCarp
-  id: MagicarpMob_Content
+  id: MobCarpMagic
   description: Looks like some kind of fish. Might be magical.
   components:
   - type: Sprite
@@ -57,8 +57,8 @@
 
 - type: entity
   name: holocarp
-  parent: CarpMob_Content
+  parent: MobCarp
-  id: HolocarpMob_Content
+  id: MobCarpHolo
   description: Carp made out of holographic energies.
   components:
   - type: Sprite

Resources/Prototypes/Entities/Mobs/NPCs/dummy_npcs.yml

@@ -1,8 +1,8 @@
 - type: entity
   save: false
   name: Pathfinding Dummy
-  parent: BaseHumanMob_Content
+  parent: MobHumanBase
-  id: HumanMob_PathDummy
+  id: MobHumanPathDummy
   description: A miserable pile of secrets.
   suffix: AI
   components:

Resources/Prototypes/Entities/Mobs/NPCs/human.yml

@@ -1,7 +1,7 @@
 - type: entity
   name: Civilian
-  parent: BaseHumanMob_Content
+  parent: MobHumanBase
-  id: HumanMob_Civilian
+  id: MobCivilian
   description: A miserable pile of secrets.
   components:
   - type: UtilityAI
@@ -17,8 +17,8 @@
 
 - type: entity
   name: Spirate
-  parent: BaseHumanMob_Content
+  parent: MobHumanBase
-  id: HumanMob_Spirate
+  id: MobSpirate
   description: Yarr!
   components:
   - type: UtilityAI

Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml

@@ -1,6 +1,6 @@
 - type: entity
   name: Mimic
-  id: MimicMob_Content
+  id: MobMimic
   parent: SimpleMobBase
   description: Surprise. # When this gets a proper write this should use the object's actual description >:)
   components:

Resources/Prototypes/Entities/Mobs/NPCs/pets.yml

@@ -4,7 +4,7 @@
 - type: entity
   name: corgi
   parent: SimpleMobBase
-  id: CorgiMob_Content
+  id: MobCorgi
   description: Finally, a space corgi!
   components:
   - type: Sprite
@@ -33,8 +33,8 @@
 
 - type: entity
   name: ian
-  parent: CorgiMob_Content
+  parent: MobCorgi
-  id: IanMob_Content
+  id: MobCorgiOld
   description: Favorite pet corgi.
   components:
   - type: Sprite
@@ -52,7 +52,7 @@
 - type: entity
   name: cat
   parent: SimpleMobBase
-  id: CatMob_Content
+  id: MobCat
   description: Feline pet, very funny.
   components:
   - type: Sprite
@@ -81,8 +81,8 @@
 
 - type: entity
   name: calico cat
-  id: CatCalicoMob_Content
+  id: MobCatCalico
-  parent: CatMob_Content
+  parent: MobCat
   description: Feline pet, very funny.
   components:
   - type: Sprite
@@ -99,8 +99,8 @@
 
 - type: entity
   name: caracal cat
-  id: CatCaracalMob_Content
+  id: MobCatCaracal
-  parent: CatMob_Content
+  parent: MobCat
   description: Hilarious.
   components:
   - type: Sprite
@@ -118,7 +118,7 @@
 - type: entity
   name: sloth
   parent: SimpleMobBase
-  id: SlothMob_Content
+  id: MobSloth
   description: Very slow animal. For people with low energy.
   components:
   - type: MovementSpeedModifier

Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml

@@ -1,7 +1,7 @@
 # Hacky for the stress test so don't even consider adding to this
 - type: entity
   name: Xeno
-  id: XenoMob_Content
+  id: MobXeno
   parent: SimpleMobBase
   description: They mostly come at night. Mostly.
   components:

Resources/Prototypes/Entities/Mobs/Player/human.yml

@@ -1,8 +1,8 @@
 - type: entity
   save: false
   name: Urist McHands
-  parent: BaseHumanMob_Content
+  parent: MobHumanBase
-  id: HumanMob_Content
+  id: MobHuman
   description: A miserable pile of secrets.
   components:
   - type: Mind
@@ -27,8 +27,8 @@
 
 - type: entity
   name: centcom official
-  parent: HumanMob_Content
+  parent: MobHuman
-  id: HumanMob_CentcomOfficial
+  id: MobHumanCentcomOfficial
   components:
   - type: Icon
     sprite: Markers/jobs.rsi

Resources/Prototypes/Entities/Mobs/Species/human.yml

@@ -1,8 +1,8 @@
-# Anything human specific (e.g. UI, input) goes under HumanMob_Content
+# Anything human specific (e.g. UI, input) goes under MobHuman
 - type: entity
   save: false
   name: Urist McHands
-  id: BaseHumanMob_Content
+  id: MobHumanBase
   description: A miserable pile of secrets.
   abstract: true
   components:
@@ -278,7 +278,7 @@
 - type: entity
   save: false
   name: Urist McHands
-  id: HumanMob_Dummy
+  id: MobHumanDummy
   abstract: true
   description: A dummy human meant to be used in character setup.
   components:

Resources/Prototypes/Entities/Mobs/Species/slime.yml

@@ -1,6 +1,6 @@
 - type: entity
   name: Slime Person
-  parent: HumanMob_Content
+  parent: MobHuman
   id: BaseSlimePerson
   description: A miserable pile of slime.
   abstract: true

Resources/Prototypes/Entities/Mobs/Species/vox.yml

@@ -1,6 +1,5 @@
-# Vox bad. moff best.
+- type: entity
-- type: entity
+  parent: MobHuman
-  parent: HumanMob_Content
   abstract: True
   id: BaseVox
   components:

Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml

@@ -25,7 +25,7 @@
         reagents:
           - Water
   - type: Rehydratable
-    target: MonkeyMob_Content
+    target: MobMonkey
   - type: CollisionWake
     enabled: false
   - type: Physics
@@ -66,7 +66,7 @@
       reagents:
       - Water
   - type: Rehydratable
-    target: CarpMob_Content
+    target: MobCarp
   - type: CollisionWake
     enabled: false
   - type: Physics