Reorganize ID card sprites to use job icon sprites directly (#40414)

* reorganize id card sprites

* add CBURN attribution

* comment offset

* fix captain ID steal icon

* oops

* update attribution

* slightly more precise language in attribution

* add aliases, cleanup parents and inhands

* adjust syndicate sprites

* missed a spot

* fix historic attribution issues, add black inhands to id cards

* errant curly brace begone

* control stripe color through yaml, meta fix

* make deathsquad blue

Resources/Prototypes/Objectives/stealTargetGroups.yml

@@ -55,13 +55,13 @@
   sprite:
     sprite: Objects/Consumable/Food/meat.rsi
     state: corgi
-    #
+
 - type: stealTargetGroup
   id: CaptainIDCard
   name: steal-target-groups-captain-id-card
   sprite:
     sprite: Objects/Misc/id_cards.rsi
-    state: ert_commander #no one will know the difference.
+    state: icon-captain
 
 - type: stealTargetGroup
   id: JetpackCaptainFilled

Resources/Prototypes/StatusIcon/job.yml

@@ -197,7 +197,7 @@
   parent: JobIcon
   id: JobIconBrigmedic
   icon:
-    sprite: /Textures/_DV/Interface/Misc/job_icons.rsi # DeltaV - resprite sec icons
+    sprite: &icon-rsi-dv /Textures/_DV/Interface/Misc/job_icons.rsi # DeltaV - resprite sec icons
     state: Brigmedic
   jobName: job-name-brigmedic
 
@@ -205,7 +205,7 @@
   parent: JobIcon
   id: JobIconDetective
   icon:
-    sprite: /Textures/_DV/Interface/Misc/job_icons.rsi # DeltaV - resprite sec icons
+    sprite: *icon-rsi-dv # DeltaV - resprite sec icons
     state: Detective
   jobName: job-name-detective
 
@@ -213,7 +213,7 @@
   parent: JobIcon
   id: JobIconSecurityCadet
   icon:
-    sprite: /Textures/_DV/Interface/Misc/job_icons.rsi # DeltaV - resprite sec icons
+    sprite: *icon-rsi-dv # DeltaV - resprite sec icons
     state: SecurityCadet
   jobName: job-name-cadet
 
@@ -221,7 +221,7 @@
   parent: JobIcon
   id: JobIconSecurityOfficer
   icon:
-    sprite: /Textures/_DV/Interface/Misc/job_icons.rsi # DeltaV - resprite sec icons
+    sprite: *icon-rsi-dv # DeltaV - resprite sec icons
     state: SecurityOfficer
   jobName: job-name-security
 
@@ -229,7 +229,7 @@
   parent: JobIcon
   id: JobIconWarden
   icon:
-    sprite: /Textures/_DV/Interface/Misc/job_icons.rsi # DeltaV - resprite sec icons
+    sprite: *icon-rsi-dv # DeltaV - resprite sec icons
     state: Warden
   jobName: job-name-warden
 
@@ -263,7 +263,7 @@
   parent: JobIcon
   id: JobIconChaplain
   icon:
-    sprite: /Textures/_DV/Interface/Misc/job_icons.rsi # DeltaV - Move Chaplain into Epistemics
+    sprite: *icon-rsi-dv # DeltaV - Move Chaplain into Epistemics
     state: Chaplain # DeltaV - Move Chaplain into Epistemics
   jobName: job-name-chaplain
 
@@ -287,7 +287,7 @@
   parent: JobIcon
   id: JobIconLawyer
   icon:
-    sprite: /Textures/_DV/Interface/Misc/job_icons.rsi # DeltaV - Move Lawyer into Justice
+    sprite: *icon-rsi-dv # DeltaV - Move Lawyer into Justice
     state: Lawyer
   jobName: job-name-lawyer
 
@@ -399,7 +399,7 @@
   parent: JobIcon
   id: JobIconPrisoner
   icon:
-    sprite: /Textures/_DV/Interface/Misc/job_icons.rsi # DeltaV - resprite prisoner jobicon
+    sprite: *icon-rsi-dv # DeltaV - resprite prisoner jobicon
     state: Prisoner
   jobName: job-name-prisoner
 
@@ -450,7 +450,7 @@
   parent: JobIcon
   id: JobIconSeniorOfficer
   icon:
-    sprite: /Textures/_DV/Interface/Misc/job_icons.rsi # DeltaV - resprite sec icons
+    sprite: *icon-rsi-dv # DeltaV - resprite sec icons
     state: SeniorOfficer
   allowSelection: true # DeltaV - Selectable, was false
   jobName: job-name-senior-officer # DeltaV - Agent ID localization

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

@@ -1,15 +1,55 @@
-# For prisoner job, not to be confused with genpop prisoner ids
+# If an ID contains sprite component changes, put it here. Otherwise, put it in identification_cards_alt.yml
+
+# Command
 - type: entity
   parent: IDCardStandard
-  id: PrisonerJobIDCard
+  id: ChiefJusticeIDCard
+  name: chief justice ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: silver
+    - state: stripe_top
+      color: &color-justice-top "#641327"
+    - state: stripe_bottom
+      color: &color-justice-bottom "#4C0E1D"
+    - sprite: &icon-rsi-dv /Textures/_DV/Interface/Misc/job_icons.rsi
+      offset: &icon-offset -0.09375, 0.0625 #3 pixels left, 2 pixels up
+      state: ChiefJustice
+  - type: PresetIdCard
+    job: ChiefJustice
+
+# Security and Prisoners 
+- type: entity
+  parent: IDCardStandard
+  id: PrisonGuardIDCard
+  name: prison guard ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: default
+    - state: stripe_top
+      color: &color-security-top "#39393c"
+    - state: stripe_bottom
+      color: &color-security-bottom "#262626"
+    - sprite: *icon-rsi-dv 
+      offset: 
+      state: nyanoPrisonGuard
+  - type: PresetIdCard
+    job: PrisonGuard
+
+- type: entity
+  parent: IDCardStandard
+  id: PrisonerJobIDCard # Not to be confused with genpop prisoner ids
   name: prisoner ID card
   suffix: Job
   components:
   - type: Sprite
     layers:
     - state: orange
-    - sprite: _DV/Objects/Misc/id_cards.rsi
-      state: nyanoprisoner
+    - sprite: *icon-rsi-dv
+      offset: *icon-offset
+      state: Prisoner
   - type: PresetIdCard
     job: Prisoner
 
@@ -21,101 +61,13 @@
   - type: Sprite
     layers:
     - state: orange
-    - sprite: _DV/Objects/Misc/id_cards.rsi
-      state: nyanogladiator
+    - sprite: *icon-rsi-dv
+      offset: *icon-offset
+      state: nyanoGladiator
   - type: PresetIdCard
     job: Gladiator
 
-- type: entity
-  parent: IDCardStandard
-  id: PrisonGuardIDCard
-  name: prison guard ID card
-  components:
-  - type: Sprite
-    layers:
-    - state: default
-    - sprite: _DV/Objects/Misc/id_cards.rsi
-      state: nyanoprisonguard
-  - type: PresetIdCard
-    job: PrisonGuard
-
-- type: entity
-  parent: CourierIDCard
-  id: MailCarrierIDCard
-  name: mail carrier ID card
-  components:
-  - type: Sprite
-    layers:
-    - state: default
-    - sprite: _DV/Objects/Misc/id_cards.rsi
-      state: nyanomailcarrier
-  - type: IdCard
-    jobTitle: job-alt-title-mail-carrier
-
-- type: entity
-  parent: IDCardStandard
-  id: MartialArtistIDCard
-  name: martial artist ID card
-  components:
-  - type: Sprite
-    layers:
-    - state: default
-    - sprite: _DV/Objects/Misc/id_cards.rsi
-      state: nyanomartialartist
-  - type: PresetIdCard
-    job: MartialArtist
-
-- type: entity
-  parent: IDCardStandard
-  id: ForensicMantisIDCard
-  name: psionic mantis ID card
-  components:
-  - type: Sprite
-    layers:
-    - state: default
-    - sprite: _DV/Objects/Misc/id_cards.rsi
-      state: nyanomantis
-  - type: PresetIdCard
-    job: ForensicMantis
-
-- type: entity
-  parent: IDCardStandard
-  id: ChiefJusticeIDCard
-  name: chief justice ID card
-  components:
-  - type: PresetIdCard
-    job: ChiefJustice
-  - type: Sprite
-    layers:
-    - state: default
-    - sprite: _DV/Objects/Misc/id_cards.rsi
-      state: idchiefjustice
-
-- type: entity
-  parent: IDCardStandard
-  id: ClerkIDCard
-  name: clerk ID card
-  components:
-  - type: PresetIdCard
-    job: Clerk
-  - type: Sprite
-    layers:
-    - state: default
-    - sprite: _DV/Objects/Misc/id_cards.rsi
-      state: idclerk
-
-- type: entity
-  parent: IDCardStandard
-  id: ProsecutorIDCard
-  name: presecutor ID card
-  components:
-  - type: PresetIdCard
-    job: Prosecutor
-  - type: Sprite
-    layers:
-    - state: default
-    - sprite: _DV/Objects/Misc/id_cards.rsi
-      state: idprosecutor
+# Cargo / Logistics
 
 - type: entity
   parent: IDCardStandard
@@ -125,8 +77,13 @@
   - type: Sprite
     layers:
     - state: default
-    - sprite: _DV/Objects/Misc/id_cards.rsi
-      state: nyanomailcarrier
+    - state: stripe_top
+      color: &color-supply-top "#b18644"
+    - state: stripe_bottom
+      color: &color-supply-bottom "#5b4523"
+    - sprite: *icon-rsi-dv
+      offset: *icon-offset
+      state: nyanoMailCarrier
   - type: PresetIdCard
     job: Courier
 
@@ -138,158 +95,17 @@
   - type: Sprite
     layers:
     - state: default
-    - sprite: _DV/Objects/Misc/id_cards.rsi
-      state: idcargoassistant
+    - state: stripe_top
+      color: *color-supply-top
+    - state: stripe_bottom
+      color: *color-supply-bottom
+    - sprite: *icon-rsi-dv
+      offset: *icon-offset
+      state: CargoAssistant
   - type: PresetIdCard
     job: CargoAssistant
-
-## Alternate Job Titles
-
-# Passenger
-
-- type: entity
-  parent: PassengerIDCard
-  id: VisitorIDCardLoadout
-  name: visitor ID card
-  components:
-  - type: IdCard
-    jobTitle: job-title-visitor
-
-- type: entity
-  parent: PassengerIDCard
-  id: TouristIDCard
-  name: tourist ID card
-  components:
-  - type: IdCard
-    jobTitle: job-alt-title-tourist
-
-- type: entity
-  parent: PassengerIDCard
-  id: OffDutyCrewIDCard
-  name: off-duty crew ID card
-  components:
-  - type: IdCard
-    jobTitle: job-alt-title-off-duty-crew
-
-- type: entity
-  parent: PassengerIDCard
-  id: StudentIDCard
-  name: student ID card
-  components:
-  - type: IdCard
-    jobTitle: job-alt-title-student
-
-# Bartender
-
-- type: entity
-  parent: BartenderIDCard
-  id: MixologistIDCard
-  name: mixologist ID card
-  components:
-  - type: IdCard
-    jobTitle: job-alt-title-mixologist
-
-# Chef
-
-- type: entity
-  parent: ChefIDCard
-  id: BakerIDCard
-  name: baker ID card
-  components:
-  - type: IdCard
-    jobTitle: job-alt-title-baker
-
-- type: entity
-  parent: ChefIDCard
-  id: ButcherIDCard
-  name: butcher ID card
-  components:
-  - type: IdCard
-    jobTitle: job-alt-title-butcher
-
-- type: entity
-  parent: ChefIDCard
-  id: PizzaioloIDCard
-  name: pizzaiolo ID card
-  components:
-  - type: IdCard
-    jobTitle: job-alt-title-pizzaiolo
-
-# Medical Intern
-
-- type: entity
-  parent: MedicalInternIDCard
-  id: PracticalNurseIDCard
-  name: practical nurse ID card
-  components:
-  - type: IdCard
-    jobTitle: job-alt-title-practical-nurse
-
-- type: entity
-  parent: MedicalInternIDCard
-  id: ResidentIDCard
-  name: resident ID card
-  components:
-  - type: IdCard
-    jobTitle: job-alt-title-resident
-
-# Medical Doctor
-
-- type: entity
-  parent: MedicalIDCard
-  id: ClinicianIDCard
-  name: clinician ID card
-  components:
-  - type: IdCard
-    jobTitle: job-alt-title-clinician
-
-# Senior Physician
-
-- type: entity
-  parent: SeniorPhysicianIDCard
-  id: CryogenicsSpecialistIDCard
-  name: cryogenics specialist ID card
-  components:
-  - type: IdCard
-    jobTitle: job-alt-title-cryogenics-specialist
-
-# Chemist
-
-- type: entity
-  parent: ChemistIDCard
-  id: PharmacistIDCard
-  name: pharmacist ID card
-  components:
-  - type: IdCard
-    jobTitle: job-alt-title-pharmacist
-
-# Psychologist
-
-- type: entity
-  parent: PsychologistIDCard
-  id: PsychiatristIDCard
-  name: psychiatrist ID card
-  components:
-  - type: IdCard
-    jobTitle: job-alt-title-psychiatrist
-
-- type: entity
-  parent: PsychologistIDCard
-  id: TherapistIDCard
-  name: therapist ID card
-  components:
-  - type: IdCard
-    jobTitle: job-alt-title-therapist
-
-- type: entity
-  parent: PsychologistIDCard
-  id: SocialWorkerIDCard
-  name: social worker ID card
-  components:
-  - type: IdCard
-    jobTitle: job-alt-title-social-worker
-
-# Surgeon
+  
+# Medical
 
 - type: entity
   parent: MedicalIDCard
@@ -299,101 +115,36 @@
   - type: Sprite
     layers:
     - state: default
-    - sprite: _DV/Objects/Misc/id_cards.rsi
-      state: idsurgeon
+    - state: stripe_top
+      color: &color-medical-top "#68aed6"
+    - state: stripe_bottom
+      color: &color-medical-bottom "#325f7a"
+    - sprite: *icon-rsi-dv
+      offset: *icon-offset
+      state: Surgeon
   - type: IdCard
     jobTitle: job-name-surgeon
     jobIcon: JobIconSurgeon
 
-# Atmospheric Technician
+# Science / Epi
 
 - type: entity
-  parent: AtmosIDCard
-  id: LifeSupportTechIDCard
-  name: life support technician ID card
+  parent: IDCardStandard
+  id: ForensicMantisIDCard
+  name: psionic mantis ID card
   components:
-  - type: IdCard
-    jobTitle: job-alt-title-life-support
-
-- type: entity
-  parent: AtmosIDCard
-  id: PlasmaScientistIDCard
-  name: plasma scientist ID card
-  components:
-  - type: IdCard
-    jobTitle: job-alt-title-plasma-scientist
-
-# Station Engineer
-
-- type: entity
-  parent: EngineeringIDCard
-  id: ElectricianIDCard
-  name: electrician ID card
-  components:
-  - type: IdCard
-    jobTitle: job-alt-title-electrician
-
-- type: entity
-  parent: EngineeringIDCard
-  id: MechanicIDCard
-  name: mechanic ID card
-  components:
-  - type: IdCard
-    jobTitle: job-alt-title-mechanic
-
-# Cargo Technician
-
-- type: entity
-  parent: CargoIDCard
-  id: DeckWorkerIDCard
-  name: deck worker ID card
-  components:
-  - type: IdCard
-    jobTitle: job-alt-title-deck-worker
-
-- type: entity
-  parent: CargoIDCard
-  id: InventoryAssociateIDCard
-  name: inventory associate ID card
-  components:
-  - type: IdCard
-    jobTitle: job-alt-title-inventory-associate
-
-# Salvage Specialist
-
-- type: entity
-  parent: SalvageIDCard
-  id: ProspectorIDCard
-  name: prospector ID card
-  components:
-  - type: IdCard
-    jobTitle: job-alt-title-prospector
-
-- type: entity
-  parent: SalvageIDCard
-  id: ExcavatorIDCard
-  name: excavator ID card
-  components:
-  - type: IdCard
-    jobTitle: job-alt-title-excavator
-
-# Scientist
-
-- type: entity
-  parent: ResearchIDCard
-  id: LabTechIDCard
-  name: lab technician ID card
-  components:
-  - type: IdCard
-    jobTitle: job-alt-title-lab-technician
-
-- type: entity
-  parent: ResearchIDCard
-  id: XenoarchIDCard
-  name: xenoarchaeologist ID card
-  components:
-  - type: IdCard
-    jobTitle: job-alt-title-xenoarch
+  - type: Sprite
+    layers:
+    - state: default
+    - state: stripe_top
+      color: &color-science-top "#a53aaa"
+    - state: stripe_bottom
+      color: &color-science-bottom "#652368"
+    - sprite: *icon-rsi-dv
+      offset: *icon-offset
+      state: nyanoMantis
+  - type: PresetIdCard
+    job: ForensicMantis
 
 - type: entity
   parent: ResearchIDCard
@@ -403,52 +154,71 @@
   - type: Sprite
     layers:
     - state: default
-    - state: idroboticist
+    - state: stripe_top
+      color: *color-science-top
+    - state: stripe_bottom
+      color: *color-science-bottom
+    - sprite: &icon-rsi /Textures/Interface/Misc/job_icons.rsi
+      offset: *icon-offset
+      state: Roboticist
   - type: PresetIdCard
     job: Roboticist
 
-# Clown
+# Justice
 
 - type: entity
-  parent: ClownIDCard
-  id: JesterIDCard
-  name: jester ID card
+  parent: IDCardStandard
+  id: ClerkIDCard
+  name: clerk ID card
   components:
-  - type: IdCard
-    jobTitle: job-alt-title-jester
+  - type: Sprite
+    layers:
+    - state: default
+    - state: stripe_top
+      color: *color-justice-top
+    - state: stripe_bottom
+      color: *color-justice-bottom
+    - sprite: *icon-rsi-dv
+      offset: *icon-offset
+      state: Clerk
+  - type: PresetIdCard
+    job: Clerk
 
 - type: entity
-  parent: ClownIDCard
-  id: FoolIDCard
-  name: fool ID card
+  parent: IDCardStandard
+  id: ProsecutorIDCard
+  name: presecutor ID card
   components:
-  - type: IdCard
-    jobTitle: job-alt-title-fool
+  - type: Sprite
+    layers:
+    - state: default
+    - state: stripe_top
+      color: *color-justice-top
+    - state: stripe_bottom
+      color: *color-justice-bottom
+    - sprite: *icon-rsi-dv
+      offset: *icon-offset
+      state: Prosecutor
+  - type: PresetIdCard
+    job: Prosecutor
 
-# Janitor
+# Other
 
 - type: entity
-  parent: JanitorIDCard
-  id: HygieneTechnicianIDCard
-  name: hygiene technician ID card
+  parent: IDCardStandard
+  id: MartialArtistIDCard
+  name: martial artist ID card
   components:
-  - type: IdCard
-    jobTitle: job-alt-title-hygiene-technician
+  - type: Sprite
+    layers:
+    - state: default
+    - sprite: *icon-rsi-dv
+      offset: *icon-offset
+      state: nyanoMartialArtist
+  - type: PresetIdCard
+    job: MartialArtist
 
-# Robo-Neuroticisit
-
-- type: entity
-  parent: SyndicateIDCard
-  id: RoboNeuroticistIDCard
-  name: robo-neuroticist ID card
-  components:
-  - type: Access
-    tags:
-    - NuclearOperative
-    - SyndicateAgent
-    - External
-    - Robotics
-    - Maintenance
+# Admemes and all that
 
 - type: entity
   parent: IDCardStandard
@@ -458,10 +228,11 @@
   description: An ID card that can replace the accesses of what it touches with the ones on the card
   components:
   - type: Sprite
-    sprite: Objects/Misc/id_cards.rsi
     layers:
-    - state: admin
-    - state: idwizard
+    - state: wizard
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: Wizard
   - type: Clothing
     sprite: Objects/Misc/id_cards.rsi
   - type: Item
@@ -469,7 +240,7 @@
   - type: IdCard
     jobTitle: job-title-admeme-overwriting
     jobIcon: JobIconAdmin
-  - type: Tag #  Ignore Chameleon tags
+  - type: Tag # Ignore Chameleon tags
     tags:
     - DoorBumpOpener
   - type: ReverseAgentIDCard
@@ -501,7 +272,9 @@
     sprite: Objects/Misc/id_cards.rsi
     layers:
     - state: admin
-    - state: idpassenger
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: Admin
   - type: Clothing
     sprite: Objects/Misc/id_cards.rsi
   - type: Item
@@ -515,22 +288,3 @@
     categories:
     - Debug
 
-#Recruiter
-- type: entity
-  parent: SyndicateIDCard
-  id: RecruiterIDCard
-  suffix: Recruiter
-  components:
-  - type: Sprite
-    layers:
-    - state: default
-    - state: idpassenger
-  - type: Access
-    tags:
-    - NuclearOperative
-    - SyndicateAgent
-    - External
-    - Maintenance
-  - type: IdCard
-    jobTitle: job-name-passenger
-    jobIcon: JobIconPassenger

Resources/Prototypes/_DV/Entities/Objects/Misc/identification_cards_alternate.yml

@@ -0,0 +1,307 @@
+
+## Alternate Job Titles
+
+## Only put in here if it inherits an existing job's ID *AND* there are no sprite component changes to the card
+
+# Passenger
+- type: entity
+  parent: PassengerIDCard
+  id: VisitorIDCardLoadout
+  name: visitor ID card
+  components:
+  - type: IdCard
+    jobTitle: job-title-visitor
+
+- type: entity
+  parent: PassengerIDCard
+  id: TouristIDCard
+  name: tourist ID card
+  components:
+  - type: IdCard
+    jobTitle: job-alt-title-tourist
+
+- type: entity
+  parent: PassengerIDCard
+  id: OffDutyCrewIDCard
+  name: off-duty crew ID card
+  components:
+  - type: IdCard
+    jobTitle: job-alt-title-off-duty-crew
+
+- type: entity
+  parent: PassengerIDCard
+  id: StudentIDCard
+  name: student ID card
+  components:
+  - type: IdCard
+    jobTitle: job-alt-title-student
+
+# Bartender
+
+- type: entity
+  parent: BartenderIDCard
+  id: MixologistIDCard
+  name: mixologist ID card
+  components:
+  - type: IdCard
+    jobTitle: job-alt-title-mixologist
+
+# Chef
+
+- type: entity
+  parent: ChefIDCard
+  id: BakerIDCard
+  name: baker ID card
+  components:
+  - type: IdCard
+    jobTitle: job-alt-title-baker
+
+- type: entity
+  parent: ChefIDCard
+  id: ButcherIDCard
+  name: butcher ID card
+  components:
+  - type: IdCard
+    jobTitle: job-alt-title-butcher
+
+- type: entity
+  parent: ChefIDCard
+  id: PizzaioloIDCard
+  name: pizzaiolo ID card
+  components:
+  - type: IdCard
+    jobTitle: job-alt-title-pizzaiolo
+
+# Medical Intern
+
+- type: entity
+  parent: MedicalInternIDCard
+  id: PracticalNurseIDCard
+  name: practical nurse ID card
+  components:
+  - type: IdCard
+    jobTitle: job-alt-title-practical-nurse
+
+- type: entity
+  parent: MedicalInternIDCard
+  id: ResidentIDCard
+  name: resident ID card
+  components:
+  - type: IdCard
+    jobTitle: job-alt-title-resident
+
+# Medical Doctor
+
+- type: entity
+  parent: MedicalIDCard
+  id: ClinicianIDCard
+  name: clinician ID card
+  components:
+  - type: IdCard
+    jobTitle: job-alt-title-clinician
+
+# Senior Physician
+
+- type: entity
+  parent: SeniorPhysicianIDCard
+  id: CryogenicsSpecialistIDCard
+  name: cryogenics specialist ID card
+  components:
+  - type: IdCard
+    jobTitle: job-alt-title-cryogenics-specialist
+
+# Chemist
+
+- type: entity
+  parent: ChemistIDCard
+  id: PharmacistIDCard
+  name: pharmacist ID card
+  components:
+  - type: IdCard
+    jobTitle: job-alt-title-pharmacist
+
+# Psychologist
+
+- type: entity
+  parent: PsychologistIDCard
+  id: PsychiatristIDCard
+  name: psychiatrist ID card
+  components:
+  - type: IdCard
+    jobTitle: job-alt-title-psychiatrist
+
+- type: entity
+  parent: PsychologistIDCard
+  id: TherapistIDCard
+  name: therapist ID card
+  components:
+  - type: IdCard
+    jobTitle: job-alt-title-therapist
+
+- type: entity
+  parent: PsychologistIDCard
+  id: SocialWorkerIDCard
+  name: social worker ID card
+  components:
+  - type: IdCard
+    jobTitle: job-alt-title-social-worker
+
+# Atmospheric Technician
+
+- type: entity
+  parent: AtmosIDCard
+  id: LifeSupportTechIDCard
+  name: life support technician ID card
+  components:
+  - type: IdCard
+    jobTitle: job-alt-title-life-support
+
+- type: entity
+  parent: AtmosIDCard
+  id: PlasmaScientistIDCard
+  name: plasma scientist ID card
+  components:
+  - type: IdCard
+    jobTitle: job-alt-title-plasma-scientist
+
+# Station Engineer
+
+- type: entity
+  parent: EngineeringIDCard
+  id: ElectricianIDCard
+  name: electrician ID card
+  components:
+  - type: IdCard
+    jobTitle: job-alt-title-electrician
+
+- type: entity
+  parent: EngineeringIDCard
+  id: MechanicIDCard
+  name: mechanic ID card
+  components:
+  - type: IdCard
+    jobTitle: job-alt-title-mechanic
+
+# Cargo Technician
+
+- type: entity
+  parent: CargoIDCard
+  id: DeckWorkerIDCard
+  name: deck worker ID card
+  components:
+  - type: IdCard
+    jobTitle: job-alt-title-deck-worker
+
+- type: entity
+  parent: CargoIDCard
+  id: InventoryAssociateIDCard
+  name: inventory associate ID card
+  components:
+  - type: IdCard
+    jobTitle: job-alt-title-inventory-associate
+
+# Courier
+
+- type: entity
+  parent: CourierIDCard
+  id: MailCarrierIDCard
+  name: mail carrier ID card
+  components:
+  - type: IdCard
+    jobTitle: job-alt-title-mail-carrier
+
+# Salvage Specialist
+
+- type: entity
+  parent: SalvageIDCard
+  id: ProspectorIDCard
+  name: prospector ID card
+  components:
+  - type: IdCard
+    jobTitle: job-alt-title-prospector
+
+- type: entity
+  parent: SalvageIDCard
+  id: ExcavatorIDCard
+  name: excavator ID card
+  components:
+  - type: IdCard
+    jobTitle: job-alt-title-excavator
+
+# Scientist
+
+- type: entity
+  parent: ResearchIDCard
+  id: LabTechIDCard
+  name: lab technician ID card
+  components:
+  - type: IdCard
+    jobTitle: job-alt-title-lab-technician
+
+- type: entity
+  parent: ResearchIDCard
+  id: XenoarchIDCard
+  name: xenoarchaeologist ID card
+  components:
+  - type: IdCard
+    jobTitle: job-alt-title-xenoarch
+
+# Clown
+
+- type: entity
+  parent: ClownIDCard
+  id: JesterIDCard
+  name: jester ID card
+  components:
+  - type: IdCard
+    jobTitle: job-alt-title-jester
+
+- type: entity
+  parent: ClownIDCard
+  id: FoolIDCard
+  name: fool ID card
+  components:
+  - type: IdCard
+    jobTitle: job-alt-title-fool
+
+# Janitor
+
+- type: entity
+  parent: JanitorIDCard
+  id: HygieneTechnicianIDCard
+  name: hygiene technician ID card
+  components:
+  - type: IdCard
+    jobTitle: job-alt-title-hygiene-technician
+
+# Syndicate Recruiter
+
+- type: entity
+  parent: SyndicateIDCard
+  id: RecruiterIDCard
+  suffix: Recruiter
+  components:
+  - type: Access
+    tags:
+    - NuclearOperative
+    - SyndicateAgent
+    - External
+    - Maintenance
+  - type: IdCard
+    jobTitle: job-name-passenger
+    jobIcon: JobIconPassenger
+
+# Robo-Neuroticisit
+
+- type: entity
+  parent: SyndicateIDCard
+  id: RoboNeuroticistIDCard
+  name: robo-neuroticist ID card
+  components:
+  - type: Access
+    tags:
+    - NuclearOperative
+    - SyndicateAgent
+    - External
+    - Robotics
+    - Maintenance

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

@@ -1,80 +1,56 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Mindshield icon taken from https://github.com/tgstation/tgstation/blob/ce6beb8a4d61235d9a597a7126c407160ed674ea/icons/mob/huds/hud.dmi | Admin recolored from MedicalIntern by TsjipTsjip | StationAi resprite to 8x8 size by lunarcomets | Service Worker resprite by anno_midi (Discord) and spanky-spanky (Github) | service icons darkened by frobnic8 (Discord and Github) | paradoxClone taken from tg station at commit https://github.com/tgstation/tgstation/commit/d0db1ff267557017ae7bde68e6490e70cbb6e42f and modifed by slarticodefast (Github) | Boxer, Chaplain, Janitor, Lawyer, Librarian recoloured by K-Dynamic (github) | Cluwne icon by Professor Renderer (Discord)| Librarian re-recoloured by AeraAulin (github) | QuarterMaster modified by K-Dynamic (github)| Mime and Musician recolor by DinnerCalzone (github) at https://github.com/impstation/imp-station-14/commit/233161f02bab7f9f9c03f09f39638ea7c200ee24",
+    "copyright": "Taken and modified from /tg/station113 from https://github.com/tgstation/tgstation/blob/ce6beb8a4d61235d9a597a7126c407160ed674ea/icons/mob/huds/hud.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Admin recolored from MedicalIntern by TsjipTsjip | StationAi resprite to 8x8 size by lunarcomets | Service Worker resprite by anno_midi (Discord) and spanky-spanky (Github) | service icons darkened by frobnic8 (Discord and Github) | paradoxClone taken from tg station at commit https://github.com/tgstation/tgstation/commit/d0db1ff267557017ae7bde68e6490e70cbb6e42f and modifed by slarticodefast (Github) | Boxer, Chaplain, Janitor, Lawyer, Librarian recoloured by K-Dynamic (github) | Cluwne icon by Professor Renderer (Discord) | QuarterMaster modified by K-Dynamic (github) | Mime and Musician recolor by DinnerCalzone (github) at https://github.com/impstation/imp-station-14/commit/233161f02bab7f9f9c03f09f39638ea7c200ee24 | Wizard originally by ScarKy0 (github) at https://github.com/space-wizards/space-station-14/commit/7c6028bc8037306536dca68f3c2cdd5edec56d14, edited by DinnerCalzone (github) | SyndicateCommander/Corpsman/Operative originally by Archeel1 (github) at https://github.com/space-wizards/space-station-14/commit/1a92ada, edited by DinnerCalzone (github)",
     "size": {
         "x": 8,
         "y": 8
     },
     "states": [
         {
-            "name": "Detective"
-        },
-        {
-            "name": "QuarterMaster"
-        },
-        {
-            "name": "Botanist"
-        },
-        {
-            "name": "Borg"
-        },
-        {
-            "name": "Boxer"
+            "name": "Admin"
         },
         {
             "name": "AtmosphericTechnician"
         },
         {
-            "name": "Nanotrasen"
+            "name": "Bartender"
         },
         {
-            "name": "Prisoner"
+            "name": "Borg"
         },
         {
-            "name": "Janitor"
+            "name": "Botanist"
         },
         {
-            "name": "Chemist"
+            "name": "Boxer"
         },
         {
-            "name": "StationEngineer"
+            "name": "Brigmedic"
         },
         {
-            "name": "SecurityOfficer"
-        },
-        {
-            "name": "NoId"
-        },
-        {
-            "name": "ChiefMedicalOfficer"
-        },
-        {
-            "name": "Roboticist"
-        },
-        {
-            "name": "Chaplain"
-        },
-        {
-            "name": "Lawyer"
-        },
-        {
-            "name": "Unknown"
-        },
-        {
-            "name": "Librarian"
+            "name": "Captain"
         },
         {
             "name": "CargoTechnician"
         },
         {
-            "name": "Scientist"
+            "name": "CBURN"
         },
         {
-            "name": "ResearchAssistant"
+            "name": "Chaplain"
         },
         {
-            "name": "Geneticist"
+            "name": "Chef"
+        },
+        {
+            "name": "Chemist"
+        },
+        {
+            "name": "ChiefEngineer"
+        },
+        {
+            "name": "ChiefMedicalOfficer"
         },
         {
             "name": "Clown"
@@ -83,94 +59,61 @@
             "name": "Cluwne"
         },
         {
-            "name": "Captain"
+            "name": "Detective"
         },
         {
+            "name": "DeathSquad"
+        },
+        {
+            "name": "ERTChaplain"
+        },
+        {
+            "name": "ERTEngineer"
+        },
+        {
+            "name": "ERTJanitor"
+        },
+        {
+            "name": "ERTLeader"
+        },
+        {
+            "name": "ERTMedical"
+        },
+        {
+            "name": "ERTSecurity"
+        },
+        {
+            "name": "Geneticist"
+        },
+		{
             "name": "HeadOfPersonnel"
         },
-        {
-            "name": "Virologist"
-        },
-        {
-            "name": "ShaftMiner"
-        },
-        {
-            "name": "Passenger"
-        },
-        {
-            "name": "ChiefEngineer"
-        },
-        {
-            "name": "Bartender"
-        },
         {
             "name": "HeadOfSecurity"
         },
         {
-            "name": "Brigmedic"
+            "name": "HeadRevolutionary"
+        },
+        {
+            "name": "InitialInfected"
+        },
+        {
+            "name": "Janitor"
+        },
+        {
+            "name": "Lawyer"
+        },
+        {
+            "name": "Librarian"
         },
         {
             "name": "MedicalDoctor"
         },
-        {
-            "name": "Paramedic"
-        },
-        {
-            "name": "Chef"
-        },
-        {
-            "name": "Warden"
-        },
-        {
-            "name": "ResearchDirector"
-        },
-        {
-            "name": "Mime"
-        },
-        {
-            "name": "Musician"
-        },
-        {
-            "name": "Reporter"
-        },
-        {
-            "name": "Psychologist"
-        },
         {
             "name": "MedicalIntern"
         },
         {
-            "name": "TechnicalAssistant"
-        },
-        {
-            "name": "ServiceWorker"
-        },
-        {
-            "name": "SecurityCadet"
-        },
-        {
-            "name": "Zombie"
-        },
-        {
-            "name": "Zookeeper"
-        },
-        {
-            "name": "SeniorEngineer"
-        },
-        {
-            "name": "SeniorResearcher"
-        },
-        {
-            "name": "SeniorPhysician"
-        },
-        {
-            "name": "SeniorOfficer"
-        },
-        {
-            "name": "Revolutionary"
-        },
-        {
-            "name": "HeadRevolutionary"
+            "name": "Mime"
         },
         {
             "name": "MindShield",
@@ -181,23 +124,116 @@
                 ]
             ]
         },
+        {
+            "name": "Musician"
+        },
+        {
+            "name": "Nanotrasen"
+        },
+        {
+            "name": "NoId"
+        },
+        {
+            "name": "ParadoxClone"
+        },
+        {
+            "name": "Paramedic"
+        },
+        {
+            "name": "Passenger"
+        },
+        {
+            "name": "Prisoner"
+        },
+        {
+            "name": "Psychologist"
+        },
+        {
+            "name": "QuarterMaster"
+        },
+        {
+            "name": "Reporter"
+        },
+        {
+            "name": "ResearchAssistant"
+        },
+        {
+            "name": "ResearchDirector"
+        },
+        {
+            "name": "Revolutionary"
+        },
+        {
+            "name": "Roboticist"
+        },
+        {
+            "name": "Scientist"
+        },
+        {
+            "name": "SecurityCadet"
+        },
+        {
+            "name": "SecurityOfficer"
+        },
+        {
+            "name": "SeniorEngineer"
+        },
+        {
+            "name": "SeniorOfficer"
+        },
+        {
+            "name": "SeniorPhysician"
+        },
+        {
+            "name": "SeniorResearcher"
+        },
+        {
+            "name": "ServiceWorker"
+        },
+        {
+            "name": "ShaftMiner"
+        },
         {
             "name": "StationAi"
         },
+        {
+            "name": "StationEngineer"
+        },
         {
             "name": "Syndicate"
         },
+        {
+            "name": "SyndicateCommander"
+        },
+        {
+            "name": "SyndicateCorpsman"
+        },
+        {
+            "name": "SyndicateOperative"
+        },
+        {
+            "name": "TechnicalAssistant"
+        },
+        {
+            "name": "Unknown"
+        },
+        {
+            "name": "Virologist"
+        },
         {
             "name": "Visitor"
         },
         {
-            "name": "InitialInfected"
+            "name": "Warden"
         },
         {
-            "name": "Admin"
+            "name": "Wizard"
         },
         {
-            "name": "ParadoxClone"
+            "name": "Zombie"
+        },
+        {
+            "name": "Zookeeper"
         }
     ]
 }

Resources/Textures/Objects/Consumable/Food/candy.rsi/meta.json

@@ -42,6 +42,9 @@
     {
       "name": "orange"
     },
+    {
+      "name": "swirl_lollipop"
+    },
     {
       "name": "swirl_lollipop-inhand-right",
       "directions": 4

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

@@ -1,279 +1,24 @@
 {
     "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) | service icons darkened by frobnic8 (Discord and Github), wizard and idwizard by ScarKy0 | idboxer and idlawyer recoloured by K-Dynamic (github). | idcurator recoloured by AeraAulin (github) | idquartermaster modified by K-Dynamic (github) | idmime and idmusician recolor by DinnerCalzone (github) at https://github.com/impstation/imp-station-14/commit/233161f02bab7f9f9c03f09f39638ea7c200ee24 | syndiop/agent/commander made by Archee1 (Github)",
+	"copyright": "Taken and modified from /tg/station 13 at commit https://github.com/tgstation/tgstation/commit/d917f4c, edited by AJCM-git, CrudeWax, and DinnerCalzone (github) | inhands taken and modified from /vg/station13 at https://github.com/vgstation-coders/vgstation13/blob/2c2b9966ea0d03b10e6e9c59626f72bbe8475d9d/icons/mob/in-hand/left/items_lefthand.dmi | pirate made by brainfood1183 (github) | wizard by ScarkKy0 (github) | stripe_cluwne by brainfood1183 (github) | black-inhands by DinnerCalzone (github)",
     "size": {
         "x": 32,
         "y": 32
     },
     "states": [
         {
-            "name": "default"
+            "name": "admin"
         },
         {
             "name": "black"
         },
         {
-            "name": "centcom"
-        },
-        {
-            "name": "admin"
-        },
-        {
-            "name": "ert_chaplain"
-        },
-        {
-            "name": "ert_commander"
-        },
-        {
-            "name": "ert_engineer"
-        },
-        {
-            "name": "ert_janitor"
-        },
-        {
-            "name": "ert_medic"
-        },
-        {
-            "name": "ert_security"
-        },
-        {
-            "name": "gold"
-        },
-        {
-            "name": "idpassenger"
-        },
-        {
-            "name": "idatmospherictechnician"
-        },
-        {
-            "name": "idbartender"
-        },
-        {
-            "name": "idbotanist"
-        },
-        {
-            "name": "idboxer"
-        },
-        {
-            "name": "idcaptain"
-        },
-        {
-            "name": "idcargotechnician"
-        },
-        {
-            "name": "idcentcom"
-        },
-        {
-            "name": "idchaplain"
-        },
-        {
-            "name": "idchemist"
-        },
-        {
-            "name": "idchiefengineer"
-        },
-        {
-            "name": "idchiefmedicalofficer"
-        },
-        {
-            "name": "idclown"
-        },
-        {
-            "name": "idcook"
-        },
-        {
-            "name": "idcurator"
-        },
-        {
-            "name": "iddetective"
-        },
-        {
-            "name": "idgeneticist"
-        },
-        {
-            "name": "idheadofpersonnel"
-        },
-        {
-            "name": "idheadofsecurity"
-        },
-        {
-            "name": "idbrigmedic"
-        },
-        {
-            "name": "idjanitor"
-        },
-        {
-            "name": "idlawyer"
-        },
-        {
-            "name": "idmedicaldoctor"
-        },
-        {
-            "name": "idmime"
-        },
-        {
-            "name": "idparamedic"
-        },
-        {
-            "name": "idpsychologist"
-        },
-        {
-            "name": "idreporter"
-        },
-        {
-            "name": "idprisoner"
-        },
-        {
-            "name": "idquartermaster"
-        },
-        {
-            "name": "idresearchdirector"
-        },
-        {
-            "name": "idroboticist"
-        },
-        {
-            "name": "idscientist"
-        },
-        {
-            "name": "idsecurityofficer"
-        },
-        {
-            "name": "idshaftminer"
-        },
-        {
-            "name": "idstationengineer"
-        },
-        {
-            "name": "idunknown"
-        },
-        {
-            "name": "idvirologist"
-        },
-        {
-            "name": "idvisitor"
-        },
-        {
-            "name": "idwarden"
-        },
-        {
-            "name": "idmusician"
-        },
-        {
-            "name": "idzookeeper"
-        },
-        {
-            "name": "idintern-sci"
-        },
-        {
-            "name": "idintern-cadet"
-        },
-        {
-            "name": "idintern-med"
-        },
-        {
-            "name": "idintern-service"
-        },
-        {
-            "name": "idintern-tech"
-        },
-        {
-            "name": "idadmin"
-        },
-        {
-            "name": "orange"
-        },
-        {
-            "name": "pirate"
-        },
-        {
-            "name": "prisoner_001"
-        },
-        {
-            "name": "prisoner_002"
-        },
-        {
-            "name": "prisoner_003"
-        },
-        {
-            "name": "prisoner_004"
-        },
-        {
-            "name": "prisoner_005"
-        },
-        {
-            "name": "prisoner_006"
-        },
-        {
-            "name": "prisoner_007"
-        },
-        {
-            "name": "silver"
-        },
-        {
-            "name": "syndi"
-        },
-        {
-            "name": "syndi_operative"
-        },
-        {
-            "name": "syndi_corpsman"
-        },
-        {
-            "name": "syndi_commander"
-        },
-        {
-            "name": "idcluwne"
-        },
-        {
-            "name": "idseniorengineer"
-        },
-        {
-            "name": "idseniorresearcher"
-        },
-        {
-            "name": "idseniorphysician"
-        },
-        {
-            "name": "idseniorofficer"
-        },
-        {
-            "name": "wizard"
-        },
-        {
-            "name": "idwizard"
-        },
-        {
-            "name": "gold-inhand-left",
+            "name": "black-inhand-left",
             "directions": 4
         },
         {
-            "name": "gold-inhand-right",
-            "directions": 4
-        },
-        {
-            "name": "default-inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "default-inhand-right",
-            "directions": 4
-        },
-        {
-            "name": "silver-inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "silver-inhand-right",
-            "directions": 4
-        },
-        {
-            "name": "orange-inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "orange-inhand-right",
+            "name": "black-inhand-right",
             "directions": 4
         },
         {
@@ -284,6 +29,31 @@
             "name": "blue-inhand-right",
             "directions": 4
         },
+        {
+            "name": "centcom"
+        },
+        {
+            "name": "default"
+        },
+        {
+            "name": "default-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "default-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "gold"
+        },
+        {
+            "name": "gold-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "gold-inhand-right",
+            "directions": 4
+        },
         {
             "name": "green-inhand-left",
             "directions": 4
@@ -291,6 +61,46 @@
         {
             "name": "green-inhand-right",
             "directions": 4
+        },
+        {
+            "name": "icon-captain"
+        },
+        {
+            "name": "orange"
+        },
+        {
+            "name": "orange-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "orange-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "pirate"
+        },
+        {
+            "name": "silver"
+        },
+        {
+            "name": "silver-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "silver-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "stripe_bottom"
+        },
+        {
+            "name": "stripe_clown"
+        },
+        {
+            "name": "stripe_top"
+        },
+        {
+            "name": "wizard"
         }
     ]
 }