From c669e55456d2e4e105d95026b23362cfe77e7007 Mon Sep 17 00:00:00 2001 From: _Svist_ <148935188+Svist666s@users.noreply.github.com> Date: Sat, 19 Sep 2026 12:11:45 +0400 Subject: [PATCH] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B8=20=D0=BD=D0=B5=D0=BC=D0=BD?= =?UTF-8?q?=D0=BE=D0=B3=D0=BE=20=D0=BD=D0=BE=D0=B2=D0=BE=D0=B3=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ghost/roles/ghost-role-component.ftl | 2 +- .../corvax/entities/mobs/player/centcomm.ftl | 2 +- .../objects/misc/identification_cards.ftl | 2 ++ .../Corvax/Entities/Clothing/Eyes/glasses.yml | 11 ++++++-- .../Corvax/Entities/Mobs/Player/Centcomm.yml | 20 +++++++------- .../Objects/Misc/identification_cards.yml | 2 +- .../Markers/jobs.rsi/BlueshieldOfficer.png | Bin 0 -> 1033 bytes .../Corvax/Markers/jobs.rsi/CCChief.png | Bin 0 -> 1276 bytes .../Corvax/Markers/jobs.rsi/CCDiplomat.png | Bin 0 -> 1066 bytes .../Corvax/Markers/jobs.rsi/CCOfficer.png | Bin 0 -> 1057 bytes .../Markers/jobs.rsi/CCRepresentative.png | Bin 0 -> 1203 bytes .../Corvax/Markers/jobs.rsi/meta.json | 26 ++++++++++++++++++ .../Textures/Markers/jobs.rsi/centcom.png | Bin 977 -> 948 bytes 13 files changed, 49 insertions(+), 16 deletions(-) create mode 100644 Resources/Textures/Corvax/Markers/jobs.rsi/BlueshieldOfficer.png create mode 100644 Resources/Textures/Corvax/Markers/jobs.rsi/CCChief.png create mode 100644 Resources/Textures/Corvax/Markers/jobs.rsi/CCDiplomat.png create mode 100644 Resources/Textures/Corvax/Markers/jobs.rsi/CCOfficer.png create mode 100644 Resources/Textures/Corvax/Markers/jobs.rsi/CCRepresentative.png create mode 100644 Resources/Textures/Corvax/Markers/jobs.rsi/meta.json diff --git a/Resources/Locale/ru-RU/ghost/roles/ghost-role-component.ftl b/Resources/Locale/ru-RU/ghost/roles/ghost-role-component.ftl index fd170432aa..03d33227fa 100644 --- a/Resources/Locale/ru-RU/ghost/roles/ghost-role-component.ftl +++ b/Resources/Locale/ru-RU/ghost/roles/ghost-role-component.ftl @@ -186,7 +186,7 @@ ghost-role-information-cburn-agent-name = РХБЗЗ Оперативник ghost-role-information-cburn-agent-description = Высококвалифицированный специалист, способный справиться с любыми угрозами. ghost-role-information-centcom-official-name = Инспектор ЦК -ghost-role-information-centcom-official-description = Вы — обычный бумагомаратель на службе у корпорации. К вашему сожалению или к удовольствию — тут смотрите сами, вас отправили на объект с инспекцией. Возможно проверять как уборщик ставит знаки мокрого пола, а может и разбираться с Командованием — только разбираться, ведь прямых командных полномочий у вас нет. +ghost-role-information-centcom-official-description = Вы — обычный бумагомаратель, клерк на службе у корпорации. К вашему сожалению или к удовольствию — тут смотрите сами, офицер Центрального командования, как ваш непосредственный начальник, выдернул вас с рабочего места, переименовал карту и отправил на объект с инспекцией. Возможно проверять как уборщик ставит знаки мокрого пола, а может и разбираться с Командованием — только разбираться, ведь прямых командных полномочий у вас нет, но за точной целью обратитесь к администратору. ghost-role-information-nukeop-rules = Вы [color={ role-type-team-antagonist-color }][bold]{ role-type-team-antagonist-name }[/bold][/color], в команде с другими Ядерными оперативниками. Помощь агентов на станции не гарантируется. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/mobs/player/centcomm.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/mobs/player/centcomm.ftl index 9783863c29..91ac4e3361 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/mobs/player/centcomm.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/mobs/player/centcomm.ftl @@ -4,7 +4,7 @@ ent-RandomHumanoidSpawnerCentcomRepresentative = Представитель ЦК .desc = { "" } ent-RandomHumanoidSpawnerCentcomStaffChief = Начальник штаба ЦК .desc = { "" } -ent-RandomHumanoidSpawnerCentcomNanoTrasenDiplomat = Дипломат NanoTrasen +ent-RandomHumanoidSpawnerNanoTrasenDiplomat = Дипломат NanoTrasen .desc = { "" } ent-RandomHumanoidSpawnerBlueshieldOfficer = Офицер "Синий Щит" .desc = { "" } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/misc/identification_cards.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/misc/identification_cards.ftl index 19c8b93fc6..c83045ce6a 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/misc/identification_cards.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/misc/identification_cards.ftl @@ -11,4 +11,6 @@ ent-CentcomRepresentativeIDCard = ID-карта представителя ЦК ent-CentcomStaffChiefIDCard = ID-карта начальника штаба ЦК .desc = { ent-IDCardStandard.desc } ent-NanoTrasenDiplomatIDCard = ID-карта дипломата NanoTrasen + .desc = { ent-IDCardStandard.desc } +ent-BlueshieldOfficerIDCard = ID-карта офицера "Синий Щит" .desc = { ent-IDCardStandard.desc } \ No newline at end of file diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Corvax/Entities/Clothing/Eyes/glasses.yml index 3f4b831733..3cae568ad3 100644 --- a/Resources/Prototypes/Corvax/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/Corvax/Entities/Clothing/Eyes/glasses.yml @@ -23,7 +23,7 @@ sprite: Corvax/Clothing/Eyes/Glasses/kim.rsi - type: entity - parent: [ ClothingEyesGlassesSecurity, ShowMedicalIcons ] + parent: [ ClothingEyesGlassesSecurity, ShowMedicalIcons, BaseToggleClothing ] id: ClothingEyesVisorTactical name: tactical visor description: NanoTrasen visor, that allow you to see a lot of tactical information. @@ -39,5 +39,10 @@ - Biological - Inorganic - Silicon - - type: NightVision - relayOverlay: true + - type: ToggleClothing + action: ActionToggleNightVision + mustEquip: true + - type: ComponentToggler + components: + - type: NightVision + relayOverlay: true diff --git a/Resources/Prototypes/Corvax/Entities/Mobs/Player/Centcomm.yml b/Resources/Prototypes/Corvax/Entities/Mobs/Player/Centcomm.yml index 46dbed82e6..6cd939529d 100644 --- a/Resources/Prototypes/Corvax/Entities/Mobs/Player/Centcomm.yml +++ b/Resources/Prototypes/Corvax/Entities/Mobs/Player/Centcomm.yml @@ -4,8 +4,8 @@ suffix: Corvax components: - type: Sprite - sprite: Markers/jobs.rsi - state: centcom + sprite: Corvax/Markers/jobs.rsi + state: CCOfficer - type: RandomHumanoidSpawner settings: CentcomOfficer @@ -31,8 +31,8 @@ suffix: Corvax components: - type: Sprite - sprite: Markers/jobs.rsi - state: centcom + sprite: Corvax/Markers/jobs.rsi + state: CCRepresentative - type: RandomHumanoidSpawner settings: CentcomRepresentative @@ -58,8 +58,8 @@ suffix: Corvax components: - type: Sprite - sprite: Markers/jobs.rsi - state: centcom + sprite: Corvax/Markers/jobs.rsi + state: CCChief - type: RandomHumanoidSpawner settings: CentcomStaffChief @@ -91,8 +91,8 @@ suffix: Corvax components: - type: Sprite - sprite: Markers/jobs.rsi - state: centcom + sprite: Corvax/Markers/jobs.rsi + state: CCDiplomat - type: RandomHumanoidSpawner settings: NanoTrasenDiplomat @@ -118,8 +118,8 @@ suffix: Corvax components: - type: Sprite - sprite: Markers/jobs.rsi - state: centcom + sprite: Corvax/Markers/jobs.rsi + state: BlueshieldOfficer - type: RandomHumanoidSpawner settings: BlueshieldOfficer diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Corvax/Entities/Objects/Misc/identification_cards.yml index 25ac386b96..25f42e9fdb 100644 --- a/Resources/Prototypes/Corvax/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Corvax/Entities/Objects/Misc/identification_cards.yml @@ -133,7 +133,7 @@ color: *color-centcomm-bottom - sprite: Interface/Misc/job_icons.rsi offset: *icon-offset - state: Nanotrasen + state: ERTSecurity - type: Item heldPrefix: blue - type: PresetIdCard diff --git a/Resources/Textures/Corvax/Markers/jobs.rsi/BlueshieldOfficer.png b/Resources/Textures/Corvax/Markers/jobs.rsi/BlueshieldOfficer.png new file mode 100644 index 0000000000000000000000000000000000000000..4c62e69ef4953b0b16ced227946aa806d091efa5 GIT binary patch literal 1033 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Corvax/Markers/jobs.rsi/CCOfficer.png b/Resources/Textures/Corvax/Markers/jobs.rsi/CCOfficer.png new file mode 100644 index 0000000000000000000000000000000000000000..3611471fbf6799c8bc812d2ffc7887995232a81f GIT binary patch literal 1057 zcmV++1m63JP)$1p7r4!~+!lA_^)Vh!>*uphUDDjn&ZD#)fK3w7IlRs+F$$CYhK- zXg7(`KZKomGn@CDH}B1?QWQn}PbuShX~?osA!=`fn?2pnJ}UkR068xlKM3{~7wfC^ zTKHPKp_!N?#sd)(K)7>qN~*0`gV(2zV&yPRToAGWqMf&0vom}4wY^A0vH@tXEn#g> z&F$ZRlHLznUZ@BJSsPc z1yc;Hz50s-xN#e2GH1a%*~e_H=gQdTTdNyUa-#9?Z^25h3WbiYP#LQ9eK76VNeo?- z$NJOZKwg#ri!`qZ@+Av^p8+Itf~?@cqNu(knn&}S&cBfrg;FllL5D6?sG2$YR7vYr#|?8z&Jzn2g|`71LP zj+=q?j|^zUduGee$c5k4fwKdBC^$HgoqVhAibzdSVvtr~VZS~h6$LsSF5fgK2C(^o z$P#ZfhU1HF3NDSfhh24AXrRT0$4+SKe!%TgAuC&pw$CkSb4t;vZ&s*{xuV+JiYDp( zgaAmC)kQ_pzUl^p?gHUcIpELk-y$uG#ygy)g6`1RVg307>FF7$lg1BA^K2jf@+TQN&&U`UVIv6A&!F@0@%$JdWC3(`cCuf* b<2~sY>JiO@Fc`e{00000NkvXXu0mjf>IvU% literal 0 HcmV?d00001 diff --git a/Resources/Textures/Corvax/Markers/jobs.rsi/CCRepresentative.png b/Resources/Textures/Corvax/Markers/jobs.rsi/CCRepresentative.png new file mode 100644 index 0000000000000000000000000000000000000000..1e520d6bb0cdbff83077ac15fef613b2405dfbb0 GIT binary patch literal 1203 zcmV;k1WfyhP)&g5yY3` zhL*ul4$#L*gzFTI-rwMpmA0b%8-C`ECT>nAxq4aUIqE)$ytDB#M1jq9)OIOaE zP`b{2fFqVInE&xt9PxV4l~~1rlW(CMZScL~`~Pylwy$2X?zZ48dw#g>aoo)ka(~|& z+!w7+U}Y`=qtGSby(cB5>A?p4a_j;0#%`l)`b(Jqx&Y7igIL~|0@XhC2ans1Z;m<@ z|7;k2mla)+&?SJ#_qd#B_ePQ1jP}1Xf{y;Zyb0ZykE4A$3!mEwBhV#)8VuIS>2Gf! z&h11_#00XFpF{#?%x#tc3aQy{!F>*!YH+CSmxxFR5&Kx^dmXnmKZ&B&t*0dy6hP}a z(fc%CdjgRMr$THQ>NG+cd)N|*IV4s@sU!i>PY)==dz;{8AEup;&^+|<9rAUYxxWqp z7Ll2Om-v`kbMUtWPu@bwm{$P(*#!GD>ig|uqdeSlP{wzx+^8G{sQj{-H7<_wfG-yl zb$UWZA>fE-f244M zHOGa;ILc7T=ej*E{=WTi2?D4Cnpp&V-94%RR$i~3Q`eq|1wyW79GseABJR@W@~T-b z+!1x<0G)gT(+hk_1k&jwlJ~N+VkEgigxV)+p%-}tsHIiSyPW_#mVq71P+3_8qNcmB zfB3Ew<9siG)-y^HFlfDnAtoR<0R>sUv6xTqmn49;VfhC&3iLNYR(eZuv*ssT74wOF z2u`J#Eu+nEdaR)|0Z$BvqyXCwD4RQT>>~UBYs`B@e^KWM30F6u$pR&)OMt-J*F`vIkVve+WU7E1jYtmrE+x2@ zfyH9QHK=p?pdY#fG}Jp4t99!J8;KySt&`{aX@2;6X!Fj5tE;R0D%PJ5{{S0|1oC4V RVTk|$002ovPDHLkV1f={JR$%9 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Corvax/Markers/jobs.rsi/meta.json b/Resources/Textures/Corvax/Markers/jobs.rsi/meta.json new file mode 100644 index 0000000000..c42b491e62 --- /dev/null +++ b/Resources/Textures/Corvax/Markers/jobs.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made with inbuild sprites", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "BlueshieldOfficer" + }, + { + "name": "CCOfficer" + }, + { + "name": "CCRepresentative" + }, + { + "name": "CCChief" + }, + { + "name": "CCDiplomat" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Markers/jobs.rsi/centcom.png b/Resources/Textures/Markers/jobs.rsi/centcom.png index dedc145648ccdc329e2ffb6da29f997746a985c8..f3712f4fe5070ece2760e73889c36c7188f319ae 100644 GIT binary patch delta 926 zcmV;P17ZBp2eb!}B!2;OQb$4nuFf3k000ASNkl^l$L<;CB}bf z6%>OZie)=1+l^Lh*MDRZd3sRx#j+}CB@24V2V&>Fd3y8Be1G$vwD1o9Gqg%h5h?4l zC+;byIdHw~KAKiBM12J8iF;yR`Sk60cA+eZh7<6Dzuw8Ix#rWMvLvbzs0a}$`XId$ z4!278@B`7m_`bw;rYEK3J5|tB3!&b-^Tfw*;V#5^m0V_baZ1_o@muU~yr?-z-x7Rw zSChGKMSDDYQ-40W+DFUj5YC#7@uA79og9hB(_FndTC)T-^}ulw9?Au8IDzhKmjoaj zD=7El`(N?R-@gK|mp%kw`R6A^dsZXhy9c_jU6S*?9fV^|D%kb=zp3EiSQF=aI}}O3 z@KpgX_)+8^>1<^)v_;zqeCZbX7Uy58N}O1N3&WS?tbb{cvK{u)ha4r6f20=$Uz~qQ zIM#%>{^<{YX$_NLFMWu+;o!kl-Hya@#wYu}(Q?-o>SmDZrUNORaU6Tn;w=!HjiEC=?fpQVBWghC-Akv2cu0zP}-Vlb)fo`{9vv@qI# zo4McrWVHV_hSNe%#3I&Wkjv%R-maGSTU5OVdVfCpSU&H_@N{j91LGo5qaA>(lObxf ztEV@YNIcOz8IsSRRlNtQN|1d1O#AwZE&x%Z9V2R}U>>|V4|e*6?~~xG2mTBD`@7)0 zd7c2idf=y7S6fJnmUS{X*}~B}b*i=K>13Uvsx*|qad;#WiNX(#H?9XYN#K?JIK0g3 zk$?$+ zp0PW30O%hWQ2RFIyhzI&Btk%>V!Z07*qoM6N<$f`Mtt ARsaA1 delta 955 zcmV;s14R6^2hj(RB!3xnMObuGZ)S9NVRB^vL1b@YWgtmyVP|DhWnpA_ami&o000AX zNkl*UU+kgqts!bdPqp6q6dv&lhP#?R=Q&f9{e zsNEIf2@@{|rDXs^4{nGN4VqeYsI3kP9Bci$Ghi$&m%p6$JbyB@Yi)bXIR2qjU;>iU zyqt;ASK6HcVSkkGcN2nuVF6X>iO?A_@T`0aor?z8nDsi7(9^lj49td5YhAC@dh4Zh zt*9Q!!^hyfmxq&OEfMtSZl0NrphWs21GE323T|Jyh|T+~sH>}k$N3mieu<#JwBLuN z`w`5{%rFYo6|t%Sj7Q3)p=X`!*INgIKjz_i?ZVvic7NznlVCl435h6!^Ndr%hTaGSair z)!iv6EXL`ysslL8op0Zfi%Fjk-@IP9O>TLv$W?@Gxw$Z8XJdTKix)fywE?K=gwi>% zt`nW;?|<(XP6(>adIcsq&66JKYu1W|u>z&6va%BHyF0~~6DD2(1yCJ?`a?LlMEdwP zEO$!0La#uhDv-Z^Fmg`eG+MBWSzw6W6V%^^jVhZQK6pWnOqL42v zEX3qVpVra(b@c(8&BlHQgGkovF*iStiHQlh+<#U=xIA-mahKE4Q<$y$ZJ&=G6h7At@bO`@CXr4~9-7ZE-N(!@-l`+CJ!m{P^ux@y5O#6JS zIs@+p2C%odSRo^x#t=Xt9R>ySRJ dQv-hl7yxNYwAzckG^_vs002ovPDHLkV1i<^(L(?L