centcomm role tweaks

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

@@ -21,8 +21,9 @@ 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
+# imp (2)
+job-name-cburn = CBURN Quarantine Officer
+job-name-deathsquad = Asset Protection Agent
 job-name-reporter = Reporter
 job-name-musician = Musician
 job-name-librarian = Librarian

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

@@ -952,16 +952,29 @@
     tags:
     - DoorBumpOpener
 
-- type: entity
+- type: entity # imp
   parent: CentcomPDA
   id: DeathsquadPDA
   suffix: Death Squad
+  name: death squad 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
+    - DoorBumpOpener # /imp
 
 - type: entity
   parent: BasePDA
@@ -1157,10 +1170,17 @@
   components:
   - type: Pda
     id: CBURNIDcard
-  - type: PdaBorderColor
+  - type: Appearance #imp
+    appearanceDataInit:
+      enum.PdaVisuals.PdaType:
+        !type:String
+        pda-cburn
+  - type: Icon
+    state: pda-cburn
+  - type: PdaBorderColor #imp
     borderColor: "#A32D26"
-    accentHColor: "#447987"
-    accentVColor: "#447987"
+    accentHColor: "#D0B01A"
+    accentVColor: "#D0B01A"
 
 - type: entity
   parent: BasePDA

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

@@ -494,15 +494,14 @@
   - type: PresetIdCard
     job: Roboticist
 
-- type: entity
+- type: entity 
   parent: IDCardStandard
   id: CentcomIDCard
   name: command officer ID card
   components:
   - type: Sprite
     layers:
-    - state: centcom
-    - state: idcentcom
+    - state: centcom #removed one of the layers: state (imp)
   - type: Item
     heldPrefix: blue
   - type: PresetIdCard
@@ -515,8 +514,10 @@
   components:
   - type: Sprite
     layers:
-    - state: gold
-    - state: ert_commander
+    - state: ert_commander #imp
+  - type: IdCard
+    jobTitle: job-name-ertleader
+    jobIcon: JobIconERTLeader
   - type: PresetIdCard
     job: ERTLeader
   - type: Item
@@ -529,8 +530,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.
+    - state: ert_chaplain # imp
+  - type: IdCard
+    jobTitle: job-name-ertchaplain
+    jobIcon: JobIconERTChaplain
   - type: PresetIdCard
     job: ERTChaplain
   - type: Item
@@ -543,8 +546,10 @@
   components:
   - type: Sprite
     layers:
-    - state: gold
-    - state: ert_engineer
+    - state: ert_engineer #imp
+  - type: IdCard
+    jobTitle: job-name-ertengineer
+    jobIcon: JobIconERTEngineer
   - type: PresetIdCard
     job: ERTEngineer
 
@@ -555,8 +560,10 @@
   components:
   - type: Sprite
     layers:
-    - state: gold
-    - state: ert_janitor
+    - state: ert_janitor #imp
+  - type: IdCard
+    jobTitle: job-name-ertjanitor
+    jobIcon: JobIconERTJanitor
   - type: PresetIdCard
     job: ERTJanitor
 
@@ -567,8 +574,10 @@
   components:
   - type: Sprite
     layers:
-    - state: gold
-    - state: ert_medic
+    - state: ert_medic #imp
+  - type: IdCard
+    jobTitle: job-name-ertmedic
+    jobIcon: JobIconERTMedic
   - type: PresetIdCard
     job: ERTMedical
 
@@ -579,10 +588,12 @@
   components:
   - type: Sprite
     layers:
-    - state: gold
-    - state: ert_security
+    - state: ert_security #imp
+  - type: IdCard
+    jobTitle: job-name-ertsecurity
+    jobIcon: JobIconERTSecurity
   - type: PresetIdCard
-    job: ERTSecurity
+    job: ERTSecurity 
 
 - type: entity
   parent: IDCardStandard
@@ -603,9 +614,12 @@
   components:
   - type: Sprite
     layers:
-    - state: centcom
+    - state: deathsquad # imp
   - type: Item
-    heldPrefix: blue
+    heldPrefix: red
+  - type: IdCard
+    jobTitle: job-name-deathsquad
+    jobIcon: JobIconDeathsquad
   - type: PresetIdCard
     job: DeathSquad
 
@@ -779,7 +793,7 @@
   components:
   - type: Sprite
     layers:
-    - state: centcom
+    - state: cburn #imp
   - type: Item
     heldPrefix: blue
   - type: PresetIdCard
@@ -849,8 +863,7 @@
   - type: Sprite
     sprite: Objects/Misc/id_cards.rsi
     layers:
-    - state: admin
-    - state: idadmin
+    - state: admin #removed layer: state (imp)
   - type: Clothing
     sprite: Objects/Misc/id_cards.rsi
   - type: Item

Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml

@@ -5,7 +5,7 @@
   playTimeTracker: JobCBURN
   setPreference: false
   startingGear: CBURNGear
-  icon: "JobIconNanotrasen"
+  icon: "JobIconCBURN" #imp
   supervisors: job-supervisors-centcom
   canBeAntag: false
   accessGroups:

Resources/Prototypes/Roles/Jobs/CentComm/deathsquad.yml

@@ -5,7 +5,7 @@
   playTimeTracker: JobDeathSquad
   setPreference: false
   startingGear: DeathSquadGear
-  icon: "JobIconNanotrasen"
+  icon: "JobIconDeathsquad" #imp
   supervisors: job-supervisors-centcom
   canBeAntag: false
   accessGroups:

Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml

@@ -6,7 +6,7 @@
   playTimeTracker: JobERTLeader
   setPreference: false
   startingGear: ERTLeaderGearEVA
-  icon: "JobIconNanotrasen"
+  icon: "JobIconERTLeader" #imp
   supervisors: job-supervisors-centcom
   canBeAntag: false
   accessGroups:
@@ -96,7 +96,7 @@
   playTimeTracker: JobERTChaplain
   setPreference: false
   startingGear: ERTChaplainGear
-  icon: "JobIconNanotrasen"
+  icon: "JobIconERTChaplain" #imp
   supervisors: job-supervisors-centcom
   canBeAntag: false
   accessGroups:
@@ -180,7 +180,7 @@
   playTimeTracker: JobERTEngineer
   setPreference: false
   startingGear: ERTEngineerGearEVA
-  icon: "JobIconNanotrasen"
+  icon: "JobIconERTEngineer" #imp
   supervisors: job-supervisors-centcom
   canBeAntag: false
   accessGroups:
@@ -252,7 +252,7 @@
   playTimeTracker: JobERTSecurity
   setPreference: false
   startingGear: ERTEngineerGearEVA
-  icon: "JobIconNanotrasen"
+  icon: "JobIconERTSecurity" #imp
   supervisors: job-supervisors-centcom
   canBeAntag: false
   accessGroups:
@@ -342,7 +342,7 @@
   playTimeTracker: JobERTMedical
   setPreference: false
   startingGear: ERTMedicalGearEVA
-  icon: "JobIconNanotrasen"
+  icon: "JobIconERTMedic" #imp
   supervisors: job-supervisors-centcom
   canBeAntag: false
   accessGroups:
@@ -404,7 +404,7 @@
   playTimeTracker: JobERTJanitor
   setPreference: false
   startingGear: ERTJanitorGearEVA
-  icon: "JobIconNanotrasen"
+  icon: "JobIconERTJanitor" #imp
   supervisors: job-supervisors-centcom
   canBeAntag: false
   accessGroups:

Resources/Prototypes/StatusIcon/job.yml

@@ -65,7 +65,7 @@
   parent: JobIcon
   id: JobIconNanotrasen
   icon:
-    sprite: /Textures/Interface/Misc/job_icons.rsi
+    sprite: /Textures/_Impstation/Interface/Misc/job_icons.rsi #imp
     state: Nanotrasen
   jobName: job-name-centcomoff
 
@@ -449,6 +449,6 @@
   parent: JobIcon
   id: JobIconAdmin
   icon:
-    sprite: /Textures/Interface/Misc/job_icons.rsi
+    sprite: /Textures/_Impstation/Interface/Misc/job_icons.rsi #imp
     state: Admin
   allowSelection: false

Resources/Prototypes/_Impstation/StatusIcon/job.yml

@@ -5,3 +5,67 @@
     sprite: /Textures/_Impstation/Interface/Misc/job_icons.rsi
     state: Courier
   jobName: job-name-courier
+
+  - type: jobIcon
+  parent: JobIcon
+  id: JobIconDeathsquad
+  icon:
+    sprite: /Textures/_Impstation/Interface/Misc/job_icons.rsi
+    state: Deathsquad
+  jobName: job-name-deathsquad
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconCBURN
+  icon:
+    sprite: /Textures/_Impstation/Interface/Misc/job_icons.rsi
+    state: CBURN
+  jobName: job-name-cburn
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconERTLeader
+  icon:
+    sprite: /Textures/_Impstation/Interface/Misc/job_icons.rsi
+    state: ERTLeader
+  jobName: job-name-ertleader
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconERTSecurity
+  icon:
+    sprite: /Textures/_Impstation/Interface/Misc/job_icons.rsi
+    state: ERTSecurity
+  jobName: job-name-ertsecurity
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconERTMedic
+  icon:
+    sprite: /Textures/_Impstation/Interface/Misc/job_icons.rsi
+    state: ERTMedical
+  jobName: job-name-ertmedic
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconERTEngineer
+  icon:
+    sprite: /Textures/_Impstation/Interface/Misc/job_icons.rsi
+    state: ERTEngineer
+  jobName: job-name-ertengineer
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconERTJanitor
+  icon:
+    sprite: /Textures/_Impstation/Interface/Misc/job_icons.rsi
+    state: ERTJanitor
+  jobName: job-name-ertjanitor
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconERTChaplain
+  icon:
+    sprite: /Textures/_Impstation/Interface/Misc/job_icons.rsi
+    state: ERTChaplain
+  jobName: job-name-ertchaplain

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