centcomm role tweaks

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

@@ -21,8 +21,14 @@ job-name-hop = Head of Personnel
 job-name-captain = Captain
 job-name-serviceworker = Service Worker
 job-name-centcomoff = CentComm Official
-job-name-cburn = Centcomm Quarantine Officer
-job-name-deathsquad = Centcomm Agent
+job-name-cburn = CBURN Quarantine Officer
+job-name-deathsquad = Asset Protection Agent
+job-name-ertleader = ERT Commander
+job-name-ertchaplain = ERT Chaplain
+job-name-ertengineer = ERT Engineer
+job-name-ertsecurity = ERT Security
+job-name-ertmedic = ERT Medic
+job-name-ertjanitor = ERT Janitor
 job-name-reporter = Reporter
 job-name-musician = Musician
 job-name-librarian = Librarian
@@ -40,12 +46,6 @@ job-name-qm = Quartermaster
 job-name-cargotech = Cargo Technician
 job-name-chef = Chef
 job-name-clown = Clown
-job-name-ertleader = ERT Leader
-job-name-ertchaplain = ERT Chaplain
-job-name-ertengineer = ERT Engineer
-job-name-ertsecurity = ERT Security
-job-name-ertmedic = ERT Medic
-job-name-ertjanitor = ERT Janitor
 job-name-boxer = Boxer
 job-name-zookeeper = Zookeeper
 job-name-visitor = Visitor

Resources/Prototypes/Entities/Objects/Devices/pda.yml

@@ -956,9 +956,22 @@
   parent: CentcomPDA
   id: DeathsquadPDA
   suffix: Death Squad
+  name: deathsquadron PDA
+  description: The red helps to mask the blood.
   components:
   - type: Pda
-    id: CentcomIDCardDeathsquad
+    id:   CentcomIDCardDeathsquad
+  - type: Appearance
+    appearanceDataInit:
+      enum.PdaVisuals.PdaType:
+        !type:String
+        pda-deathsquadron
+  - type: Icon
+    state: pda-deathsquadron
+  - type: PdaBorderColor
+    borderColor: "#640202"
+    accentHColor: "#06064B"
+    accentVColor: "#06064B"
   - type: Tag #  Ignore Chameleon tags
     tags:
     - DoorBumpOpener
@@ -1157,10 +1170,17 @@
   components:
   - type: Pda
     id: CBURNIDcard
+  - type: Appearance
+    appearanceDataInit:
+      enum.PdaVisuals.PdaType:
+        !type:String
+        pda-cburn
+  - type: Icon
+    state: pda-cburn
   - type: PdaBorderColor
     borderColor: "#A32D26"
-    accentHColor: "#447987"
-    accentVColor: "#447987"
+    accentHColor: "#D0B01A"
+    accentVColor: "#D0B01A"
 
 - type: entity
   parent: BasePDA

Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml

@@ -515,8 +515,11 @@
   components:
   - type: Sprite
     layers:
-    - state: gold
+    - state: silver #imp
     - state: ert_commander
+  - type: IdCard
+    jobTitle: job-name-ertleader
+    jobIcon: JobIconERTLeader
   - type: PresetIdCard
     job: ERTLeader
   - type: Item
@@ -529,8 +532,10 @@
   components:
   - type: Sprite
     layers:
-    - state: gold
     - state: ert_chaplain # we have the sprite for the id but dont have chaplain ERT equipment for now.
+  - type: IdCard
+    jobTitle: job-name-ertchaplain
+    jobIcon: JobIconERTChaplain
   - type: PresetIdCard
     job: ERTChaplain
   - type: Item
@@ -543,8 +548,10 @@
   components:
   - type: Sprite
     layers:
-    - state: gold
     - state: ert_engineer
+  - type: IdCard
+    jobTitle: job-name-ertengineer
+    jobIcon: JobIconERTEngineer
   - type: PresetIdCard
     job: ERTEngineer
 
@@ -555,8 +562,10 @@
   components:
   - type: Sprite
     layers:
-    - state: gold
     - state: ert_janitor
+  - type: IdCard
+    jobTitle: job-name-ertjanitor
+    jobIcon: JobIconERTJanitor
   - type: PresetIdCard
     job: ERTJanitor
 
@@ -567,8 +576,10 @@
   components:
   - type: Sprite
     layers:
-    - state: gold
     - state: ert_medic
+  - type: IdCard
+    jobTitle: job-name-ertmedic
+    jobIcon: JobIconERTMedic
   - type: PresetIdCard
     job: ERTMedical
 
@@ -579,8 +590,10 @@
   components:
   - type: Sprite
     layers:
-    - state: gold
     - state: ert_security
+  - type: IdCard
+    jobTitle: job-name-ertsecurity
+    jobIcon: JobIconERTSecurity
   - type: PresetIdCard
     job: ERTSecurity
 
@@ -603,9 +616,12 @@
   components:
   - type: Sprite
     layers:
-    - state: centcom
+    - state: deathsquad
   - type: Item
-    heldPrefix: blue
+    heldPrefix: red
+  - type: IdCard
+    jobTitle: job-name-deathsquad
+    jobIcon: JobIconDeathsquadron
   - type: PresetIdCard
     job: DeathSquad
 

Resources/Prototypes/StatusIcon/job.yml

@@ -65,10 +65,74 @@
   parent: JobIcon
   id: JobIconNanotrasen
   icon:
-    sprite: /Textures/Interface/Misc/job_icons.rsi
+    sprite: _Impstation/Textures/Interface/Misc/job_icons.rsi
     state: Nanotrasen
   jobName: job-name-centcomoff
 
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconDeathsquad
+  icon:
+    sprite: _Impstation/Textures/Interface/Misc/job_icons.rsi
+    state: Deathsquadron
+  jobName: job-name-deathsquad
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconCBURN
+  icon:
+    sprite: _Impstation/Textures/Interface/Misc/job_icons.rsi
+    state: CBURN
+  jobName: job-name-cburn
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconERTLeader
+  icon:
+    sprite: _Impstation/Textures/Interface/Misc/job_icons.rsi
+    state: ERTLeader
+  jobName: job-name-ertleader
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconERTSecurity
+  icon:
+    sprite: _Impstation/Textures/Interface/Misc/job_icons.rsi
+    state: ERTSecurity
+  jobName: job-name-ertsecurity
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconERTMedic
+  icon:
+    sprite: _Impstation/Textures/Interface/Misc/job_icons.rsi
+    state: ERTMedic
+  jobName: job-name-ertmedic
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconERTEngineer
+  icon:
+    sprite: _Impstation/Textures/Interface/Misc/job_icons.rsi
+    state: ERTEngineer
+  jobName: job-name-ertengineer
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconERTJanitor
+  icon:
+    sprite: _Impstation/Textures/Interface/Misc/job_icons.rsi
+    state: ERTJanitor
+  jobName: job-name-ertjanitor
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconERTChaplain
+  icon:
+    sprite: _Impstation/Textures/Interface/Misc/job_icons.rsi
+    state: ERTChaplain
+  jobName: job-name-ertchaplain
+
 - type: jobIcon
   parent: JobIcon
   id: JobIconPrisoner
@@ -449,6 +513,6 @@
   parent: JobIcon
   id: JobIconAdmin
   icon:
-    sprite: /Textures/Interface/Misc/job_icons.rsi
+    sprite: _Impstation/Textures/Interface/Misc/job_icons.rsi
     state: Admin
   allowSelection: false

Resources/Textures/Objects/Devices/pda.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/59f2a4e10e5ba36033c9734ddebfbbdc6157472d, pda-cluwne made by brainfood1183 (github) ss14 | pda-brigmedic and pda-centcom made by PuroSlavKing (Github) | pda-brigemdic resprited by Hülle#2562 (Discord), pda-pirate made by brainfood1183 (Github), pda-syndi-agent drawn by Ubaser",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/59f2a4e10e5ba36033c9734ddebfbbdc6157472d, pda-cluwne made by brainfood1183 (github) ss14 | pda-brigmedic and pda-centcom made by PuroSlavKing (Github) | pda-brigemdic resprited by Hülle#2562 (Discord), pda-pirate made by brainfood1183 (Github), pda-syndi-agent drawn by Ubaser, Deathsquad, CBURN pda by RosySaturniidae (git)",
   "size": {
     "x": 32,
     "y": 32
@@ -256,6 +256,12 @@
     {
       "name": "pda-seniorofficer"
     },
+    {
+      "name": "pda-deathsquadron"
+    },
+    {
+      "name": "pda-cburn"
+    },
     {
       "name": "equipped-IDCARD",
       "directions": 4

Resources/Textures/Objects/Misc/id_cards.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e idcluwne made by brainfood1183 (github) for ss14, idbrigmedic made by PuroSlavKing (Github), pirate made by brainfood1183 (github), idadmin made by Arimah (github), idvisitor by IProduceWidgets (Github), idintern-service by spanky-spanky (Github)",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e idcluwne made by brainfood1183 (github) for ss14, idbrigmedic made by PuroSlavKing (Github), pirate made by brainfood1183 (github), idadmin made by Arimah (github) and edited by RosySaturniidae (git), idvisitor by IProduceWidgets (Github), idintern-service by spanky-spanky (Github), Deathsquad, CBURN, ERT ids made/updated by RosySaturniidae (git)",
   "size": {
     "x": 32,
     "y": 32
@@ -34,6 +34,12 @@
     {
       "name": "ert_security"
     },
+    {
+      "name": "deathsquad"
+    },
+    {
+      "name": "cburn"
+    },
     {
       "name": "gold"
     },

Resources/Textures/_Impstation/Interface/Misc/job_icons.rsi/meta.json

@@ -1,12 +1,42 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Courier by Honeyed_Lemons_ from the impstation discord",
+    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | Courier by Honeyed_Lemons_ from the impstation discord, CBURN, Deathsquadron icons by RosySaturniidae (github), Admin, ERT, and NT icon edits also by RosySaturniidae (github)",
     "size": {
         "x": 8,
         "y": 8
     },
     "states": [
+        {
+            "name": "Admin"
+        },
+        {
+            "name": "Nanotrasen"
+        },
+        {
+            "name": "CBURN"
+        },
+        {
+            "name": "Deathsquadron"
+        },
+        {
+            "name": "ERTLeader"
+        },
+        {
+            "name": "ERTSecurity"
+        },
+        {
+            "name": "ERTMedic"
+        },
+        {
+            "name": "ERTEngineer"
+        },
+        {
+            "name": "ERTJanitor"
+        },
+        {
+            "name": "ERTChaplain"
+        },
         {
             "name": "Courier"
         }