From e4caedf0314be0fe25f73e313ea3c3e56303bf4b Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Thu, 16 Jun 2022 03:28:38 -0600 Subject: [PATCH] Station Specific Jobs: Reporter and Psychologist (#8865) * Update jobs.yml * Add files via upload * id moment * Update identification_cards.yml * Update pda.yml * Add files via upload * psych * roleyml psych * real * Update jumpsuits.yml * Add files via upload * Add files via upload * Add files via upload * Update jobs.yml * Update meta.json * Update meta.json * Update meta.json * Update bagel.yml * Update marathon.yml * job iconz * Update meta.json --- .../Entities/Clothing/Uniforms/jumpsuits.yml | 31 +++++++++++++++++ .../Entities/Markers/Spawners/jobs.yml | 28 ++++++++++++++- .../Entities/Objects/Devices/pda.yml | 32 +++++++++++++++++- .../Objects/Misc/identification_cards.yml | 22 ++++++++++++ Resources/Prototypes/Maps/bagel.yml | 1 + Resources/Prototypes/Maps/marathon.yml | 1 + .../Roles/Jobs/Civilian/reporter.yml | 24 +++++++++++++ .../Roles/Jobs/Medical/psychologist.yml | 25 ++++++++++++++ .../journalist.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 1113 bytes .../Uniforms/Jumpsuit/journalist.rsi/icon.png | Bin 0 -> 402 bytes .../Jumpsuit/journalist.rsi/inhand-left.png | Bin 0 -> 524 bytes .../Jumpsuit/journalist.rsi/inhand-right.png | Bin 0 -> 529 bytes .../Jumpsuit/journalist.rsi/meta.json | 26 ++++++++++++++ .../equipped-INNERCLOTHING.png | Bin 0 -> 1134 bytes .../Jumpsuit/psychologist.rsi/icon.png | Bin 0 -> 385 bytes .../Jumpsuit/psychologist.rsi/inhand-left.png | Bin 0 -> 516 bytes .../psychologist.rsi/inhand-right.png | Bin 0 -> 545 bytes .../Jumpsuit/psychologist.rsi/meta.json | 26 ++++++++++++++ .../reporter.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 979 bytes .../Uniforms/Jumpsuit/reporter.rsi/icon.png | Bin 0 -> 383 bytes .../Jumpsuit/reporter.rsi/inhand-left.png | Bin 0 -> 501 bytes .../Jumpsuit/reporter.rsi/inhand-right.png | Bin 0 -> 501 bytes .../Uniforms/Jumpsuit/reporter.rsi/meta.json | 26 ++++++++++++++ .../Misc/job_icons.rsi/Psychologist.png | Bin 0 -> 154 bytes .../Interface/Misc/job_icons.rsi/Reporter.png | Bin 0 -> 163 bytes .../Interface/Misc/job_icons.rsi/meta.json | 6 ++++ Resources/Textures/Markers/jobs.rsi/meta.json | 3 ++ .../Textures/Markers/jobs.rsi/reporter.png | Bin 0 -> 881 bytes .../Objects/Devices/pda.rsi/meta.json | 3 ++ .../Objects/Devices/pda.rsi/pda-reporter.png | Bin 0 -> 466 bytes .../Misc/id_cards.rsi/idpsychologist.png | Bin 0 -> 213 bytes .../Objects/Misc/id_cards.rsi/idreporter.png | Bin 0 -> 190 bytes .../Objects/Misc/id_cards.rsi/meta.json | 6 ++++ 33 files changed, 258 insertions(+), 2 deletions(-) create mode 100644 Resources/Prototypes/Roles/Jobs/Civilian/reporter.yml create mode 100644 Resources/Prototypes/Roles/Jobs/Medical/psychologist.yml create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/meta.json create mode 100644 Resources/Textures/Interface/Misc/job_icons.rsi/Psychologist.png create mode 100644 Resources/Textures/Interface/Misc/job_icons.rsi/Reporter.png create mode 100644 Resources/Textures/Markers/jobs.rsi/reporter.png create mode 100644 Resources/Textures/Objects/Devices/pda.rsi/pda-reporter.png create mode 100644 Resources/Textures/Objects/Misc/id_cards.rsi/idpsychologist.png create mode 100644 Resources/Textures/Objects/Misc/id_cards.rsi/idreporter.png 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 0000000000000000000000000000000000000000..379ca3bce8d09ee894610c94fa05c97dfe1e59d5 GIT binary patch literal 1113 zcmV-f1g86mP)j57oe|DAH#f4szrVorhlhvJ@$s>{etLRZkcvQlV0(MJNPm8QF0NDgqXhu@+S;1j z-roLtw!XeDcXxMkbadq2t3m|wcRC$eSy}l}Xo%74^<*#@B=biJK=RAWOLu>Aa^h+o zUVt<1udlD&^V8GQ(nY}cHa9n2!3h-l?d?rAHa6Tnp5cH%{}IhURRFF0`T4n18bGb< zGen>Pc)u(WLWL)mmX>~{;XS-Bks?HSfOb2!Jrwxy@o~h01NwQHi2XjFhr}9(i2|_p z`ElQKo;=Z-HUX-2b*HOV5$dzbyg;8y_deH%jgLYOLm??UhI@9wN? zm}!0fO7*WamF^Aj8ocL1E~m2!}+sjLG~~R)HxJ}xN@f5NdkmsR#h&6)xke^ zonYB$1(1fL6+jw}Rsd-@S^=ctXa$glqZPoCiR{R3334xtFd%J7{HBERRSDbh6gunpiQ+1z*roB)!0zHzG~15!Oaz6*yKlvV~{KW zNOfG!8j;BX3lDAz0Glk!<4FRnuCBWFrh8e=398r|G!F0pt_1tGz{V6L2>^xtA!b~# zvTAVb*MMz%dwWTnGLkG06*MO(k%MuZsg;rRHr!56G;pnh5_QA~7?9=tBzt0z92fz~ z?(VKL07DSkoWFIo4scrzIzQUOh;hnyk{hoMNuy8D+t{Qg=&f+*2e3WHQg|S%_xg*@ zFJuF^&6x6AGjawt3&^p>EP!_ZzXG?#=Il){3or}rPvqE=wMS?ckn4da0qX4WtF~cw f{P>U1cme(as>o#Jt9I8Y00000NkvXXu0mjfvY!0l literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..70f76a475b36bd01fc6f4b6286a73e9a58d53e7d GIT binary patch literal 402 zcmV;D0d4+?P)Px$Oi4sRR9J=WlrfHkFbqY1R+fuIq8ex^IKrHOD{yaWH&Zd)3>8I+D3Z4V!K^f! zu)D=dc}++h#ozuGK%r15WKh?&)^)8Sq5z<(000ruHJ1D4M^18UEyi(#b8btns&LL> z97kAdaYjT^^0sYNM0A=a?Yd4yL{$|cqFvYNG)*cZ+O}<0Cn)8TwH8E#VHglX0021W z4r|}{U}g{zthLF-C0Rg3U}nto3}yy1qwjm%?{{4j@8d*Cb)^dcfO(z|duGPv;0`|lh5o6ri96~^hG548`Bnyl&TSeY` zc<&GK{aI?|E7={Ws_I|?Gvji(AcTNrS+YeW58+>t-GQ~rmE5WSv4D3!nb+A!;gkhL w1R{d>e)~Sl=^0p-1<&WxyjoHy6bk>2PXVryXCBL2+W-In07*qoM6N<$g0bVNKmY&$ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..2e94292ad3ac5a637f5e8bb85bfcca312f66eabb GIT binary patch literal 524 zcmV+n0`vWeP)Px$#z{m$RCt{2*|CnJFcbyQ%L=(L5*2n!L6tgRkT1^{(B@H7MpP*%BBZy)$kAlA z8O-2`*4lfdNC}{eWBf?O1Bi%-h=_=Yh=_4^T&iip~+p37@IF8zN-Q%i>h<074<2b5_ zXxp|LbH!5Utts{f91aJarU^~c008dyJI?1bPNx%$F#v$D|8lt$Me+41Q|GPOT>{fI zJ$*LD;CMVf2K(x`cjc|wJptG2wE#Y@)Zc{d;kb9_tts~g6h#5&9B#K80HCgG03QPl z+rn`%HJdtb&F%>Z>bibfrp6dFP4hJHE%ll@@0Hypkh^3nU|AL{%K`wf)?%LLe=6^l zq${8-OO$1ad7dBde=_g$zr^p}4|W&PmJ`R+?A9-`_dby1rzEA+6G}uxL_|bHMD(ZZ zo+zY#V3OriVeh?q?{yf4r`Z^WLBqb-tn4NryY6vnTe`h5u}*4Vpj=^n?(ZUTas?s1IlN+7jtS3s)nan>s!bvK&mKlB^C4xj1`_uM1^ O0000Px$%Sl8*RCt{2*)fa4Fcb&ye~yx&g-%V@4xOC+1b%WqL08kcqjYlUAcc3s5jkx= z61}sA`~RSzNes_Nl0qIpL_|bHL_|bH^uLJ+j4@)25$BwU2>j!m6W{0C){N6Xq46&H zxNWf3N}lIv+ZIJpKmY*%0i-Ajv~7z#&ta`y@81JZNqhAhi4j^pL?J9{MF*(Q!T*w#1$o;i4bHQsl40}v4r z5fKp)5j`U4isapIiJlRBD{QS5Yprx$ca@E<>%{i~>D?3sB_NfG@t;YpVjLrA!=_d- zjuEs4QmYup2ueU|72_B|rJmF(#xbI5U8z-!L$Ep=GdQ)1afs*@kXpruNy00000NkvXXu0mjfJ~;5{ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..2b83e342169df98c7952215daacdcfd38e3fb746 GIT binary patch literal 1134 zcmV-!1d;oRP)Px(C`m*?RCt{2nlW$UNEn9SoKEX45aTqEq{-$FY}(sUY^0Nta<%+~Y!PYNbgo>b za~mnCXdF@b2c$}47gS`6)kzTnDliQWa1x=|*u6V7;<-+M?xB#@w~4;W`banS$$qE7K`!yFbw0e ztbXdsj^nU$xeNf<-ri0a=tmLStrh^l^E@R%5cO|vZZH~+;_q^~9FC5T)ag5p!@e^% z^C5)Hy)XV!D)pPqrh0uY-fT7*FOSD#HXe@|AtWwyVQy+wCU~3tvnT*!y|ntjrK!|z zwcvSPTz+F1cw-m<5SPUvz{{(|^E~*zzp#$)`?1foEDQi2ce0Ioo`-U|jAeVlw0;t_uQ|QmU;TS@7^Wqh}W|E3j@$-G*Bv)&}cN$ zxn1(PH0|u|?ai$#-d~me3}Qn1&KUE3KaqS^o&D$O`@Ww@cKqY}ekT3jvzlqQTG-jy zQIhZ$(eL+H+Me`;VRLhn6^lg_3I!Y<9^&@)7QJ2%VHl#{?<<=Ha&6$}EKr>NiPy3o zq$(3ap6z0fkB`cNKnP)`X~x%46k+;WR$qDuOwYmpX-=++D2fuA#;^HER_#nV;OXgU zrp%3~#x%{u%kr{mnuwxEy1i60!FllRmPK?K48w@KJ@4+OX=eTbG6&%Qf)0S}1LF8k zbAQ#WT3@~`3cFntx3*BNR*}!=@qT|F0Py#42-kIGo6E%KPoMC|hYtXNd_IqAwTk!q z`v|*T>9(ZT1jRLZer5*%{`_@DXB~)IqK7P-Bho$K>goyy2L~7o1^|GscXx3wST|qq z?f?LT!2s8;iy#ORTV-j;v@BjKl>h*hN(Gb21OV{Yw{KaR$^_S%OeUyQDhW?Y;h9&w zSF6=nr_+hg3#j(M&m?p@9agK=5_o0M@lDtV(;S z0PwE&QbbX-bP!(s5XhVa#p`t^z<-+$jpjeh4?PxM@Ln%Z7XSbN07*qoM6N<$f{*MP A&j0`b literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e6d91f6afbab78b2c56fff04c4b2cdb532f7c4bd GIT binary patch literal 385 zcmV-{0e=38P)Px$J4r-AR9J=WlrfHjFc3w*SF6wOEw|t{9Ds9BQg8`M>f9n#WGJCB5(P9& zn%J97R$9-BRO>HU8pCJijTr!(oSgo<1jk%e75Tmo04R#WJlix40l=~>D9e(SlT}bkb-%GSpM5JEtRue|yl zcU|{w|L8vy005o`d+2*4Nx~YqpJa_nM98v?#&JX($B3c`d7k5ZK4Y3D=Px$zDYzuRCt{2*)eXyKoAAczfmL_BwS%pg_c`z1};Gl=U7rva0$-95$K>nhSF49 zP(Z_^0uhqf-t1tq%74;I2wR_Jz=OpAL_|bHL_|bHME{D>2(i{mv)Kdy42Q#O=4>_- z05}{D7>~!5UrRghp{%u%Wtn7ICdcDZTCLV~okgz4thFK{g;^rvl~>bSEOr)=`*qpu z{Spxr6+uM2^FqCb2E0!u0D!?@fVXb<%kkZIi}`#G02qx%wda+22~LPyZ~-=(jn{d` z6!$LQyimafm`P0Kjs&ygt5F_URjAJ~heEyefhdLl~E}`k|d?SN6xv*1<=eZqjm|TX^PY71ORZ( zAxRPdK%>z>p6A|QSM9u?1UJF^jX3Af>2%( zwW$7S5fK<;;+h_7igJ3a$#;5OB~x`WR0p5waTS~nKYIhdw5P|>6+nA>990kSogP=p zRM=Oow5P{W7C>`)9MvUoOKW-@T@%!v9!FPz?{IodzxM%wcIU!5a*x>n0000Px$+et)0RCt{2+A)rTKokbxpUoyVCQ?bP*4A5i1}|Z+=NPxL@DiTEBiLzUz!Iw| zEVS`$1#y9u8G*&w{lA37j5FlT69zI*fQX2Qh=_=Yi2fI^s8J~;-EJ2EFr7}*KC9JA z0N{K+V?Li3j%`D&@hYVx3_}USP%f8?^m@JYxQV3SDW#-|$=DE)`s2NcNcKohmOVt; z&4Gwm#anca_iV%GVgUe{OeXjk4s!#JQH1q+4FH(UW_8ZzDK_yId8-;g+gCwVxda>z z2cvI7Scz==b{=kH^?-HaMM5NZNP1o!52(>WH^60lx2-u54QCmq|dCcz?VF zf*`>4dQAqy_k93Br_(_k$E{!fS*p@v zTD(L=L_|bHL`1*p;m(POq+3p|Rg7yPBF$7_U6CZfrHZkwhn1m(YZYS~4|j!MZSTJc zM%&`H6yUGLH6i(q@O`#DFNV12MY z8HeSaVkz8~)nD2Gh?h^Dr_tfJ;P=Ma%U<*t?Dz3>n85l>XBLN`%Sh=jWk6K??)`g2 z{^xn~COzrD56ZX&=rAFw&pOl5FDjHz%$3XNFEk)3j_r$AZ_~loPr>hMwMuIju2J+D z%E*Mc$}d7jf9Xd6O}|j7%{eZDJ2D*(NH*aAsh?^<^ts2y5dg|?*Vp|r@$O?k2b)DJ zh|>pgCUE6t^%u4PTo~X&2#B9M2z34m#U7U>eBG>$V-_1Qb2Sb$NtN?t7zw?-j`LCt zSk!#@k&r!aSyZo+`7oG7S_{xcQYVOVl~yNhfGCo*trH#%Kv3yfU!$roZ2-i>-Z)`f zC*r6e-gU8D26+Q~QErCA{avcm8{s|^2H=kK$TL3PpBsf_QSJjEn9Jv5Uq^Mq&Hndf zMBa29n2;})&Gi9*UpmAw*Q5yml@IlO15|PI0c1Jy!(c*Zll7~wDOP$9NGsDt+)xL7 zBkuumub4Wgz)a}7K7cI889!-S#y@VGY5{l@8N_h(&H%C;Wdp?F z#$*R5Y8L&`0G+Vva$2BdfXOuhX=D+Hdj!aG{s7pb3$H#JT1o%_002ovPDHLkV1nf; ByGH;3 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..f7ab944b202bea2fcbc9f747bfbe0d3640ce4b17 GIT binary patch literal 383 zcmV-_0f7FAP)Px$IY~r8R9J=Wl+8-RKomyLB$Cj?R*;euL}3l?FNAR>l^N#9|2fIYnmEe6PAuhEv({2w8ry1 z06fq8QvADq5Cc$kRTkN=nzG31EgICo+tY&pDDxDkI-G?o0A}H;?pWoOUI#6ql+}4V z46474%C1hgL_ zMYHR+cvJ(n>(|BF;&BZ)llm6q?+NZjQ0GoDaPk=_iwt2|e?Cs57*KaUO?INp)7~Zw d27}>W`2?e?e8N@r*_Z$T002ovPDHLkV1gi5s=ELH literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..5f606fcde336b80cb872017a56690a47468acf45 GIT binary patch literal 501 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z*L%7+hE&XX zdowV*DM5to!F5SD%VwvX3%yt0>isVMD_DQ;R<5$d8kI>WZ=NmLn)=G->AsJ4;fp?& zS=7yMWmiywfU%t!;ha~g4*xNkG}{c18rpp*p|Na^C^=!#^+oaMeSRF%sRG|ed05LN2v@9 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..aa2058812db5a204e42a73eb39bca13b6197108e GIT binary patch literal 501 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z*L%7+hE&XX zd-H78AqNrG2b0~DX1N78>Fns-_4d;A&#s>;wnldctY9-Vxue&$(oEQT@)nigbK9jp z8PD@cbNk5T0s|iwNBq&4rsDbJQ^h2eBD?EhW>eKFt5==dqu{dbJ|n}m$&oM9^f?$E z_-^+;w(xt*o^ePe|JSEK#Wy|{sXl({1=L$xH35jeri5+zt1<1fsnT12mdSfo{q{Ci zxc&aYx7rHFj`p9*_qO>nG(0TmxLCrd&oMFG{mJq#{qny4m-m#fYJT3mSK&y;E{29h zn@@j^y{M9(>D$5aZh3LxZ@ZZM4>ujl_GCR@F4F$?7-Pe>?+ie**DRG>uxmwj{-2=B zdzRWRST)(kI!-qK_u2Yz^Zcg_J8Jju*tzPiYU$@N{s!}g*SuY(C0mc}vS2X%9LC4+ zVQb?Tzx5USe=JzHYI68b-GoJN_a0DLul4$@|`V BG-v<- literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..679f8d4490e2544a5c0cc6d119d00b3339963a86 GIT binary patch literal 163 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqjKx9jP7LeL$-D$|Vm)0PLnNjq zrz9jKtho8^*L+6qjE{HDo`~3d_v`*mGY!lt+jcL%XJnwrt-_(3?jaD>x2S_Na#CYs zW8%Tx9wM$9Y6{vdjA9bWK;D{n2?v*Pvt>!%k&uv-_)sm(U^!i4L*`raT|kQ%JYD@< J);T3K0RZ$dHwFLz literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..7bb31e77af8efe53f95e8ab5ac22be0c006bb18f GIT binary patch literal 881 zcmV-%1CIQOP)Px&D@jB_R9J=8mceTqM-;|?Yt~z5*R`;+yGd*sD2)RFLnywwhCSxm#{WPrJ^K)7 z$iehhoT~^iAt9GSz^X4fR5uaT7h?oXDDW$M^klq3LijwF8jwd6$Ty2!L9xR#-%Cx)ix>+c=Ix zuP3Kby9^0x&Z(qkYsffX0Ij5zNZtdEwfPTmd6X@WXdE z0SL<_g4vQL_I+R1-f>X)_nbB!YzTla zZrrrOFwE`hIF7BK9^TP=ENe7{(cBh7@`hokkLCN2rYUh855&w9FxG8o+cvgslcuTu zKQ4>}SeEs#H&L^}^tgSHfYZcS0*1%$@cL8*{8zol?SsO*-dFSfiz=_{hhgl!U9IXF zu)MqsKzRPV6?ZxUU}tAX`+j--df|`Lk+@f>2qA=sI~}pNyDPScSam@Pq`oOcFpFanna`*1Qx+wkuaW_y&KJqLo00000NkvXX Hu0mjfnM|r* literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..d932722546dfc1b10f89718e9dccbef75207da67 GIT binary patch literal 466 zcmV;@0WJQCP)Px$j7da6R9J=Wm9b01KorJ*5i58}MWu9g6Vjoh=qhw_b@gA!q)VNhbaHa&mQnK; zbg7FD-5dF zw2#MQTe{)`R@SOUTM&eW1z7)vuj99TP1`iWFeohGS1X`f;5c1e7n0-`1uRu6Mw@Pd zQZ3Rn0j`a_g(qS5;bm(Yx&>JUZmsyN1#E6KfvoJ+RWC39^V2Yo(JfG_g_Jv1yjGLY zW)MlagAiUu>U04Z4Bm<3_}d&-6;P@L>;k)VI+rv1^lfzoOhd?8K=1ktAv~g}O%Q}L zyAWP}dkrZ^Hq^$~N;Mk$0Qo~>f=+yYe`S^9-=E_WB}$a|00CW_P+&b+a{vGU07*qo IM6N<$f>{*Hga7~l literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..038a5321d4ba7c52b1182f77236698ab07f0684f GIT binary patch literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}{hlt4ArY;~ z2@ZOO4Ng z&D&^BV8$+Mg|uUFBD3D{Em-z6#kyfuLu*9qjYoG@<{2L4llYKh!PUX#wD`xW|7rgW zRU~V&9t*V|N6L7>wZJYD@<);T3K F0RS8=Ou_&F literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e4ea4f958825d674067156d780ea616406d14262 GIT binary patch literal 190 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}6`n4RArY;~ z2@*qxWN%-VyX!k`-@PdwdLStT8CZfF%bI#FHIulR{I!|d~S*9W~@z<9oGal@h}4ta%b6BcRk mK44z_G8t$^paEA0E5n`(@+Yh`gr5T4z~JfX=d#Wzp$PzmV@3b~ literal 0 HcmV?d00001 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" },