From 2e491e91b5d9f7359792db71b167c503f3c053e8 Mon Sep 17 00:00:00 2001 From: TadJohnson00 Date: Sun, 19 Jan 2025 18:31:23 +1100 Subject: [PATCH] sec jobicon visibility ops --- Resources/Prototypes/StatusIcon/job.yml | 2 +- .../Interface/Misc/job_icons.rsi/Prisoner.png | Bin 0 -> 529 bytes .../Misc/job_icons.rsi/SecurityOfficer.png | Bin 554 -> 534 bytes .../_DV/Interface/Misc/job_icons.rsi/Warden.png | Bin 531 -> 544 bytes .../_DV/Interface/Misc/job_icons.rsi/meta.json | 5 ++++- .../Misc/job_icons.rsi/nyanoPrisonGuard.png | Bin 534 -> 530 bytes .../Misc/id_cards.rsi/idsecurityofficer.png | Bin 638 -> 608 bytes .../_DV/Objects/Misc/id_cards.rsi/idwarden.png | Bin 606 -> 631 bytes .../_DV/Objects/Misc/id_cards.rsi/meta.json | 2 +- .../Objects/Misc/id_cards.rsi/nyanoprisoner.png | Bin 211 -> 608 bytes .../Misc/id_cards.rsi/nyanoprisonguard.png | Bin 608 -> 606 bytes 11 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 Resources/Textures/_DV/Interface/Misc/job_icons.rsi/Prisoner.png diff --git a/Resources/Prototypes/StatusIcon/job.yml b/Resources/Prototypes/StatusIcon/job.yml index 4cecbc99e41..9299673b6c7 100644 --- a/Resources/Prototypes/StatusIcon/job.yml +++ b/Resources/Prototypes/StatusIcon/job.yml @@ -73,7 +73,7 @@ parent: JobIcon id: JobIconPrisoner icon: - sprite: /Textures/Interface/Misc/job_icons.rsi + sprite: /Textures/_DV/Interface/Misc/job_icons.rsi # DeltaV - resprite prisoner jobicon state: Prisoner jobName: job-name-prisoner diff --git a/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/Prisoner.png b/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/Prisoner.png new file mode 100644 index 0000000000000000000000000000000000000000..cf2b09f453098a27ff2f314073c77634451c1144 GIT binary patch literal 529 zcmV+s0`C2ZP)-gRALxTx9;@C_2rF^fCIN#e|wV+r0P9%W^@ zNPI#Z<8(mcTcIl+zX>jR{3V#@vkQP<^pr{+taLCdbAx!AIBMus);f>4Nk}zUa+Jqu zO~6JLX`~=QK^2?O;UG@gq?vX1C7QlvRLH|;9g)ZsQCHya3l`+h3tM&3}_#Z)?$GAiM)y-n2F4 z0Jz!(#-1&i%S|aj%dcs`#|1D_03!Fm(7HFP)_njhPZ!4!3CZLX1}0O}t^XCIWbf=M?Vc#8qN$_PrpNwlf9>zCMpm`r zH#ZU`gngnTZ#HGBi3IA%JQ6+7!y?&qrfoN4EK{1aa!2F&*$f$Zg41^FRPkc~0#8>z Jmvv4FO#tNXCF%eG delta 125 zcmV-@0D}LP1gZqEwE=ZtNklpFJqFftdy2C0GpOG}&oAPfUUnZSf>rj?Z~0|+AnMwlbf?FT7*`}P$BBSih?+n zkxDRs;qHC-=6xS`?*M;BXNKLE01VUN*>p-;Ev!kwclZ#&fY@bbTT8jcJbK2@Bh^tn z#6_>(bzNh)sM-wh4HC~Wi#x?y~3Em?fWo5ZYd_o-KbU@-;p(`H02`+j3C79>4 z3xHqrlu8|}bTBJ(gLs-aYUowgI*+(XNHte~a+JquO~6JLX`~=QK^2?O;UG@gq?vX1 zC7QlvRLH|;9g)ZsQCHya3l`+h3tM&3}_#Z)?$GAiM)y-n2F40Jz!(#-1&i%S|aj%dcs`#|1DX zQUD_Nz|guktJZ&i>afUF%R0TW{ZG0+8Jk|3H9MBwu#0DG$~zKWVs>;M1&07*qoM6N<$f&}c(8UO$Q delta 441 zcmV;q0Y?6y1d{}iBqnfaLqkw$V`BgSD3NuMze~eF6vw}9m5Np>*g?c0Ln{s~6a{gV zkxDRs$K`$a=6xS`?*M;BXNKLE1Ps&R*>p-;Ev!kwcla7Y-=gEm`Bg}d8BHJ zhlJ?WyRK^t6;+!7z5(J{W^spjo;b7RSc3P6BdjbJiBE{*oDN8QD|E%HlUl@4ZQZV*oqM-9EoTIUfr3906PN{;e4?Frb(B8?OzD5zo+IvgY@n>4fT zzGTz4j0$-eeJ#|$$x%X?ym3;i)K#Udk*?CxQ4@3jKTlhmnfAJeQb7N!>wd<7;6Bi( zyYBC)>o(4Szzc9~w*3{F)7&@d^|ls02EseQnFx!jZjwEda}d|Ut} z!v$dU9vEErX4U$S^Cuv`O;21M-n*1i;}fW0RZ#7+y(9L_t&-8DnGs z0yQ!aY-o)00000NkvXXu0mjf(ptq* diff --git a/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/meta.json index 3780cba0394..ca21f0803d4 100644 --- a/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/_DV/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), SecurityBorg recoloured from MedicalBorg by DangerRevolution(github), CargoAssistant recoloured from MedicalIntern by Radezolid, AdminAssistant made by noctyrnal (github), Surgeon by Janet Blackquill 2024. Security cards modified by TJohnson.", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | SecurityOfficer, nyanoMartialArtist, nyanoGladiator made by Floofers | ChiefJustice, Clerk by leonardo_dabepis (Discord), SecurityBorg recoloured from MedicalBorg by DangerRevolution(github), CargoAssistant recoloured from MedicalIntern by Radezolid, AdminAssistant made by noctyrnal (github), Surgeon by Janet Blackquill 2024. Security cards modified by TJohnson.", "size": { "x": 8, "y": 8 @@ -69,6 +69,9 @@ }, { "name": "SeniorOfficer" + }, + { + "name": "Prisoner" } ] } diff --git a/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/nyanoPrisonGuard.png b/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/nyanoPrisonGuard.png index 4f4ec66fbe7fa8ee90ca9723e86ce1021952e4ad..0e7c51ff1ddadc1abfdb469e32e0ee2ee134ac1f 100644 GIT binary patch delta 440 zcmV;p0Z0Cp1d;@hBqncZLqkw$V`BgSD3NuMze~eF6vw}9)rwX+)Ir1{LluV>ih?+n zkxDRs;qHC-=6xS`?*M;BXNKLE01VUN*>p-;Ev!kwclZ#&fY@bbTT8jcJbK2@Bh^tn z#6_>(bzNh)sM-wh4HC~Wi#x?y~3Em?fWo5ZYd_o-KbU@-;p(`H02`+j3C79>4 z3xHqrlu8|}bTBJ(gLs-aYUowgI*+(XNHte~a+JquO~6JLX`~=QK^2?O;UG@gq?vX1 zC7QlvRLH|;9g)ZsQCHya3l`+h3tM&3}_#Z)?$GAiM)y-n2F40Jz!(#-1&i%S|aj%dcs`#|1DX zQUD_Nz|guktJZ&*g?c0Ln{s~6a{gV zkxDRs$K`$a=6xS`?*M;BXNKLE1Ps&R*>p-;Ev!kwcla7Y-=gEm`Bg}d8BHJ zhlJ?WyRK^t6;+!7z5(J{W^spjo;b7RSc3P6BdjbJiBE{*oDN8QD|E%HlUl@4ZQZV*oqM-9EoTIUfr3906PN{;e4?Frb(B8?OzD5zo+IvgY@n>4fT zzGTz4j0$-eeJ#|$$x%X?ym3;i)K#Udk*?CxQ4@3jKTlhmnfAJeQb7N!>wd<7;6Bi( zyYBC)>o(4Szzc9~w*3{F)7&@d^|ls02EseQnFx!jZjwEda}d|Ut} z!v$dU9vEErX4U$S^Cuv`O;21M-n*1i;}fW0RZ#7-39FL_t&-8DnGs z0yQEYL mg3N}y0bK%S8zYE;&zk^fZV{Haxg<^i0000F6XAut*OqaiTTLx7Rk z08mp?`;V^n)~#Da>qplM;}c~7$Z}y}F_<1W{r2rE21*^l0ym8a#<63E;i{~xY~gH5 z7)+FCriR|3s1nw!S&w00000NkvXXu0mjf`rt`2 delta 223 zcmV<503iS11pWlDr~!Wx000XT0n*)m`~Uy|v`IukR9Fe^luZhNAP|M8=mtVZ&^rX3 zKJX5DgupWtvoHn`d1b2_H#+Fddw%{9X;T79KneVvz<>g<)*j{B7$clt=H__JgI3St z#>^B#AlcVUwd&O7AOkYd`%Q-3;|Z<6!ppK=%Q<$=UGdWaY=Bn<-rhaeyk(#yzy*36 zY=Ffj0cobk1pJI@H~x)h*kk@1xzG{hkLb>pQ`!kRBFF#>*X}^e5F*~n*EuDi1eCyk Z2%MVFEZFL&Nyz{J002ovPDHLkV1jrAXH5VA diff --git a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idwarden.png b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idwarden.png index edada474506844278eca4fe3609f093d680a3b62..4221aae0ddc85ba63af04afb78e5e1f45b129bd8 100644 GIT binary patch delta 562 zcmV-20?qy21os4xBqncZLqkw$V`BgSD3NuMze~eF6vw}9)rwX+)Ir1{LluV>ih?+n zkxDRs;qHC-=6xS`?*M;BXNKLE01VUN*>p-;Ev!kwclZ#&fY@bbTT8jcJbK2@Bh^tn z#6_>(bzNh)sM-wh4HC~Wi#x?y~3Em?fWo5ZYd_o-KbU@-;p(`H02`+j3C79>4 z3xHqrlu8|}bTBJ(gLs-aYUowgI*+(XNHte~a+JquO~6JLX`~=QK^2?O;UG@gq?vX1 zC7QlvRLH|;9g)ZsQCHya3l`+h3tM&3}_#Z)?$GAiM)y-n2F40Jz!(#-1&i%S|aj%dcs`#|1Ed zQUD_Nz|guktJZ&Zp#9{p1?@ z1=d4UBZ59skO2`Y^+3%4`=dsOXCy!ZB%leL5dJozc-E||00000NkvXXu0mh|g1Djr AU;qFB delta 536 zcmV+z0_Xkr1l|OYBqnfaLqkw$V`BgSD3NuMze~eF6vw}9m5Np>*g?c0Ln{s~6a{gV zkxDRs$K`$a=6xS`?*M;BXNKLE1Ps&R*>p-;Ev!kwcla7Y-=gEm`Bg}d8BHJ zhlJ?WyRK^t6;+!7z5(J{W^spjo;b7RSc3P6BdjbJiBE{*oDN8QD|E%HlUl@4ZQZV*oqM-9EoTIUfr3906PN{;e4?Frb(B8?OzD5zo+IvgY@n>4fT zzGTz4j0$-eeJ#|$$x%X?ym3;i)K#Udk*?CxQ4@3jKTlhmnfAJeQb7N!>wd<7;6Bi( zyYBC)>o(4Szzc9~w*3{F)7&@d^|ls02EseQnFx!jZjwEda}d|Uv3 z!v$dU9vEErX4U$S^Cuv`O;21M-n*1i;}fV*mgE32;bRa{vGf5&!@T z5&_cPe*6Fc0F+5YK~z`?V_+BsqaiRF0;3@?(nEle*Z@#dQ~Qsu_SUUiMC(V_OA;Ss zIS5!<+Mv+b97U4BK*da?Y8Vjpun+)edmo9Qdk9!r*@6QAMpGj+20RJ|+yO*qBW&?a zw`@p_xE{1-5ETWW;1?DaBgqqQ-@alXCW?r10LW%+X#k&#h_M`>{!zKn5Eu=C(GVCp aApiiAQ$1~=lYY$r0000 2024. Security sprites modified by TJohnson.", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | idsecurityofficer, nyanogladiator, nyanomartialartist made by Floofers, idchiefjustice idclerk and idlawyer made by leonardo_dabepis (Discord), idprosecutor made by Timemaster99 (Discord), idcargoassistant made by Radezolid, idadminassistant by noctyrnal (github), idsurgeon by Janet Blackquill 2024. Security sprites modified by TJohnson.", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/nyanoprisoner.png b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/nyanoprisoner.png index 96c8f4d98256ce8784f67055fdfa004b2aa89c47..33752f69a1779f04dded3267aeebc198e5f64ce3 100644 GIT binary patch delta 584 zcmV-O0=NCs0pJ9XBYy#JX+uL$X=7sm04R}lk-tmBKorNnZPkiaI@CeLAww017K(y6 zmI`*M4s8XiF3B}%g(MA^6e+HPi$lRdbn(~Vf1s=2svro8AmZxkuSH6H*A!Z$ec|qX z_~v~dckcjyMrVfImjDdY;n{RbS}m+e!FTu&!GPFhW?M_S#eY0{#?K?wQ9Q&&uikZC zW4Nf=4DbyS&oPTT#7W}JmSYLtBOYaCxk!9M9OHCA;#;9B9={1LdHf}q=d%ldU-Xnp z9jtUPD|3T*nmB6cRn|I>xJgJgS8|lcX-&XJ7HOm)K|vLp(BU9X*`%3u_a&OXWmL$+ zXtz)UCr1fo@_)uitx{K&vPQZ}pN^WC`~P{`+U$(iJ(L3aUtRZe5(w@Cjk@dpp1N-1 z3<$gc*Jj&ap*hWelU{FY(PJRI16__rTD) zH>=ivoIe5iZF-_R;P42TqWbX0ACo6%*on8L#{d8T34d@%S#tmY3labT3lag+-G2N4 z005UsL_t(o3GI|&3Vpxsfa(H5n4h2jKQ;grXP^X=lm@i4v{2~LTreygz%fW{gM?Puka4s{H0pp+ m2aGyk)B&Ro81W7O2rvM`X?~RLn`xu~0000xL&_U$VM zN*%!hH;o9!v15nfs;sPR;cQA6Oq6J*hTfs&09dfY=m7}xtG5M=hq z21G>xu7U_(&=Ffm5#<1oMcC2+J_k@*LgF)fRBki`MnhmU1cp}#008L&A0@WFIp6>Q O002ovP6b4+LSTZ>5IU#;