diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 621fb4557d..90d7b0ec90 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -812,6 +812,7 @@ heldPrefix: blue - type: IdCard jobTitle: Centcom Agent + jobIcon: JobIconDeathSquad # WWDP - type: entity name: passenger ID card @@ -891,6 +892,7 @@ - JobIconChiefJustice # Delta V - Added justice dept - JobIconProsecutor # Delta V - Added justice dept - JobIconVisitor + - JobIconDeathSquad # WWDP - type: ActivatableUI key: enum.AgentIDCardUiKey.Key inHandsOnly: true diff --git a/Resources/Prototypes/StatusEffects/job.yml b/Resources/Prototypes/StatusEffects/job.yml index 96ad930bd5..9b8e957e94 100644 --- a/Resources/Prototypes/StatusEffects/job.yml +++ b/Resources/Prototypes/StatusEffects/job.yml @@ -128,8 +128,8 @@ parent: JobIcon id: JobIconUnknown icon: - sprite: /Textures/Interface/Misc/job_icons.rsi - state: Unknown + sprite: /Textures/_White/Interface/Misc/job_icons.rsi # WWDP-Edit + state: Shrambled # WWDP-Edit - type: statusIcon parent: JobIcon diff --git a/Resources/Prototypes/StatusEffects/security.yml b/Resources/Prototypes/StatusEffects/security.yml index 31a22e5df3..cb8b9e0e13 100644 --- a/Resources/Prototypes/StatusEffects/security.yml +++ b/Resources/Prototypes/StatusEffects/security.yml @@ -1,8 +1,8 @@ - type: statusIcon id: SecurityIcon abstract: true - offset: 1 - locationPreference: Left + offset: 2 # WWDP-Edit + locationPreference: Right # WWDP-Edit isShaded: true - type: statusIcon diff --git a/Resources/Prototypes/_White/StatusEffects/job.yml b/Resources/Prototypes/_White/StatusEffects/job.yml index f9343b31aa..5bab42c1ad 100644 --- a/Resources/Prototypes/_White/StatusEffects/job.yml +++ b/Resources/Prototypes/_White/StatusEffects/job.yml @@ -11,3 +11,10 @@ icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: Maid + +- type: statusIcon + parent: JobIcon + id: JobIconDeathSquad + icon: + sprite: /Textures/_White/Interface/Misc/job_icons.rsi + state: DeathSquad diff --git a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Chaplain.png b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Chaplain.png index 5d2d7cfaca..850866396e 100644 Binary files a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Chaplain.png and b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Chaplain.png differ diff --git a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/ChiefJustice.png b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/ChiefJustice.png index 6cba0e4a93..68be0323d9 100644 Binary files a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/ChiefJustice.png and b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/ChiefJustice.png differ diff --git a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Clerk.png b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Clerk.png index 90e01b97cd..f478076e93 100644 Binary files a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Clerk.png and b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Clerk.png differ diff --git a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Lawyer.png b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Lawyer.png index 9ef5c30527..537ba4446e 100644 Binary files a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Lawyer.png and b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Lawyer.png differ diff --git a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/MedicalBorg.png b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/MedicalBorg.png index 95a2f0a8c3..40d45cf492 100644 Binary files a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/MedicalBorg.png and b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/MedicalBorg.png differ diff --git a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Prosecutor.png b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Prosecutor.png index 997b29b2a4..84463f5453 100644 Binary files a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Prosecutor.png and b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Prosecutor.png differ diff --git a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json index 09d18e3ab7..dd03936d04 100644 --- a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/DeltaV/Interface/Misc/job_icons.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 | nyanoPrisonGuard, nyanoMartialArtist, nyanoGladiator made by Floofers | ChiefJustice, Clerk by leonardo_dabepis (Discord)", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | nyanoPrisonGuard, nyanoMartialArtist, nyanoGladiator made by Floofers | ChiefJustice, Clerk by leonardo_dabepis (Discord) | Reshaded and edited by PuroSlavKing (Github)", "size": { "x": 8, "y": 8 diff --git a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoGladiator.png b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoGladiator.png index e5ec3b32c2..86d286916d 100644 Binary files a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoGladiator.png and b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoGladiator.png differ diff --git a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoMailCarrier.png b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoMailCarrier.png index 1b0acdd241..6f0513ab77 100644 Binary files a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoMailCarrier.png and b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoMailCarrier.png differ diff --git a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoMantis.png b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoMantis.png index 3406d5d0ca..7512e5190c 100644 Binary files a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoMantis.png and b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoMantis.png differ diff --git a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoMartialArtist.png b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoMartialArtist.png index cd0620657d..40a54a700c 100644 Binary files a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoMartialArtist.png and b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoMartialArtist.png differ diff --git a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoPrisonGuard.png b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoPrisonGuard.png index c4233ff7aa..a8f82be3fe 100644 Binary files a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoPrisonGuard.png and b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoPrisonGuard.png differ diff --git a/Resources/Textures/Interface/Misc/health_icons.rsi/Dead.png b/Resources/Textures/Interface/Misc/health_icons.rsi/Dead.png index 8cebd95418..c76f634b18 100644 Binary files a/Resources/Textures/Interface/Misc/health_icons.rsi/Dead.png and b/Resources/Textures/Interface/Misc/health_icons.rsi/Dead.png differ diff --git a/Resources/Textures/Interface/Misc/health_icons.rsi/Fine.png b/Resources/Textures/Interface/Misc/health_icons.rsi/Fine.png index 45725aa73c..942e48d998 100644 Binary files a/Resources/Textures/Interface/Misc/health_icons.rsi/Fine.png and b/Resources/Textures/Interface/Misc/health_icons.rsi/Fine.png differ diff --git a/Resources/Textures/Interface/Misc/health_icons.rsi/Rotting.png b/Resources/Textures/Interface/Misc/health_icons.rsi/Rotting.png index 8965b1308d..800dc50f8f 100644 Binary files a/Resources/Textures/Interface/Misc/health_icons.rsi/Rotting.png and b/Resources/Textures/Interface/Misc/health_icons.rsi/Rotting.png differ diff --git a/Resources/Textures/Interface/Misc/health_icons.rsi/meta.json b/Resources/Textures/Interface/Misc/health_icons.rsi/meta.json index fb584d6b7f..901c58487a 100644 --- a/Resources/Textures/Interface/Misc/health_icons.rsi/meta.json +++ b/Resources/Textures/Interface/Misc/health_icons.rsi/meta.json @@ -5,7 +5,7 @@ "y": 8 }, "license": "CC-BY-SA-3.0", - "copyright": "Taken from /tg/station at commit https://github.com/tgstation/tgstation/commit/20ae083f140ac5b4da7e8bc40f95349001b6c086", + "copyright": "Taken from /tg/station at commit https://github.com/tgstation/tgstation/commit/20ae083f140ac5b4da7e8bc40f95349001b6c086 | Reshaded by Skilets (Github) | Edited by PuroSlavKing (Github)", "states": [ { "name": "Fine" diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/AtmosphericTechnician.png b/Resources/Textures/Interface/Misc/job_icons.rsi/AtmosphericTechnician.png index c78a735801..621c883ae1 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/AtmosphericTechnician.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/AtmosphericTechnician.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Bartender.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Bartender.png index d6e59ad74b..4810ece691 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/Bartender.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/Bartender.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Borg.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Borg.png index 51a6392436..0ac1d25352 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/Borg.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/Borg.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Botanist.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Botanist.png index 49e17f9b44..59e4512808 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/Botanist.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/Botanist.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Boxer.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Boxer.png index f260c921e4..2b87668657 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/Boxer.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/Boxer.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Brigmedic.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Brigmedic.png index fc63ce513a..45bb54bda9 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/Brigmedic.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/Brigmedic.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Captain.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Captain.png index 52ad5ea934..8b21f64067 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/Captain.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/Captain.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/CargoTechnician.png b/Resources/Textures/Interface/Misc/job_icons.rsi/CargoTechnician.png index 7645fe9aad..bd20b81a81 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/CargoTechnician.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/CargoTechnician.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Chaplain.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Chaplain.png index 3aaa65194d..97e724e092 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/Chaplain.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/Chaplain.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Chef.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Chef.png index 82eb9514e7..0189e0f18e 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/Chef.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/Chef.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Chemist.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Chemist.png index 3c6c2a8c9c..fb7642afe6 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/Chemist.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/Chemist.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/ChiefEngineer.png b/Resources/Textures/Interface/Misc/job_icons.rsi/ChiefEngineer.png index 8b8a99018e..df04f6526c 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/ChiefEngineer.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/ChiefEngineer.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/ChiefMedicalOfficer.png b/Resources/Textures/Interface/Misc/job_icons.rsi/ChiefMedicalOfficer.png index 6847208931..6e9e2291fc 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/ChiefMedicalOfficer.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/ChiefMedicalOfficer.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Clown.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Clown.png index 609f7d54a7..367495ccb3 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/Clown.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/Clown.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Detective.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Detective.png index fca34fb229..6124fef1b6 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/Detective.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/Detective.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Geneticist.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Geneticist.png index 20a498252f..4f674519f0 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/Geneticist.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/Geneticist.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/HeadOfPersonnel.png b/Resources/Textures/Interface/Misc/job_icons.rsi/HeadOfPersonnel.png index d153808d27..1211deb876 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/HeadOfPersonnel.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/HeadOfPersonnel.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/HeadOfSecurity.png b/Resources/Textures/Interface/Misc/job_icons.rsi/HeadOfSecurity.png index e85f11e655..02687415cf 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/HeadOfSecurity.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/HeadOfSecurity.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/HeadRevolutionary.png b/Resources/Textures/Interface/Misc/job_icons.rsi/HeadRevolutionary.png index 21f5c12021..f762782a0b 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/HeadRevolutionary.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/HeadRevolutionary.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/InitialInfected.png b/Resources/Textures/Interface/Misc/job_icons.rsi/InitialInfected.png index 3684fc4488..342c0bf50c 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/InitialInfected.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/InitialInfected.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Janitor.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Janitor.png index 6f1e55b7de..ac992278f9 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/Janitor.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/Janitor.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Lawyer.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Lawyer.png index f153a95e5d..1eafc54152 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/Lawyer.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/Lawyer.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Librarian.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Librarian.png index 114283c053..a014960b76 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/Librarian.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/Librarian.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Maid.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Maid.png index fd1fed560b..806ef70bbf 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/Maid.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/Maid.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/MedicalDoctor.png b/Resources/Textures/Interface/Misc/job_icons.rsi/MedicalDoctor.png index f57f5a1972..7a51ec0fa4 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/MedicalDoctor.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/MedicalDoctor.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/MedicalIntern.png b/Resources/Textures/Interface/Misc/job_icons.rsi/MedicalIntern.png index 7485976f95..4480b91c8e 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/MedicalIntern.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/MedicalIntern.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Mime.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Mime.png index 8f3cf00b81..37ccd60bb7 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/Mime.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/Mime.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/MindShield.png b/Resources/Textures/Interface/Misc/job_icons.rsi/MindShield.png index e311b9f616..dc8ddf8507 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/MindShield.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/MindShield.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Musician.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Musician.png index 072348f050..1dd497671a 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/Musician.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/Musician.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Nanotrasen.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Nanotrasen.png index ff24b4c04c..eec7c6cbc1 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/Nanotrasen.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/Nanotrasen.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/NoId.png b/Resources/Textures/Interface/Misc/job_icons.rsi/NoId.png index e7897caf1a..4b3b141011 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/NoId.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/NoId.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Paramedic.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Paramedic.png index 34fe62eb84..cdfdd4f60e 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/Paramedic.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/Paramedic.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Passenger.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Passenger.png index 6dcde3e252..8284f94a96 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/Passenger.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/Passenger.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Prisoner.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Prisoner.png index 5dca943aca..17bdb2db53 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/Prisoner.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/Prisoner.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Psychologist.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Psychologist.png index f3362ed041..948dc1b6e4 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/Psychologist.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/Psychologist.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/QuarterMaster.png b/Resources/Textures/Interface/Misc/job_icons.rsi/QuarterMaster.png index 2e2e6fdcd6..fcc5b6e409 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/QuarterMaster.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/QuarterMaster.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Reporter.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Reporter.png index 679f8d4490..ff56493ff4 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/Reporter.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/Reporter.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/ResearchAssistant.png b/Resources/Textures/Interface/Misc/job_icons.rsi/ResearchAssistant.png index 486a2fa89a..3dafa569bd 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/ResearchAssistant.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/ResearchAssistant.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/ResearchDirector.png b/Resources/Textures/Interface/Misc/job_icons.rsi/ResearchDirector.png index 8ac7c22e62..77a138a3e4 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/ResearchDirector.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/ResearchDirector.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Revolutionary.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Revolutionary.png index ef4420a1e5..3877ffb73d 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/Revolutionary.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/Revolutionary.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Roboticist.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Roboticist.png index 7bef145b22..b6cdf69e0d 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/Roboticist.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/Roboticist.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Scientist.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Scientist.png index b2bf53f8f7..3ec6ed1a9d 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/Scientist.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/Scientist.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/SecurityCadet.png b/Resources/Textures/Interface/Misc/job_icons.rsi/SecurityCadet.png index fbd9007eb1..d145bc9989 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/SecurityCadet.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/SecurityCadet.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/SecurityOfficer.png b/Resources/Textures/Interface/Misc/job_icons.rsi/SecurityOfficer.png index 684f4f9314..1be3455555 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/SecurityOfficer.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/SecurityOfficer.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/SeniorEngineer.png b/Resources/Textures/Interface/Misc/job_icons.rsi/SeniorEngineer.png index 7bf4c5b193..8fcc130bb1 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/SeniorEngineer.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/SeniorEngineer.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/SeniorOfficer.png b/Resources/Textures/Interface/Misc/job_icons.rsi/SeniorOfficer.png index bc4d4c2a26..4b12fe30b9 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/SeniorOfficer.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/SeniorOfficer.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/SeniorPhysician.png b/Resources/Textures/Interface/Misc/job_icons.rsi/SeniorPhysician.png index 04af86dbe3..fa983f78c5 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/SeniorPhysician.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/SeniorPhysician.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/SeniorResearcher.png b/Resources/Textures/Interface/Misc/job_icons.rsi/SeniorResearcher.png index a9a0de4d7f..d3ce0a9282 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/SeniorResearcher.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/SeniorResearcher.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/ServiceWorker.png b/Resources/Textures/Interface/Misc/job_icons.rsi/ServiceWorker.png index 6dece6fb58..cda9181908 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/ServiceWorker.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/ServiceWorker.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/ShaftMiner.png b/Resources/Textures/Interface/Misc/job_icons.rsi/ShaftMiner.png index 184d59e194..2f2203df38 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/ShaftMiner.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/ShaftMiner.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/StationEngineer.png b/Resources/Textures/Interface/Misc/job_icons.rsi/StationEngineer.png index 8dbadc298e..91bb29155f 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/StationEngineer.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/StationEngineer.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Syndicate.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Syndicate.png index a671977085..ae54186441 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/Syndicate.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/Syndicate.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/TechnicalAssistant.png b/Resources/Textures/Interface/Misc/job_icons.rsi/TechnicalAssistant.png index 7aabb46653..4dc6bead25 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/TechnicalAssistant.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/TechnicalAssistant.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Unknown.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Unknown.png index b869423b73..bce41da5d8 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/Unknown.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/Unknown.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Virologist.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Virologist.png index 959c8d056b..63483825af 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/Virologist.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/Virologist.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Visitor.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Visitor.png index 5644edb607..a38b923fa8 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/Visitor.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/Visitor.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Warden.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Warden.png index c1478bcbe4..29c16e8cdd 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/Warden.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/Warden.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Zombie.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Zombie.png index 52629aa342..249f9acf16 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/Zombie.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/Zombie.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Zookeeper.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Zookeeper.png index 6b7e3cd5da..b3faa259f0 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/Zookeeper.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/Zookeeper.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json index 24db875396..d463b410b0 100644 --- a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json @@ -1,7 +1,7 @@ { "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/master/icons/mob/huds/hud.dmi", + "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/master/icons/mob/huds/hud.dmi | Reshaded by Skilets (Github) | Edited by PuroSlavKing (Github)", "size": { "x": 8, diff --git a/Resources/Textures/Interface/Misc/security_icons.rsi/hud_discharged.png b/Resources/Textures/Interface/Misc/security_icons.rsi/hud_discharged.png index 2e012349e0..895dc76cb7 100644 Binary files a/Resources/Textures/Interface/Misc/security_icons.rsi/hud_discharged.png and b/Resources/Textures/Interface/Misc/security_icons.rsi/hud_discharged.png differ diff --git a/Resources/Textures/Interface/Misc/security_icons.rsi/hud_incarcerated.png b/Resources/Textures/Interface/Misc/security_icons.rsi/hud_incarcerated.png index 1dc03f7b86..4ce18467bd 100644 Binary files a/Resources/Textures/Interface/Misc/security_icons.rsi/hud_incarcerated.png and b/Resources/Textures/Interface/Misc/security_icons.rsi/hud_incarcerated.png differ diff --git a/Resources/Textures/Interface/Misc/security_icons.rsi/hud_paroled.png b/Resources/Textures/Interface/Misc/security_icons.rsi/hud_paroled.png index 042fb147b1..d39d34d3d8 100644 Binary files a/Resources/Textures/Interface/Misc/security_icons.rsi/hud_paroled.png and b/Resources/Textures/Interface/Misc/security_icons.rsi/hud_paroled.png differ diff --git a/Resources/Textures/Interface/Misc/security_icons.rsi/hud_suspected.png b/Resources/Textures/Interface/Misc/security_icons.rsi/hud_suspected.png index cfb34742bf..caffe15c0b 100644 Binary files a/Resources/Textures/Interface/Misc/security_icons.rsi/hud_suspected.png and b/Resources/Textures/Interface/Misc/security_icons.rsi/hud_suspected.png differ diff --git a/Resources/Textures/Interface/Misc/security_icons.rsi/hud_wanted.png b/Resources/Textures/Interface/Misc/security_icons.rsi/hud_wanted.png index 2df379d112..3f8626dbd4 100644 Binary files a/Resources/Textures/Interface/Misc/security_icons.rsi/hud_wanted.png and b/Resources/Textures/Interface/Misc/security_icons.rsi/hud_wanted.png differ diff --git a/Resources/Textures/Interface/Misc/security_icons.rsi/meta.json b/Resources/Textures/Interface/Misc/security_icons.rsi/meta.json index 042eda20c6..7bda36133a 100644 --- a/Resources/Textures/Interface/Misc/security_icons.rsi/meta.json +++ b/Resources/Textures/Interface/Misc/security_icons.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/tgstation/tgstation/blob/7f654b6e8e59021607a9e888dfeb79920401c372/icons/mob/huds/hud.dmi", + "copyright": "Taken from https://github.com/tgstation/tgstation/blob/7f654b6e8e59021607a9e888dfeb79920401c372/icons/mob/huds/hud.dmi | Reshaded by Skilets (Github) | Edited by PuroSlavKing (Github)", "size": { "x": 8, "y": 8 diff --git a/Resources/Textures/_White/Interface/Misc/job_icons.rsi/DeathSquad.png b/Resources/Textures/_White/Interface/Misc/job_icons.rsi/DeathSquad.png new file mode 100644 index 0000000000..e385bc86a5 Binary files /dev/null and b/Resources/Textures/_White/Interface/Misc/job_icons.rsi/DeathSquad.png differ diff --git a/Resources/Textures/_White/Interface/Misc/job_icons.rsi/Shrambled.png b/Resources/Textures/_White/Interface/Misc/job_icons.rsi/Shrambled.png new file mode 100644 index 0000000000..a79637e488 Binary files /dev/null and b/Resources/Textures/_White/Interface/Misc/job_icons.rsi/Shrambled.png differ diff --git a/Resources/Textures/_White/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/_White/Interface/Misc/job_icons.rsi/meta.json new file mode 100644 index 0000000000..cb82374aa5 --- /dev/null +++ b/Resources/Textures/_White/Interface/Misc/job_icons.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/BlueMoon-Labs/MOLOT-BlueMoon-Station/pull/1247/files | Edited by PuroSlavKing (Github)", + + "size": { + "x": 8, + "y": 8 + }, + "states": [ + { + "name": "DeathSquad" + }, + { + "name": "Shrambled", + "delays": + [ + [0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2] + ] + } + ] +}