Adds job icons to the job list.

Content.Client/UserInterface/HumanoidProfileEditor.cs

@@ -3,17 +3,21 @@ using System.Collections.Generic;
 using System.Linq;
 using Content.Client.GameObjects.Components;
 using Content.Client.Interfaces;
+using Content.Client.Utility;
 using Content.Shared;
 using Content.Shared.Jobs;
 using Content.Shared.Preferences;
 using Robust.Client.Graphics.Drawing;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
+using Robust.Client.Utility;
 using Robust.Shared.Interfaces.Random;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
+using static Content.Client.StaticIoC;
 
 namespace Content.Client.UserInterface
 {
@@ -148,19 +152,13 @@ namespace Content.Client.UserInterface
                         Text = localization.GetString("Male"),
                         Group = sexButtonGroup
                     };
-                    _sexMaleButton.OnPressed += args =>
+                    _sexMaleButton.OnPressed += args => { SetSex(Sex.Male); };
-                    {
-                        SetSex(Sex.Male);
-                    };
                     _sexFemaleButton = new Button
                     {
                         Text = localization.GetString("Female"),
                         Group = sexButtonGroup
                     };
-                    _sexFemaleButton.OnPressed += args =>
+                    _sexFemaleButton.OnPressed += args => { SetSex(Sex.Female); };
-                    {
-                        SetSex(Sex.Female);
-                    };
                     hBox.AddChild(sexLabel);
                     hBox.AddChild(_sexMaleButton);
                     hBox.AddChild(_sexFemaleButton);
@@ -502,10 +500,23 @@ namespace Content.Client.UserInterface
                     PriorityChanged?.Invoke(Priority);
                 };
 
+                var icon = new TextureRect
+                {
+                    TextureScale = (2, 2),
+                    Stretch = TextureRect.StretchMode.KeepCentered
+                };
+
+                if (job.Icon != null)
+                {
+                    var specifier = new SpriteSpecifier.Rsi(new ResourcePath("/Textures/job_icons.rsi"), job.Icon);
+                    icon.Texture = specifier.Frame0();
+                }
+
                 AddChild(new HBoxContainer
                 {
                     Children =
                     {
+                        icon,
                         new Label {Text = job.Name, CustomMinimumSize = (175, 0)},
                         _optionButton
                     }

Content.Client/UserInterface/LobbyCharacterPreviewPanel.cs

@@ -3,7 +3,6 @@ using Content.Client.GameObjects;
 using Content.Client.GameObjects.Components.Mobs;
 using Content.Client.Interfaces;
 using Content.Shared;
-using Content.Shared.GameObjects.Components.Inventory;
 using Content.Shared.Jobs;
 using Content.Shared.Preferences;
 using Robust.Client.Interfaces.GameObjects.Components;

Content.Shared/Jobs/JobPrototype.cs

@@ -39,6 +39,8 @@ namespace Content.Shared.Jobs
 
         public string StartingGear { get; private set; }
 
+        public string Icon { get; private set; }
+
         public IReadOnlyCollection<string> Department { get; private set; }
         public IReadOnlyCollection<string> Access { get; private set; }
 
@@ -72,6 +74,11 @@ namespace Content.Shared.Jobs
             {
                 Access = Array.Empty<string>();
             }
+
+            if (mapping.TryGetNode("icon", out var iconNode))
+            {
+                Icon = iconNode.AsString();
+            }
         }
     }
 }

Resources/Prototypes/Jobs/Cargo/CargoTechnician.yml

@@ -6,3 +6,6 @@
   startingGear: AssistantGear
   department:
   - Cargo
+
+  icon: "CargoTechnician"
+

Resources/Prototypes/Jobs/Civilian/Assistant.yml

@@ -6,6 +6,8 @@
   department:
   - Civilian
 
+  icon: "Assistant"
+
   access:
   - maintenance
 

Resources/Prototypes/Jobs/Civilian/Clown.yml

@@ -6,6 +6,8 @@
   department:
   - Civilian
 
+  icon: "Clown"
+
 - type: startingGear
   id: ClownGear
   equipment:

Resources/Prototypes/Jobs/Civilian/Janitor.yml

@@ -6,6 +6,8 @@
   department:
   - Civilian
 
+  icon: "Janitor"
+
   access:
   - service
   - maintenance

Resources/Prototypes/Jobs/Command/Captain.yml

@@ -7,6 +7,8 @@
   department:
   - Command
 
+  icon: "Captain"
+
   access:
   # All of em.
   # Could probably do with some kind of wildcard or whatever to automate this.

Resources/Prototypes/Jobs/Command/HeadOfPersonnel.yml

@@ -8,6 +8,8 @@
   - Command
   - Civilian
 
+  icon: "HeadOfPersonnel"
+
   access:
   - command
   - idCard

Resources/Prototypes/Jobs/Engineering/ChiefEngineer.yml

@@ -8,6 +8,8 @@
   - Command
   - Engineering
 
+  icon: "ChiefEngineer"
+
   access:
   - maintenance
   - engineering

Resources/Prototypes/Jobs/Engineering/StationEngineer.yml

@@ -7,6 +7,8 @@
   department:
   - Engineering
 
+  icon: "StationEngineer"
+
   access:
   - maintenance
   - engineering

Resources/Prototypes/Jobs/Medical/ChiefMedicalOfficer.yml

@@ -10,6 +10,8 @@
   - Command
   - Medical
 
+  icon: "ChiefMedicalOfficer"
+
   access:
   - medical
   - command

Resources/Prototypes/Jobs/Medical/MedicalDoctor.yml

@@ -7,5 +7,7 @@
   department:
   - Medical
 
+  icon: "MedicalDoctor"
+
   access:
   - medical

Resources/Prototypes/Jobs/Science/ResearchDirector.yml

@@ -8,6 +8,8 @@
   - Command
   - Science
 
+  icon: "ResearchDirector"
+
   access:
   - research
   - command

Resources/Prototypes/Jobs/Science/Scientist.yml

@@ -7,5 +7,7 @@
   department:
   - Science
 
+  icon: "Scientist"
+
   access:
   - research

Resources/Prototypes/Jobs/Security/HeadOfSecurity.yml

@@ -8,6 +8,8 @@
   - Command
   - Security
 
+  icon: "HeadOfSecurity"
+
   access:
   - command
   - security

Resources/Prototypes/Jobs/Security/SecurityOfficer.yml

@@ -7,6 +7,8 @@
   department:
   - Security
 
+  icon: "SecurityOfficer"
+
   access:
   - security
   - maintenance

Resources/Textures/job_icons.rsi/meta.json

@@ -0,0 +1,315 @@
+{
+    "version": 1,
+    "size": {
+        "x": 8,
+        "y": 8
+    },
+    "states": [
+        {
+            "name": "Detective",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "QuarterMaster",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "Botanist",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "AtmosphericTechnician",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "Nanotrasen",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "Prisoner",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "Janitor",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "Chemist",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "StationEngineer",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "SecurityOfficer",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "NoId",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "ChiefMedicalOfficer",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "Roboticist",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "Chaplain",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "Lawyer",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "Unknown",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "Librarian",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "CargoTechnician",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "Scientist",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "Geneticist",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "Clown",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "Captain",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "HeadOfPersonnel",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "Virologist",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "ShaftMiner",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "Assistant",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "ChiefEngineer",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "Bartender",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "HeadOfSecurity",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "MedicalDoctor",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "Chef",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "Warden",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "ResearchDirector",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "Mime",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        }
+    ]
+}