diff --git a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml index 62945a0ed8..1e0ef876a0 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml @@ -73,7 +73,7 @@ - type: Sprite layers: - state: green - - state: miner + - state: salvagespecialist # Civilian @@ -96,6 +96,10 @@ components: - type: SpawnPoint job_id: TechnicalAssistant + - type: Sprite + layers: + - state: green + - state: technicalassistant - type: entity id: SpawnPointMedicalIntern @@ -104,6 +108,10 @@ components: - type: SpawnPoint job_id: MedicalIntern + - type: Sprite + layers: + - state: green + - state: medicalintern - type: entity id: SpawnPointSecurityCadet @@ -124,6 +132,10 @@ components: - type: SpawnPoint job_id: ResearchAssistant + - type: Sprite + layers: + - state: green + - state: researchassistant - type: entity id: SpawnPointServiceWorker @@ -132,6 +144,10 @@ components: - type: SpawnPoint job_id: ServiceWorker + - type: Sprite + layers: + - state: green + - state: serviceworker - type: entity id: SpawnPointBartender @@ -246,24 +262,24 @@ parent: SpawnPointJobBase name: musician components: - - type: SpawnPoint - job_id: Musician - - type: Sprite - layers: - - state: green - - state: musician + - type: SpawnPoint + job_id: Musician + - type: Sprite + layers: + - state: green + - state: musician - type: entity id: SpawnPointBoxer parent: SpawnPointJobBase name: boxer components: - - type: SpawnPoint - job_id: Boxer - - type: Sprite - layers: - - state: green - - state: boxer + - type: SpawnPoint + job_id: Boxer + - type: Sprite + layers: + - state: green + - state: boxer - type: entity id: SpawnPointBorg @@ -349,12 +365,12 @@ parent: SpawnPointJobBase name: atmospherics components: - - type: SpawnPoint - job_id: AtmosphericTechnician - - type: Sprite - layers: - - state: green - - state: atmospherics + - type: SpawnPoint + job_id: AtmosphericTechnician + - type: Sprite + layers: + - state: green + - state: atmospherics # Medical diff --git a/Resources/Textures/Markers/jobs.rsi/atmospherics.png b/Resources/Textures/Markers/jobs.rsi/atmospherics.png index b25133c96d..3f95cfd233 100644 Binary files a/Resources/Textures/Markers/jobs.rsi/atmospherics.png and b/Resources/Textures/Markers/jobs.rsi/atmospherics.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/bartender.png b/Resources/Textures/Markers/jobs.rsi/bartender.png index d0f4baaf2b..214a4b27fb 100644 Binary files a/Resources/Textures/Markers/jobs.rsi/bartender.png and b/Resources/Textures/Markers/jobs.rsi/bartender.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/botanist.png b/Resources/Textures/Markers/jobs.rsi/botanist.png index 8e81377214..3cec3fc7dc 100644 Binary files a/Resources/Textures/Markers/jobs.rsi/botanist.png and b/Resources/Textures/Markers/jobs.rsi/botanist.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/boxer.png b/Resources/Textures/Markers/jobs.rsi/boxer.png index 60d10e2302..7933f674af 100644 Binary files a/Resources/Textures/Markers/jobs.rsi/boxer.png and b/Resources/Textures/Markers/jobs.rsi/boxer.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/captain.png b/Resources/Textures/Markers/jobs.rsi/captain.png index f32f53e462..9b9b6cd9a9 100644 Binary files a/Resources/Textures/Markers/jobs.rsi/captain.png and b/Resources/Textures/Markers/jobs.rsi/captain.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/cargo_tech.png b/Resources/Textures/Markers/jobs.rsi/cargo_tech.png index e162a24154..8dbccd0738 100644 Binary files a/Resources/Textures/Markers/jobs.rsi/cargo_tech.png and b/Resources/Textures/Markers/jobs.rsi/cargo_tech.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/ce.png b/Resources/Textures/Markers/jobs.rsi/ce.png index ec40156f1f..5721c28646 100644 Binary files a/Resources/Textures/Markers/jobs.rsi/ce.png and b/Resources/Textures/Markers/jobs.rsi/ce.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/centcom.png b/Resources/Textures/Markers/jobs.rsi/centcom.png index 8b1b51f4f5..dedc145648 100644 Binary files a/Resources/Textures/Markers/jobs.rsi/centcom.png and b/Resources/Textures/Markers/jobs.rsi/centcom.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/chaplain.png b/Resources/Textures/Markers/jobs.rsi/chaplain.png index c293074cd4..5f3487b7fb 100644 Binary files a/Resources/Textures/Markers/jobs.rsi/chaplain.png and b/Resources/Textures/Markers/jobs.rsi/chaplain.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/chef.png b/Resources/Textures/Markers/jobs.rsi/chef.png index f8eae67a88..61ec06f3c9 100644 Binary files a/Resources/Textures/Markers/jobs.rsi/chef.png and b/Resources/Textures/Markers/jobs.rsi/chef.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/chemist.png b/Resources/Textures/Markers/jobs.rsi/chemist.png index d983b91c58..40e22e5cd2 100644 Binary files a/Resources/Textures/Markers/jobs.rsi/chemist.png and b/Resources/Textures/Markers/jobs.rsi/chemist.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/clown.png b/Resources/Textures/Markers/jobs.rsi/clown.png index 994a291f68..c9c7920066 100644 Binary files a/Resources/Textures/Markers/jobs.rsi/clown.png and b/Resources/Textures/Markers/jobs.rsi/clown.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/cmo.png b/Resources/Textures/Markers/jobs.rsi/cmo.png index 4411c7fa3c..5706eb1706 100644 Binary files a/Resources/Textures/Markers/jobs.rsi/cmo.png and b/Resources/Textures/Markers/jobs.rsi/cmo.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/cyborg.png b/Resources/Textures/Markers/jobs.rsi/cyborg.png index 8811385665..4dd3501f56 100644 Binary files a/Resources/Textures/Markers/jobs.rsi/cyborg.png and b/Resources/Textures/Markers/jobs.rsi/cyborg.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/detective.png b/Resources/Textures/Markers/jobs.rsi/detective.png index 73d944a0a7..b2dc8ef4d2 100644 Binary files a/Resources/Textures/Markers/jobs.rsi/detective.png and b/Resources/Textures/Markers/jobs.rsi/detective.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/doctor.png b/Resources/Textures/Markers/jobs.rsi/doctor.png index 3b2fad9f3f..d447a2f94d 100644 Binary files a/Resources/Textures/Markers/jobs.rsi/doctor.png and b/Resources/Textures/Markers/jobs.rsi/doctor.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/engineer.png b/Resources/Textures/Markers/jobs.rsi/engineer.png index d561f3de46..353144650a 100644 Binary files a/Resources/Textures/Markers/jobs.rsi/engineer.png and b/Resources/Textures/Markers/jobs.rsi/engineer.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/ertengineer.png b/Resources/Textures/Markers/jobs.rsi/ertengineer.png index 629bc8078a..c6fbb1a540 100644 Binary files a/Resources/Textures/Markers/jobs.rsi/ertengineer.png and b/Resources/Textures/Markers/jobs.rsi/ertengineer.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/ertengineereva.png b/Resources/Textures/Markers/jobs.rsi/ertengineereva.png index b21b125391..93661a84da 100644 Binary files a/Resources/Textures/Markers/jobs.rsi/ertengineereva.png and b/Resources/Textures/Markers/jobs.rsi/ertengineereva.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/ertjanitor.png b/Resources/Textures/Markers/jobs.rsi/ertjanitor.png index 7d548c26c6..04b805c2c2 100644 Binary files a/Resources/Textures/Markers/jobs.rsi/ertjanitor.png and b/Resources/Textures/Markers/jobs.rsi/ertjanitor.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/ertjanitoreva.png b/Resources/Textures/Markers/jobs.rsi/ertjanitoreva.png index 24312247a8..26d17fb071 100644 Binary files a/Resources/Textures/Markers/jobs.rsi/ertjanitoreva.png and b/Resources/Textures/Markers/jobs.rsi/ertjanitoreva.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/ertleader.png b/Resources/Textures/Markers/jobs.rsi/ertleader.png index ec540ef750..3c510e68ae 100644 Binary files a/Resources/Textures/Markers/jobs.rsi/ertleader.png and b/Resources/Textures/Markers/jobs.rsi/ertleader.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/ertleadereva.png b/Resources/Textures/Markers/jobs.rsi/ertleadereva.png index d4f593785d..f3c85c6ca5 100644 Binary files a/Resources/Textures/Markers/jobs.rsi/ertleadereva.png and b/Resources/Textures/Markers/jobs.rsi/ertleadereva.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/ertmedical.png b/Resources/Textures/Markers/jobs.rsi/ertmedical.png index cf04b42265..0f5a2f9421 100644 Binary files a/Resources/Textures/Markers/jobs.rsi/ertmedical.png and b/Resources/Textures/Markers/jobs.rsi/ertmedical.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/ertmedicaleva.png b/Resources/Textures/Markers/jobs.rsi/ertmedicaleva.png index f5633c2b7d..a9f9b92e28 100644 Binary files a/Resources/Textures/Markers/jobs.rsi/ertmedicaleva.png and b/Resources/Textures/Markers/jobs.rsi/ertmedicaleva.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/ertsecurity.png b/Resources/Textures/Markers/jobs.rsi/ertsecurity.png index 3009a82546..eee1e5aeb6 100644 Binary files a/Resources/Textures/Markers/jobs.rsi/ertsecurity.png and b/Resources/Textures/Markers/jobs.rsi/ertsecurity.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/ertsecurityeva.png b/Resources/Textures/Markers/jobs.rsi/ertsecurityeva.png index 7e5450a302..bfc5c0677a 100644 Binary files a/Resources/Textures/Markers/jobs.rsi/ertsecurityeva.png and b/Resources/Textures/Markers/jobs.rsi/ertsecurityeva.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/hop.png b/Resources/Textures/Markers/jobs.rsi/hop.png index 5c9b2f05c1..f8cc9dc402 100644 Binary files a/Resources/Textures/Markers/jobs.rsi/hop.png and b/Resources/Textures/Markers/jobs.rsi/hop.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/hos.png b/Resources/Textures/Markers/jobs.rsi/hos.png index e13caa290a..ecca3ad417 100644 Binary files a/Resources/Textures/Markers/jobs.rsi/hos.png and b/Resources/Textures/Markers/jobs.rsi/hos.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/janitor.png b/Resources/Textures/Markers/jobs.rsi/janitor.png index 7be84691d1..031b2452ce 100644 Binary files a/Resources/Textures/Markers/jobs.rsi/janitor.png and b/Resources/Textures/Markers/jobs.rsi/janitor.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/lawyer.png b/Resources/Textures/Markers/jobs.rsi/lawyer.png index 403b6dd982..4e10eedefb 100644 Binary files a/Resources/Textures/Markers/jobs.rsi/lawyer.png and b/Resources/Textures/Markers/jobs.rsi/lawyer.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/librarian.png b/Resources/Textures/Markers/jobs.rsi/librarian.png index 34b9136951..c15516afd6 100644 Binary files a/Resources/Textures/Markers/jobs.rsi/librarian.png and b/Resources/Textures/Markers/jobs.rsi/librarian.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/medicalintern.png b/Resources/Textures/Markers/jobs.rsi/medicalintern.png new file mode 100644 index 0000000000..9153edf569 Binary files /dev/null and b/Resources/Textures/Markers/jobs.rsi/medicalintern.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/meta.json b/Resources/Textures/Markers/jobs.rsi/meta.json index 2401b27be7..bca3be1df8 100644 --- a/Resources/Textures/Markers/jobs.rsi/meta.json +++ b/Resources/Textures/Markers/jobs.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, librarian by Peptide. cburn and cluwne made by brainfood1183 (github). brigmed made by PuroSlavKing (Github)", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | cburn and cluwne made by brainfood1183 (github). brigmed made by PuroSlavKing (Github)", "size": { "x": 32, "y": 32 @@ -13,9 +13,6 @@ { "name": "ai" }, - { - "name": "passenger" - }, { "name": "atmospherics" }, @@ -28,6 +25,9 @@ { "name": "boxer" }, + { + "name": "brigmedic" + }, { "name": "captain" }, @@ -55,6 +55,9 @@ { "name": "clown" }, + { + "name": "cluwne" + }, { "name": "chef" }, @@ -67,6 +70,9 @@ { "name": "detective" }, + { + "name": "doctor" + }, { "name": "ertengineer" }, @@ -97,6 +103,9 @@ { "name": "ertsecurityeva" }, + { + "name": "engineer" + }, { "name": "geneticist" }, @@ -113,13 +122,19 @@ "name": "lawyer" }, { - "name": "doctor" + "name": "librarian" + }, + { + "name": "medicalintern" }, { "name": "mime" }, { - "name": "zookeeper" + "name": "miner" + }, + { + "name": "musician" }, { "name": "reporter" @@ -127,6 +142,9 @@ { "name": "paramedic" }, + { + "name": "passenger" + }, { "name": "prisoner" }, @@ -139,9 +157,15 @@ { "name": "rd" }, + { + "name": "researchassistant" + }, { "name": "roboticist" }, + { + "name": "salvagespecialist" + }, { "name": "scientist" }, @@ -152,28 +176,7 @@ "name": "security_officer" }, { - "name": "brigmedic" - }, - { - "name": "miner" - }, - { - "name": "engineer" - }, - { - "name": "virologist" - }, - { - "name": "librarian" - }, - { - "name": "warden" - }, - { - "name": "cluwne" - }, - { - "name": "musician" + "name": "serviceworker" }, { "name": "seniorengineer" @@ -186,6 +189,18 @@ }, { "name": "seniorofficer" + }, + { + "name": "technicalassistant" + }, + { + "name": "virologist" + }, + { + "name": "warden" + }, + { + "name": "zookeeper" } ] } diff --git a/Resources/Textures/Markers/jobs.rsi/mime.png b/Resources/Textures/Markers/jobs.rsi/mime.png index a051ff5117..c9bd4e88c1 100644 Binary files a/Resources/Textures/Markers/jobs.rsi/mime.png and b/Resources/Textures/Markers/jobs.rsi/mime.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/musician.png b/Resources/Textures/Markers/jobs.rsi/musician.png index 2ef8ec312d..7f82c6add7 100644 Binary files a/Resources/Textures/Markers/jobs.rsi/musician.png and b/Resources/Textures/Markers/jobs.rsi/musician.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/paramedic.png b/Resources/Textures/Markers/jobs.rsi/paramedic.png index 6e228574e6..cc4e2c4377 100644 Binary files a/Resources/Textures/Markers/jobs.rsi/paramedic.png and b/Resources/Textures/Markers/jobs.rsi/paramedic.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/passenger.png b/Resources/Textures/Markers/jobs.rsi/passenger.png index 139cba34f5..ba64980835 100644 Binary files a/Resources/Textures/Markers/jobs.rsi/passenger.png and b/Resources/Textures/Markers/jobs.rsi/passenger.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/prisoner.png b/Resources/Textures/Markers/jobs.rsi/prisoner.png index 35383af8cb..c4103ddb5f 100644 Binary files a/Resources/Textures/Markers/jobs.rsi/prisoner.png and b/Resources/Textures/Markers/jobs.rsi/prisoner.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/psychologist.png b/Resources/Textures/Markers/jobs.rsi/psychologist.png index 3c6339791b..31af5230d7 100644 Binary files a/Resources/Textures/Markers/jobs.rsi/psychologist.png and b/Resources/Textures/Markers/jobs.rsi/psychologist.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/qm.png b/Resources/Textures/Markers/jobs.rsi/qm.png index ac2aafa5cd..bbf90a67b6 100644 Binary files a/Resources/Textures/Markers/jobs.rsi/qm.png and b/Resources/Textures/Markers/jobs.rsi/qm.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/rd.png b/Resources/Textures/Markers/jobs.rsi/rd.png index bfcd188b59..0074397c71 100644 Binary files a/Resources/Textures/Markers/jobs.rsi/rd.png and b/Resources/Textures/Markers/jobs.rsi/rd.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/reporter.png b/Resources/Textures/Markers/jobs.rsi/reporter.png index 7bb31e77af..7e4ff69a37 100644 Binary files a/Resources/Textures/Markers/jobs.rsi/reporter.png and b/Resources/Textures/Markers/jobs.rsi/reporter.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/researchassistant.png b/Resources/Textures/Markers/jobs.rsi/researchassistant.png new file mode 100644 index 0000000000..50a5a75e41 Binary files /dev/null and b/Resources/Textures/Markers/jobs.rsi/researchassistant.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/salvagespecialist.png b/Resources/Textures/Markers/jobs.rsi/salvagespecialist.png new file mode 100644 index 0000000000..367cde9c6c Binary files /dev/null and b/Resources/Textures/Markers/jobs.rsi/salvagespecialist.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/scientist.png b/Resources/Textures/Markers/jobs.rsi/scientist.png index ac4849ba69..6a9bd40eff 100644 Binary files a/Resources/Textures/Markers/jobs.rsi/scientist.png and b/Resources/Textures/Markers/jobs.rsi/scientist.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/security_cadet.png b/Resources/Textures/Markers/jobs.rsi/security_cadet.png index 85a000e05a..40405d5343 100644 Binary files a/Resources/Textures/Markers/jobs.rsi/security_cadet.png and b/Resources/Textures/Markers/jobs.rsi/security_cadet.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/security_officer.png b/Resources/Textures/Markers/jobs.rsi/security_officer.png index 8d5dcdc9e3..d92a2e03a1 100644 Binary files a/Resources/Textures/Markers/jobs.rsi/security_officer.png and b/Resources/Textures/Markers/jobs.rsi/security_officer.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/seniorengineer.png b/Resources/Textures/Markers/jobs.rsi/seniorengineer.png index 738ff1f4e6..b6f911a730 100644 Binary files a/Resources/Textures/Markers/jobs.rsi/seniorengineer.png and b/Resources/Textures/Markers/jobs.rsi/seniorengineer.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/seniorofficer.png b/Resources/Textures/Markers/jobs.rsi/seniorofficer.png index 51d0ef9270..43d194905f 100644 Binary files a/Resources/Textures/Markers/jobs.rsi/seniorofficer.png and b/Resources/Textures/Markers/jobs.rsi/seniorofficer.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/seniorphysician.png b/Resources/Textures/Markers/jobs.rsi/seniorphysician.png index 84bdf623dd..ce11a771a5 100644 Binary files a/Resources/Textures/Markers/jobs.rsi/seniorphysician.png and b/Resources/Textures/Markers/jobs.rsi/seniorphysician.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/seniorresearcher.png b/Resources/Textures/Markers/jobs.rsi/seniorresearcher.png index a3fe76d0d7..773a6f124e 100644 Binary files a/Resources/Textures/Markers/jobs.rsi/seniorresearcher.png and b/Resources/Textures/Markers/jobs.rsi/seniorresearcher.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/serviceworker.png b/Resources/Textures/Markers/jobs.rsi/serviceworker.png new file mode 100644 index 0000000000..b10b5ae46c Binary files /dev/null and b/Resources/Textures/Markers/jobs.rsi/serviceworker.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/technicalassistant.png b/Resources/Textures/Markers/jobs.rsi/technicalassistant.png new file mode 100644 index 0000000000..b3156bfe01 Binary files /dev/null and b/Resources/Textures/Markers/jobs.rsi/technicalassistant.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/warden.png b/Resources/Textures/Markers/jobs.rsi/warden.png index 6d577a752e..32b74ed19d 100644 Binary files a/Resources/Textures/Markers/jobs.rsi/warden.png and b/Resources/Textures/Markers/jobs.rsi/warden.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/zookeeper.png b/Resources/Textures/Markers/jobs.rsi/zookeeper.png index 12eb114423..6896973662 100644 Binary files a/Resources/Textures/Markers/jobs.rsi/zookeeper.png and b/Resources/Textures/Markers/jobs.rsi/zookeeper.png differ