New Icons

Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs

@@ -56,7 +56,7 @@ private void AddAntagVerbs(GetVerbsEvent<Verb> args)
         {
             Text = traitorName,
             Category = VerbCategory.Antag,
-            Icon = new SpriteSpecifier.Rsi(new ResPath("/Textures/Interface/Misc/job_icons.rsi"), "Syndicate"),
+            Icon = new SpriteSpecifier.Rsi(new ResPath("/Textures/_Funkystation/Interface/Misc/job_icons.rsi"), "Syndicate"), // Funky
             Act = () =>
             {
                 _antag.ForceMakeAntag<TraitorRuleComponent>(targetPlayer, DefaultTraitorRule);
@@ -71,7 +71,7 @@ private void AddAntagVerbs(GetVerbsEvent<Verb> args)
         {
             Text = initialInfectedName,
             Category = VerbCategory.Antag,
-            Icon = new SpriteSpecifier.Rsi(new("/Textures/Interface/Misc/job_icons.rsi"), "InitialInfected"),
+            Icon = new SpriteSpecifier.Rsi(new("/Textures/_Funkystation/Interface/Misc/antag_icons.rsi"), "InitialInfected"), // Funky
             Act = () =>
             {
                 _antag.ForceMakeAntag<ZombieRuleComponent>(targetPlayer, DefaultInitialInfectedRule);
@@ -86,7 +86,7 @@ private void AddAntagVerbs(GetVerbsEvent<Verb> args)
         {
             Text = zombieName,
             Category = VerbCategory.Antag,
-            Icon = new SpriteSpecifier.Rsi(new("/Textures/Interface/Misc/job_icons.rsi"), "Zombie"),
+            Icon = new SpriteSpecifier.Rsi(new("/Textures/_Funkystation/Interface/Misc/job_icons.rsi"), "Zombie"), // Funky
             Act = () =>
             {
                 _zombie.ZombifyEntity(args.Target);
@@ -132,7 +132,7 @@ private void AddAntagVerbs(GetVerbsEvent<Verb> args)
         {
             Text = headRevName,
             Category = VerbCategory.Antag,
-            Icon = new SpriteSpecifier.Rsi(new("/Textures/Interface/Misc/job_icons.rsi"), "HeadRevolutionary"),
+            Icon = new SpriteSpecifier.Rsi(new("/Textures/_Funkystation/Interface/Misc/antag_icons.rsi"), "HeadRevolutionary"), // Funky
             Act = () =>
             {
                 _antag.ForceMakeAntag<RevolutionaryRuleComponent>(targetPlayer, DefaultRevsRule);
@@ -177,7 +177,7 @@ private void AddAntagVerbs(GetVerbsEvent<Verb> args)
         {
             Text = paradoxCloneName,
             Category = VerbCategory.Antag,
-            Icon = new SpriteSpecifier.Rsi(new("/Textures/Interface/Misc/job_icons.rsi"), "ParadoxClone"),
+            Icon = new SpriteSpecifier.Rsi(new("/Textures/_Funkystation/Interface/Misc/antag_icons.rsi"), "ParadoxClone"), // Funky
             Act = () =>
             {
                 var ruleEnt = _gameTicker.AddGameRule(ParadoxCloneRuleId);
@@ -198,7 +198,7 @@ private void AddAntagVerbs(GetVerbsEvent<Verb> args)
         {
             Text = wizardName,
             Category = VerbCategory.Antag,
-            Icon = new SpriteSpecifier.Rsi(new("/Textures/Interface/Misc/job_icons.rsi"), "Wizard"),
+            Icon = new SpriteSpecifier.Rsi(new("/Textures/_Funkystation/Interface/Misc/job_icons.rsi"), "Wizard"), // Funky
             Act = () =>
             {
                 // Wizard has no rule components as of writing, but I gotta put something here to satisfy the machine so just make it wizard mind rule :)

Resources/Locale/en-US/_Funkystation/job/job-names.ftl

@@ -0,0 +1,14 @@
+job-name-cci = Central Command Intern
+job-name-cco = Central Command Official
+job-name-cl = Corporate Liaison
+job-name-command-maid = Command Maid
+job-name-cowboy = Space Cowboy
+job-name-deputy = Deputy
+job-name-fitness-instructor = Fitness Instructor
+job-name-hd = Hospitality Director
+job-name-iaa = Internal Affairs Agent
+job-name-magistrate = Magistrate
+job-name-party-maker = Party Maker
+job-name-nct = Nanotrasen Career Trainer
+job-name-security-clown = Security Clown
+job-name-xo = Executive Officer

Resources/Prototypes/StatusIcon/faction.yml

@@ -7,7 +7,7 @@
     - Zombie
     - InitialInfected
   icon:
-    sprite: /Textures/Interface/Misc/job_icons.rsi
+    sprite: &job-icon-rsi /Textures/_Funkystation/Interface/Misc/job_icons.rsi # Funky - Any antag faction icons that are already ID card options go here
     state: Zombie
 
 - type: factionIcon
@@ -19,7 +19,7 @@
     - InitialInfected
     - Zombie
   icon:
-    sprite: /Textures/Interface/Misc/job_icons.rsi
+    sprite: &antag-icon-rsi /Textures/_Funkystation/Interface/Misc/antag_icons.rsi # Funky - All other antag faction icons go here
     state: InitialInfected
 
 - type: factionIcon
@@ -31,7 +31,7 @@
       - ShowAntagIcons
       - Revolutionary
   icon:
-    sprite: /Textures/Interface/Misc/job_icons.rsi
+    sprite: *antag-icon-rsi # Funky
     state: Revolutionary
 
 - type: factionIcon
@@ -43,7 +43,7 @@
       - ShowAntagIcons
       - Revolutionary
   icon:
-    sprite: /Textures/Interface/Misc/job_icons.rsi
+    sprite: *antag-icon-rsi # Funky
     state: HeadRevolutionary
 
 - type: factionIcon
@@ -57,13 +57,13 @@
       - ShowAntagIcons
       - BloodCultist
   icon:
-    sprite: /Textures/Interface/Misc/job_icons.rsi
+    sprite: *antag-icon-rsi # Funky
     state: Cultist
 
 - type: factionIcon
   id: SyndicateFaction
   priority: 0
   locationPreference: Left
   icon:
-    sprite: /Textures/Interface/Misc/job_icons.rsi
+    sprite: *job-icon-rsi # Funky
     state: Syndicate

Resources/Prototypes/StatusIcon/job.yml

@@ -11,7 +11,7 @@
   parent: JobIcon
   id: JobIconCargoTechnician
   icon:
-    sprite: &icon-rsi /Textures/Interface/Misc/job_icons.rsi
+    sprite: &icon-rsi /Textures/_Funkystation/Interface/Misc/job_icons.rsi # Funky
     state: CargoTechnician
   jobName: job-name-cargotech
 
@@ -20,7 +20,7 @@
   id: JobIconShaftMiner
   icon:
     sprite: *icon-rsi
-    state: ShaftMiner
+    state: SalvageSpecialist # Funky - Formerly "ShaftMiner"
   jobName: job-name-salvagespec
 
 # Command
@@ -53,9 +53,10 @@
   parent: JobIcon
   id: JobIconHeadOfPersonnel
   icon:
-    sprite: *icon-rsi
+    sprite: &old-icon-rsi /Textures/Interface/Misc/job_icons.rsi # Funky - Fallback RSI for jobs without new icons
     state: HeadOfPersonnel
   jobName: job-name-hop
+  allowSelection: false # Funky - Job deprecated
 
 - type: jobIcon
   parent: JobIcon
@@ -78,7 +79,7 @@
   id: JobIconQuarterMaster
   icon:
     sprite: *icon-rsi
-    state: QuarterMaster
+    state: Quartermaster # Funky - Formerly "QuarterMaster"
   jobName: job-name-qm
 
 # Engineering
@@ -229,9 +230,10 @@
   parent: JobIcon
   id: JobIconWarden
   icon:
-    sprite: *icon-rsi
+    sprite: *old-icon-rsi # Funky - Fallback RSI
     state: Warden
   jobName: job-name-warden
+  allowSelection: false # Funky - Job deprecated
 
 # Service
 
@@ -255,9 +257,10 @@
   parent: JobIcon
   id: JobIconBoxer
   icon:
-    sprite: *icon-rsi
+    sprite: *old-icon-rsi # Funky - Fallback RSI
     state: Boxer
   jobName: job-name-boxer
+  allowSelection: false # Funky - Job deprecated
 
 - type: jobIcon
   parent: JobIcon
@@ -356,7 +359,7 @@
   id: JobIconPassenger
   icon:
     sprite: *icon-rsi
-    state: Passenger
+    state: Assistant # Funky - Formerly "Passenger"
   jobName: job-name-passenger
 
 - type: jobIcon
@@ -549,9 +552,10 @@
   parent: JobIcon
   id: JobIconNanotrasen
   icon:
-    sprite: *icon-rsi
+    sprite: *old-icon-rsi # Funky - Fallback RSI
     state: Nanotrasen
   jobName: job-name-centcommoff
+  allowSelection: false # Funky - Job deprecated
 
 - type: jobIcon
   parent: JobIcon

Resources/Prototypes/StatusIcon/security.yml

@@ -33,7 +33,7 @@
   icon:
     sprite: /Textures/Interface/Misc/security_icons.rsi
     state: hud_suspected
-  
+
 - type: securityIcon
   parent: SecurityIcon
   id: SecurityIconHostile
@@ -62,8 +62,8 @@
   layer: Mod
   isShaded: true
   icon:
-    sprite: /Textures/Interface/Misc/job_icons.rsi
-    state: MindShield
+    sprite: /Textures/_Funkystation/Interface/Misc/job_icons_borders.rsi # Funky
+    state: MindShieldBorder # Funky - Consistency with other job icon borders
 
 - type: securityIcon
   id: CrewBorderIcon

Resources/Prototypes/_Funkystation/StatusIcon/job.yml

@@ -0,0 +1,124 @@
+# Central Command
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconCentralCommandIntern
+  icon:
+    sprite: &icon-rsi /Textures/_Funkystation/Interface/Misc/job_icons.rsi
+    state: CentralCommandIntern
+  jobName: job-name-cci
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconCentralCommandOfficial
+  icon:
+    sprite: *icon-rsi
+    state: CentralCommandOfficial
+  jobName: job-name-cco
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconNanotrasenCareerTrainer
+  icon:
+    sprite: *icon-rsi
+    state: NanotrasenCareerTrainer
+  jobName: job-name-nct
+
+# Command
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconCorporateLiaison
+  icon:
+    sprite: *icon-rsi
+    state: CorporateLiaison
+  jobName: job-name-cl
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconExecutiveOfficer
+  icon:
+    sprite: *icon-rsi
+    state: ExecutiveOfficer
+  jobName: job-name-xo
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconHospitalityDirector
+  icon:
+    sprite: *icon-rsi
+    state: HospitalityDirector
+  jobName: job-name-hd
+
+# Internal Affairs
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconInternalAffairsAgent
+  icon:
+    sprite: *icon-rsi
+    state: InternalAffairsAgent
+  jobName: job-name-iaa
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconMagistrate
+  icon:
+    sprite: *icon-rsi
+    state: Magistrate
+  jobName: job-name-magistrate
+
+
+# Security
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconDeputy
+  icon:
+    sprite: *icon-rsi
+    state: Deputy
+  jobName: job-name-deputy
+
+# Service
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconFitnessInstructor
+  icon:
+    sprite: *icon-rsi
+    state: FitnessInstructor
+  jobName: job-name-fitness-instructor
+
+# Visitors etc.
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconCommandMaid
+  icon:
+    sprite: *icon-rsi
+    state: CommandMaid
+  jobName: job-name-command-maid
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconCowboy
+  icon:
+    sprite: *icon-rsi
+    state: Cowboy
+  jobName: job-name-cowboy
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconPartyMaker
+  icon:
+    sprite: *icon-rsi
+    state: PartyMaker
+  jobName: job-name-party-maker
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconSecurityClown
+  icon:
+    sprite: *icon-rsi
+    state: SecurityClown
+  jobName: job-name-security-clown

Resources/Textures/_Funkystation/Interface/Misc/antag_icons.rsi/meta.json

@@ -0,0 +1,33 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Changeling by @whateverusername0 (GitHub), modified by @Catazeus (GitHub), symbol (as Scientist) by @EmoGarbage404 (GitHub) | Cultist icon from Paradise Station (GitHub, ParadiseSS13/Paradise/icons/mob/hud.dmi), modified by @pirakaplant | Head Revolutionary and Revolutionary icons by @Catazeus | Initial Infected icon by @RamZ (Discord), modified by @Catazeus | Mind controlled icon by @Catazeus | Paradox Clone icon from /tg/station (GitHub, /tgstation/tgstation/icons/mob/huds/antag_hud.dmi) and modified by @slarticodefast (GitHub) and @Catazeus",
+
+    "size": {
+        "x": 8,
+        "y": 8
+    },
+    "states": [
+        {
+            "name": "Changeling"
+        },
+        {
+            "name": "Cultist"
+        },
+        {
+            "name": "HeadRevolutionary"
+        },
+        {
+            "name": "InitialInfected"
+        },
+        {
+            "name": "MindControlled"
+        },
+        {
+            "name": "ParadoxClone"
+        },
+        {
+            "name": "Revolutionary"
+        }
+    ]
+}