diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 056112c18a..379666a410 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -768,4 +768,35 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/atmos.rsi +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitPsychologist + name: psychologist suit + description: I don't lose things. I place things in locations which later elude me. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/psychologist.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/psychologist.rsi +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitReporter + name: reporter suit + description: A good reporter remains a skeptic all their life. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/reporter.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/reporter.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitJournalist + name: journalist suit + description: If journalism is good, it is controversial, by nature. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/journalist.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/journalist.rsi diff --git a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml index 4d9bd34f4a..07f495c5f3 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml @@ -466,4 +466,30 @@ - type: Sprite layers: - state: green - - state: ertjanitor \ No newline at end of file + - state: ertjanitor + +# STATION SPECIFIC + +- type: entity + id: SpawnPointReporter + parent: SpawnPointJobBase + name: reporter + components: + - type: SpawnPoint + job_id: Reporter + - type: Sprite + layers: + - state: green + - state: reporter + +- type: entity + id: SpawnPointPsychologist + parent: SpawnPointJobBase + name: psychologist + components: + - type: SpawnPoint + job_id: Psychologist + - type: Sprite + layers: + - state: green + - state: psychologist diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 81b4f41fde..734fa7a6ea 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -630,4 +630,34 @@ description: Red for firepower. components: - type: PDA - id: ERTLeaderIDCard \ No newline at end of file + id: ERTLeaderIDCard + +- type: entity + parent: BasePDA + id: PsychologistPDA + name: psychologist PDA + description: Looks immaculately cleaned. + components: + - type: PDA + id: PsychologistIDCard + - type: Appearance + visuals: + - type: PDAVisualizer + state: pda-medical + - type: Icon + state: pda-medical + +- type: entity + parent: BasePDA + id: ReporterPDA + name: reporter PDA + description: Smells like freshly printed press. + components: + - type: PDA + id: ReporterIDCard + - type: Appearance + visuals: + - type: PDAVisualizer + state: pda-reporter + - type: Icon + state: pda-reporter diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index c05852d842..130dfba0b1 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -483,3 +483,25 @@ - type: Sprite layers: - state: syndie + +- type: entity + parent: IDCardStandard + id: PsychologistIDCard + name: psychologist ID card + components: + - type: Sprite + layers: + - state: idpsychologist + - type: PresetIdCard + job: Psychologist + +- type: entity + parent: IDCardStandard + id: ReporterIDCard + name: reporter ID card + components: + - type: Sprite + layers: + - state: idreporter + - type: PresetIdCard + job: Reporter diff --git a/Resources/Prototypes/Maps/bagel.yml b/Resources/Prototypes/Maps/bagel.yml index bfaed22f58..7acd299262 100644 --- a/Resources/Prototypes/Maps/bagel.yml +++ b/Resources/Prototypes/Maps/bagel.yml @@ -43,3 +43,4 @@ MedicalIntern: [ 2, 2 ] ServiceWorker: [ 2, 2 ] SecurityCadet: [ 2, 2 ] + Reporter: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/marathon.yml b/Resources/Prototypes/Maps/marathon.yml index 45adb69555..295f157bff 100644 --- a/Resources/Prototypes/Maps/marathon.yml +++ b/Resources/Prototypes/Maps/marathon.yml @@ -44,3 +44,4 @@ MedicalIntern: [ 2, 2 ] ServiceWorker: [ 2, 2 ] SecurityCadet: [ 2, 2 ] + Psychologist: [ 1, 1 ] diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/reporter.yml b/Resources/Prototypes/Roles/Jobs/Civilian/reporter.yml new file mode 100644 index 0000000000..9e7832e528 --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Civilian/reporter.yml @@ -0,0 +1,24 @@ +- type: job + id: Reporter + name: "reporter" + startingGear: ReporterGear + departments: + - Civilian + icon: "Reporter" + supervisors: "the head of personnel" + access: + - Service + - Maintenance + +- type: startingGear + id: ReporterGear + equipment: + head: ClothingHeadHatTophat + jumpsuit: ClothingUniformJumpsuitReporter + back: ClothingBackpackFilled + shoes: ClothingShoesColorWhite + id: ReporterPDA + ears: ClothingHeadsetService + innerclothingskirt: ClothingUniformJumpsuitJournalist + satchel: ClothingBackpackSatchelFilled + duffelbag: ClothingBackpackDuffelFilled \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Medical/psychologist.yml b/Resources/Prototypes/Roles/Jobs/Medical/psychologist.yml new file mode 100644 index 0000000000..f44112e487 --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Medical/psychologist.yml @@ -0,0 +1,25 @@ +- type: job + id: Psychologist + name: "psychologist" + startingGear: PsychologistGear + departments: + - Medical + icon: "Psychologist" + supervisors: "the chief medical officer" + access: + - Medical + - Maintenance + extendedAccess: + - Chemistry + +- type: startingGear + id: PsychologistGear + equipment: + jumpsuit: ClothingUniformJumpsuitPsychologist + back: ClothingBackpackMedicalFilled + shoes: ClothingShoesLeather + id: PsychologistPDA + ears: ClothingHeadsetMedical + innerclothingskirt: ClothingUniformJumpsuitPsychologist + satchel: ClothingBackpackSatchelMedicalFilled + duffelbag: ClothingBackpackDuffelMedicalFilled \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..379ca3bce8 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/icon.png new file mode 100644 index 0000000000..70f76a475b Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/inhand-left.png new file mode 100644 index 0000000000..2e94292ad3 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/inhand-right.png new file mode 100644 index 0000000000..acf07a848d Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/meta.json new file mode 100644 index 0000000000..d3528b0c8d --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/78a56e1a22ba1d8d6023ed9bdae55a6de7fe8a39 and modified by emisse", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..2b83e34216 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/icon.png new file mode 100644 index 0000000000..e6d91f6afb Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/inhand-left.png new file mode 100644 index 0000000000..3d5d498bba Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/inhand-right.png new file mode 100644 index 0000000000..73e19be658 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/meta.json new file mode 100644 index 0000000000..d3528b0c8d --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/78a56e1a22ba1d8d6023ed9bdae55a6de7fe8a39 and modified by emisse", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..88f006a555 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/icon.png new file mode 100644 index 0000000000..f7ab944b20 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/inhand-left.png new file mode 100644 index 0000000000..5f606fcde3 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/inhand-right.png new file mode 100644 index 0000000000..aa2058812d Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/meta.json new file mode 100644 index 0000000000..d3528b0c8d --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/78a56e1a22ba1d8d6023ed9bdae55a6de7fe8a39 and modified by emisse", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Psychologist.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Psychologist.png new file mode 100644 index 0000000000..f3362ed041 Binary files /dev/null and b/Resources/Textures/Interface/Misc/job_icons.rsi/Psychologist.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Reporter.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Reporter.png new file mode 100644 index 0000000000..679f8d4490 Binary files /dev/null and b/Resources/Textures/Interface/Misc/job_icons.rsi/Reporter.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 de4ba7caf8..6cd0776d09 100644 --- a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json @@ -112,6 +112,12 @@ { "name": "Musician" }, + { + "name": "Reporter" + }, + { + "name": "Psychologist" + }, { "name": "MedicalIntern" }, diff --git a/Resources/Textures/Markers/jobs.rsi/meta.json b/Resources/Textures/Markers/jobs.rsi/meta.json index ea50a4cd64..50d5328c7d 100644 --- a/Resources/Textures/Markers/jobs.rsi/meta.json +++ b/Resources/Textures/Markers/jobs.rsi/meta.json @@ -112,6 +112,9 @@ { "name": "mime" }, + { + "name": "reporter" + }, { "name": "paramedic" }, diff --git a/Resources/Textures/Markers/jobs.rsi/reporter.png b/Resources/Textures/Markers/jobs.rsi/reporter.png new file mode 100644 index 0000000000..7bb31e77af Binary files /dev/null and b/Resources/Textures/Markers/jobs.rsi/reporter.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/Objects/Devices/pda.rsi/meta.json index f92f0672ed..dc89c59d69 100644 --- a/Resources/Textures/Objects/Devices/pda.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/pda.rsi/meta.json @@ -145,6 +145,9 @@ { "name": "pda-musician" }, + { + "name": "pda-reporter" + }, { "name": "pda-interncadet" }, diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-reporter.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-reporter.png new file mode 100644 index 0000000000..d932722546 Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/pda-reporter.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idpsychologist.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idpsychologist.png new file mode 100644 index 0000000000..038a5321d4 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/idpsychologist.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idreporter.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idreporter.png new file mode 100644 index 0000000000..e4ea4f9588 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/idreporter.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json index 49ae5369fa..185ea7fa83 100644 --- a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json @@ -103,6 +103,12 @@ { "name": "idparamedic" }, + { + "name": "idpsychologist" + }, + { + "name": "idreporter" + }, { "name": "idprisoner" },