From 690b9637d018b39ab2771853ac455d60ae249491 Mon Sep 17 00:00:00 2001 From: Rinary Date: Mon, 22 Jul 2024 18:47:42 +0300 Subject: [PATCH 1/8] init --- .../Prototypes/_Sunrise/Access/command.yml | 3 + .../_Sunrise/Entities/Clothing/Head/hats.yml | 1 - .../Entities/Clothing/OuterClothing/suits.yml | 12 +++ .../Devices/Electronics/door_access.yml | 8 ++ .../Entities/Objects/Misc/rubber_stamp.yml | 13 +++ .../Objects/Weapons/Melee/cane-nt.yml | 71 +++++++++++++++ .../Structures/Doors/Airlocks/access.yml | 27 ++++++ .../Objects/Misc/stamps.rsi/meta.json | 3 + .../Objects/Misc/stamps.rsi/stamp-ntrep.png | Bin 0 -> 317 bytes .../Melee/cane-nt.rsi/cane-nt-active.png | Bin 0 -> 814 bytes .../Weapons/Melee/cane-nt.rsi/cane-nt.png | Bin 0 -> 369 bytes .../Weapons/Melee/cane-nt.rsi/meta.json | 85 ++++++++++++++++++ .../Melee/cane-nt.rsi/off-inhand-left.png | Bin 0 -> 257 bytes .../Melee/cane-nt.rsi/off-inhand-right.png | Bin 0 -> 262 bytes .../Melee/cane-nt.rsi/on-inhand-left.png | Bin 0 -> 514 bytes .../Melee/cane-nt.rsi/on-inhand-right.png | Bin 0 -> 576 bytes 16 files changed, 222 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/_Sunrise/Access/command.yml create mode 100644 Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Melee/cane-nt.yml create mode 100644 Resources/Textures/_Sunrise/Objects/Misc/stamps.rsi/stamp-ntrep.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Melee/cane-nt.rsi/cane-nt-active.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Melee/cane-nt.rsi/cane-nt.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Melee/cane-nt.rsi/meta.json create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Melee/cane-nt.rsi/off-inhand-left.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Melee/cane-nt.rsi/off-inhand-right.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Melee/cane-nt.rsi/on-inhand-left.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Melee/cane-nt.rsi/on-inhand-right.png diff --git a/Resources/Prototypes/_Sunrise/Access/command.yml b/Resources/Prototypes/_Sunrise/Access/command.yml new file mode 100644 index 00000000000..185a4f17b5d --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Access/command.yml @@ -0,0 +1,3 @@ +- type: accessLevel + id: Ntrep + name: id-card-access-level-ntrep \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hats.yml index 2a589ce9ee8..ca0a7a56dab 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hats.yml @@ -248,7 +248,6 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatCapNtrep - noSpawn: true name: nt representive cap description: The cap of justice over command! components: diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/suits.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/suits.yml index 38f7cc00d54..5c2eca29d18 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/suits.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/suits.yml @@ -19,6 +19,12 @@ sprite: _Sunrise/Clothing/OuterClothing/Coats/ntrep.rsi - type: Clothing sprite: _Sunrise/Clothing/OuterClothing/Coats/ntrep.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.8 - type: entity parent: ClothingOuterBase @@ -30,6 +36,12 @@ sprite: _Sunrise/Clothing/OuterClothing/Coats/ntrep_open.rsi - type: Clothing sprite: _Sunrise/Clothing/OuterClothing/Coats/ntrep_open.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.8 - type: entity parent: ClothingOuterBase diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/Electronics/door_access.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/Electronics/door_access.yml index cccd5a2342a..524ff00edce 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/Electronics/door_access.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/Electronics/door_access.yml @@ -5,3 +5,11 @@ components: - type: AccessReader access: [["BlueShield"]] + +- type: entity + parent: DoorElectronics + id: DoorElectronicsNtrep + suffix: Ntrep, Locked + components: + - type: AccessReader + access: [["Ntrep"]] diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/rubber_stamp.yml index 07eb77405f3..0f9939d44f2 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/rubber_stamp.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/rubber_stamp.yml @@ -38,3 +38,16 @@ - type: Sprite sprite: _Sunrise/Objects/Misc/stamps.rsi state: stamp-magistrat + +- type: entity + name: NT representative's rubber stamp + parent: RubberStampBase + id: RubberStampNtrep + components: + - type: Stamp + stampedName: stamp-component-stamped-name-ntrep + stampedColor: "#fcc032" + stampState: "paper_stamp-ntrep" + - type: Sprite + sprite: _Sunrise/Objects/Misc/stamps.rsi + state: stamp-ntrep \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Melee/cane-nt.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Melee/cane-nt.yml new file mode 100644 index 00000000000..f71599943bc --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Melee/cane-nt.yml @@ -0,0 +1,71 @@ +- type: entity + name: fancy cane + parent: BaseItem + id: CaneNT + description: A cane with special engraving on it. It seems well suited for fending off assailants... + components: + - type: Sprite + sprite: _Sunrise/Objects/Weapons/Melee/cane-nt.rsi + layers: + - state: cane-nt + map: [ "enum.ToggleVisuals.Layer" ] + - type: Stunbaton + energyPerUse: 25 + - type: ItemToggle + predictable: false + soundActivate: + collection: sparks + params: + variation: 0.250 + soundDeactivate: + collection: sparks + params: + variation: 0.250 + soundFailToActivate: + path: /Audio/Machines/button.ogg + params: + variation: 0.250 + - type: ItemToggleMeleeWeapon + activatedDamage: + types: + Blunt: 0 + - type: MeleeWeapon + wideAnimationRotation: -135 + damage: + types: + Blunt: 10 + bluntStaminaDamageFactor: 2.0 + angle: 60 + animation: WeaponArcSlash + - type: StaminaDamageOnHit + damage: 40 + sound: /Audio/Weapons/egloves.ogg + - type: StaminaDamageOnCollide + damage: 40 + sound: /Audio/Weapons/egloves.ogg + - type: LandAtCursor + - type: Battery + maxCharge: 1000 + startingCharge: 1000 + - type: UseDelay + - type: Item + heldPrefix: off + size: Normal + - type: DisarmMalus + malus: 0.300 + - type: Appearance + - type: GenericVisualizer + visuals: + enum.ToggleVisuals.Toggled: + enum.ToggleVisuals.Layer: + True: {state: cane-nt-active} + False: {state: cane-nt} + - type: Riggable + - type: SolutionContainerManager + solutions: + battery: + maxVol: 5 + - type: InjectableSolution + solution: battery + - type: DrawableSolution + solution: battery \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/_Sunrise/Entities/Structures/Doors/Airlocks/access.yml index 9e7f943efd2..0f36f18583e 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Structures/Doors/Airlocks/access.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Structures/Doors/Airlocks/access.yml @@ -24,6 +24,33 @@ - type: ContainerFill containers: board: [ DoorElectronicsBlueShield ] + +- type: entity + parent: AirlockCommandGlass + id: AirlockNtrepGlassLocked + suffix: Ntrep, Locked + components: + - type: ContainerFill + containers: + board: [ DoorElectronicsNtrep ] + +- type: entity + parent: AirlockMaint + id: AirlockMaintNtrepLocked + suffix: Ntrep, Locked + components: + - type: ContainerFill + containers: + board: [ DoorElectronicsNtrep ] + +- type: entity + parent: AirlockCommand + id: AirlockNrepLocked + suffix: Ntrep, Locked + components: + - type: ContainerFill + containers: + board: [ DoorElectronicsNtrep ] #Hatches - type: entity diff --git a/Resources/Textures/_Sunrise/Objects/Misc/stamps.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Misc/stamps.rsi/meta.json index 61cbd5793e4..96ebe618510 100644 --- a/Resources/Textures/_Sunrise/Objects/Misc/stamps.rsi/meta.json +++ b/Resources/Textures/_Sunrise/Objects/Misc/stamps.rsi/meta.json @@ -15,6 +15,9 @@ }, { "name": "stamp-magistrat" + }, + { + "name": "stamp-ntrep" } ] } diff --git a/Resources/Textures/_Sunrise/Objects/Misc/stamps.rsi/stamp-ntrep.png b/Resources/Textures/_Sunrise/Objects/Misc/stamps.rsi/stamp-ntrep.png new file mode 100644 index 0000000000000000000000000000000000000000..7c8c3dee710aa5c84c5f292cbb3ab4f3e5275f1a GIT binary patch literal 317 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5DEQvf z#WAE}PO@de1BSy6Ok!<}Y>W9MN)N1HK2dhy+l@K@4Yoahq}fwa%5b76Thoor+BLGx z`MZ4c&nH$*i!>M_{WK+JWj;{RmS#S@IbNg2zshPsVw`-kbI`^56uX(Px%=t)FDRCt{2T0M``KolG!s+`h9TiVHQ;G7bPo+^E=#i#rsB%loRfeLCU?eG`S zB@IfK)1@5>`}x+!NSB=V?V;>6`EZokdHeNt-v9vtXN{=uKiscol=s8&1)|GOy>s-* z|GaPV;rIdo@bSYB007r>Y6ZbJKe(RP(ciCTTrMVDE+(|Ue`@?rBeP%4`1#vU0KnCo zmtLlWPyQO(BjFhSXPOPUy}5(0ApDEp`H(Qi@NhU_G#X*^e3; zmtObEAH)aoXDFWQxmWS0@b|VFay{qm&7GJ0|1tb0p9RvK%_zSBhPYA}pRsJmv;gw4 z62C28<{U{%W3-TwG{!K^$vBQlP5v}z1JWQZ{)}XrQ&)Ue^|FY!7aSkrh5s?)A3R?& zlJBD^0?OV`)4zWs&s{-;UITb%eIGgIZS<}&hOBzPDQOELUgmsXBkrivAW80aJ0wZc z2lr9DQ4~eS7*4+K@O!4nFOhD~dCd{P)@rY^-q-@OYNhuf9w-AK;-x)({dZ>~l;&hH zjUo|R6aZ3SyWM(8a;~e-uQwY2pzFo9?qNxC>^)bj_w6J{J;_RQmUn0twD{(#^QC=vVt6@ot?_ycqis>DHj5bqZ48=AB72gnUg{raE!15PJw-PL8Jmqe#g zu+`+ZOX68oG|?`Yc=ZQJulp*OdGQATRcXA#A7DRs-G)B>0Y^c^bybQqsz!E^#)eDI z8n*a$bH?u7?`KtTWa123H%sTED+pa1{>07*qoM6N<$f~r)7z5oCK literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Melee/cane-nt.rsi/cane-nt.png b/Resources/Textures/_Sunrise/Objects/Weapons/Melee/cane-nt.rsi/cane-nt.png new file mode 100644 index 0000000000000000000000000000000000000000..dbdd22d24e49831eb13849954d12fe9295ad6a6a GIT binary patch literal 369 zcmV-%0gnEOP)Px$D@jB_R9J=Om$43lFc60S8n*^w*ySDc1sENT3C4xQiQPBRy^{%xZvlz34}mXW zAh6a6LL?y7J2mkpk{*0txogvkIF9kn7=4xg3j$;656*7~T|HZ_M3RN#V*>NrL0hf_ z07U8x00=_pJ_*tiR5MPpP%Ia-TEw%J?s|t*pgGgaWH(5HwFxhiotSQpqEF(Zs~}H{ zmIV1Kcnsh7by=2h90x%tTjQ((O?VVVBFWl0Y$bSvcjd7N4281@n83*eJX;yT0m3Hq zY^C$GKyh9@-T%o2s^4x32M9{gthp)tZ2{AUBNd>4zbrrne@TE6ZY)3zHxl504;J8p z4-(*nKNaAH_X=E3TfJXPR(Pj?XDeNwXc^(10(n}%awV!0EoX?oza8HJj#{BE(&MPc)3vT0ncd%XBL5TbHml=iYZ&F9~dJWu|DkRkv2X&1dgW_Y^#xvXMB=j4!g?&}RyrbRjMQ>C{{PDv7(!$q3Jq!uKWox-L zUYhY;e*DX%r}F)+?|;AiT=#X>y6Jml!1-ybp^)(qFAk{#dSl_+nI={p{Zd7lbja=C!I~ zuyWp+RoWAFd!`XgTe~ HDWM4fEB|Ur literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Melee/cane-nt.rsi/on-inhand-left.png b/Resources/Textures/_Sunrise/Objects/Weapons/Melee/cane-nt.rsi/on-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..3122c1acddb2762eb9ad34e1854d0fcfa076472c GIT binary patch literal 514 zcmV+d0{#7oP)Px$yh%hsRCt{2-LY}oKoAAcgHw&%0ab+92y^CAO;qljjfh2{1Y!`c1L|zafrLQ3 zg?aB4zz^&WG2qPdwiEyW006j>IPF9JUq4!gZx0dEIHwiiDRT28Gk<%Ch=_QKNGpE5 zhK&4r@7qH{zTzvs;x`X3ofrRn+(n%BX~nPkS;epUUlspqZ$bADcV!yq@-hs=wKA6E z56Stj&pG+Dc0TT+lu|aEP1;w!=ll;BA%D4Ve?Fa$ySRV2yL|ZLujbFc-tz$f00000 z09dKD&Cd6b|7S8TPWza~xunc7zRORW<9y4{8l^0yT!vXAYnZfLhI#8XWaQU-*91+_ z1WnL{w=#`gZuyV{{b(a1gHug|&pL-PHzHg)zr>yglVen}6% z!Td$@>-8u4G|uJc?$~_hz4v?o00000008(@kF)=czwt&i{^IlFxrWT zSG5;@shQlqKd~Pp$lp|Em1!?eFfsmAqW5wl1~)|I~T> z2gPHAHCH{B&OGb9R&U=Mt9gzS z<_&fYNmVp9r2e;+++mW;9A9;TK+L60IR)ssg w{HexYfA~*mwGTA#V!z#8e(5tK(E2^o^Y1ZFJZmg>uM*@KPgg&ebxsLQ041gjo&W#< literal 0 HcmV?d00001 From b3ab012c153f0edda17142bc1492a50a8a0d47ef Mon Sep 17 00:00:00 2001 From: Rinary Date: Mon, 22 Jul 2024 19:06:08 +0300 Subject: [PATCH 2/8] some fixes, translating --- .../_sunrise/entities/clothing/head/hats.ftl | 2 +- .../entities/clothing/outerclothing/suits.ftl | 4 ++-- .../entities/clothing/uniforms/jumpskirts.ftl | 2 +- .../entities/clothing/uniforms/jumpsuits.ftl | 4 ++-- .../entities/objects/misc/rubber_stamp.ftl | 4 ++++ .../entities/objects/weapons/melee/cane-nt.ftl | 3 +++ .../Jobs/Command/nanotrasenrepresentative.yml | 5 +++++ .../Objects/Misc/bureaucracy.rsi/meta.json | 3 +++ .../Misc/bureaucracy.rsi/paper_stamp-ntrep.png | Bin 0 -> 144 bytes 9 files changed, 21 insertions(+), 6 deletions(-) create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/misc/rubber_stamp.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/weapons/melee/cane-nt.ftl create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-ntrep.png diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/head/hats.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/head/hats.ftl index 1a5d302484c..02efa0381bf 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/head/hats.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/head/hats.ftl @@ -1,2 +1,2 @@ -ent-ClothingHeadHatCapNtrep = фуражка представителя nt +ent-ClothingHeadHatCapNtrep = фуражка представителя NT .desc = Фуражка справедливости над командованием! \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/outerclothing/suits.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/outerclothing/suits.ftl index e292eb14099..20a0c0be16c 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/outerclothing/suits.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/outerclothing/suits.ftl @@ -1,4 +1,4 @@ -ent-ClothingOuterCoatNtrep = пиджак представителя nt +ent-ClothingOuterCoatNtrep = пиджак представителя NT .desc = Элегантная черная куртка, стандартный атрибут представителей Nanotrasen. -ent-ClothingOuterCoatNtrepOpen = растёгнутый пиджак представителя nt +ent-ClothingOuterCoatNtrepOpen = растёгнутый пиджак представителя NT .desc = Элегантная черная куртка, стандартный атрибут представителей Nanotrasen. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/uniforms/jumpskirts.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/uniforms/jumpskirts.ftl index 100a22adcc2..878c7b16491 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/uniforms/jumpskirts.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/uniforms/jumpskirts.ftl @@ -1,2 +1,2 @@ -ent-ClothingUniformJumpskirtNtrep = юбка-костюм представителя nt +ent-ClothingUniformJumpskirtNtrep = юбка-костюм представителя NT .desc = Эту юбку-костюм лучше не видеть. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/uniforms/jumpsuits.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/uniforms/jumpsuits.ftl index 7983e0f5c75..77af5eb8009 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/uniforms/jumpsuits.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/uniforms/jumpsuits.ftl @@ -1,4 +1,4 @@ -ent-ClothingUniformJumpsuitNtrep = костюм представителя nt +ent-ClothingUniformJumpsuitNtrep = костюм представителя NT .desc = Этот костюм лучше не видеть. - ent-ClothingUniformJumpsuitNtrepFormal = праздничный костюм представителя nt +ent-ClothingUniformJumpsuitNtrepFormal = праздничный костюм представителя NT .desc = Этот костюм лучше не видеть. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/misc/rubber_stamp.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/misc/rubber_stamp.ftl new file mode 100644 index 00000000000..9072b45032c --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/misc/rubber_stamp.ftl @@ -0,0 +1,4 @@ +ent-RubberStampNtrep = печать представителя NT + .suffix = НЕ МАППИТЬ + .desc = { ent-RubberStampBase.desc } +stamp-component-stamped-name-ntrep = Представитель NT \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/weapons/melee/cane-nt.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/weapons/melee/cane-nt.ftl new file mode 100644 index 00000000000..01ace618d8c --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/weapons/melee/cane-nt.ftl @@ -0,0 +1,3 @@ +ent-CaneNT = изысканная трость + .suffix = НЕ МАППИТЬ + .desc = Трость с особой гравировкой. Кажется, она хорошо подходит для отражения нападений... \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/Command/nanotrasenrepresentative.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/Command/nanotrasenrepresentative.yml index f61bb7ecee9..0777b7c17b8 100644 --- a/Resources/Prototypes/_Sunrise/Roles/Jobs/Command/nanotrasenrepresentative.yml +++ b/Resources/Prototypes/_Sunrise/Roles/Jobs/Command/nanotrasenrepresentative.yml @@ -45,3 +45,8 @@ head: ClothingHeadHatCapNtrep id: NanoTrasenRepresentativePDA ears: ClothingHeadsetAltCommand + pocket1: FlippoEngravedLighter + storage: + back: + - RubberStampNtrep + - CaneNT diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json index 9fe559b115e..6ffe630a011 100644 --- a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json @@ -230,6 +230,9 @@ }, { "name": "paper_stamp-psychologist" + }, + { + "name": "paper_stamp-ntrep" } ] } diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-ntrep.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-ntrep.png new file mode 100644 index 0000000000000000000000000000000000000000..0d879d45d0b5c668d83ffc707e30165edc7902c9 GIT binary patch literal 144 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}UY;(FArY;~ z2@gTe~DWM4fii$2S literal 0 HcmV?d00001 From 2d6c4335a39303a04ef10b09188f87cc581702bf Mon Sep 17 00:00:00 2001 From: Rinary Date: Mon, 22 Jul 2024 20:02:15 +0300 Subject: [PATCH 3/8] access --- Resources/Locale/ru-RU/_sunrise/prototypes/access/accesses.ftl | 1 + Resources/Prototypes/Access/command.yml | 1 + Resources/Prototypes/Access/misc.yml | 1 + .../_Sunrise/Roles/Jobs/Command/nanotrasenrepresentative.yml | 1 + 4 files changed, 4 insertions(+) diff --git a/Resources/Locale/ru-RU/_sunrise/prototypes/access/accesses.ftl b/Resources/Locale/ru-RU/_sunrise/prototypes/access/accesses.ftl index 1fe33b21390..a8b28787f42 100644 --- a/Resources/Locale/ru-RU/_sunrise/prototypes/access/accesses.ftl +++ b/Resources/Locale/ru-RU/_sunrise/prototypes/access/accesses.ftl @@ -1 +1,2 @@ id-card-access-level-blueshield = Синий Щит +id-card-access-level-ntrep = Представитель NT diff --git a/Resources/Prototypes/Access/command.yml b/Resources/Prototypes/Access/command.yml index 9227f94d96e..ffca0890f07 100644 --- a/Resources/Prototypes/Access/command.yml +++ b/Resources/Prototypes/Access/command.yml @@ -22,6 +22,7 @@ - HeadOfPersonnel - Cryogenics - BlueShield + - Ntrep - type: accessLevel id: EmergencyShuttleRepealAll diff --git a/Resources/Prototypes/Access/misc.yml b/Resources/Prototypes/Access/misc.yml index 5cf5c08717c..360690998d4 100644 --- a/Resources/Prototypes/Access/misc.yml +++ b/Resources/Prototypes/Access/misc.yml @@ -33,3 +33,4 @@ - Hydroponics - Atmospherics - BlueShield + - Ntrep diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/Command/nanotrasenrepresentative.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/Command/nanotrasenrepresentative.yml index 0777b7c17b8..624d67de100 100644 --- a/Resources/Prototypes/_Sunrise/Roles/Jobs/Command/nanotrasenrepresentative.yml +++ b/Resources/Prototypes/_Sunrise/Roles/Jobs/Command/nanotrasenrepresentative.yml @@ -33,6 +33,7 @@ - Atmospherics - Cargo - Medical + - Ntrep special: - !type:AddImplantSpecial implants: [MindShieldImplant] From 602f1d544ce466607dec638d23a36e7d4e3e801e Mon Sep 17 00:00:00 2001 From: Rinary Date: Mon, 22 Jul 2024 20:13:48 +0300 Subject: [PATCH 4/8] add some access --- .../_Sunrise/Roles/Jobs/Command/nanotrasenrepresentative.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/Command/nanotrasenrepresentative.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/Command/nanotrasenrepresentative.yml index 624d67de100..35564075819 100644 --- a/Resources/Prototypes/_Sunrise/Roles/Jobs/Command/nanotrasenrepresentative.yml +++ b/Resources/Prototypes/_Sunrise/Roles/Jobs/Command/nanotrasenrepresentative.yml @@ -12,6 +12,9 @@ supervisors: job-supervisors-centcom canBeAntag: false access: + - Armory + - Cryogenics + - Lawyer - Command - Bar - Service From 25047f580a884b308a58cb706fd1ebaec199ab32 Mon Sep 17 00:00:00 2001 From: Rinary Date: Mon, 22 Jul 2024 20:24:00 +0300 Subject: [PATCH 5/8] translate Ntrep Airlocks --- .../entities/structures/doors/airlocks/access.ftl | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Resources/Locale/ru-RU/_sunrise/prototypes/entities/structures/doors/airlocks/access.ftl b/Resources/Locale/ru-RU/_sunrise/prototypes/entities/structures/doors/airlocks/access.ftl index bc3013e61ca..43528355d3e 100644 --- a/Resources/Locale/ru-RU/_sunrise/prototypes/entities/structures/doors/airlocks/access.ftl +++ b/Resources/Locale/ru-RU/_sunrise/prototypes/entities/structures/doors/airlocks/access.ftl @@ -7,3 +7,13 @@ ent-AirlockBlueShieldGlassLocked = { ent-AirlockCommandGlass } ent-AirlockMaintBlueShieldLocked = { ent-AirlockMaintCommandLocked } .suffix = Синий Щит, Закрыт .desc = { ent-AirlockMaintCommandLocked.desc } + +ent-AirlockNtrepLocked = { ent-AirlockCommand } + .suffix = Представитель NT, Закрыт + .desc = { ent-AirlockCommand.desc } +ent-AirlockNtrepGlassLocked = { ent-AirlockCommandGlass } + .suffix = Представитель NT, Закрыт + .desc = { ent-AirlockCommandGlass.desc } +ent-AirlockMaintNtrepLocked = { ent-AirlockMaintCommandLocked } + .suffix = Представитель NT, Закрыт + .desc = { ent-AirlockMaintCommandLocked.desc } From 44b1c816aace45473749156e12646eba6cc150ff Mon Sep 17 00:00:00 2001 From: Rinary Date: Mon, 22 Jul 2024 20:43:59 +0300 Subject: [PATCH 6/8] access fixes --- Resources/Locale/ru-RU/_sunrise/prototypes/access/accesses.ftl | 1 + Resources/Prototypes/Access/command.yml | 1 + Resources/Prototypes/Access/misc.yml | 1 + .../Prototypes/Entities/Objects/Tools/access_configurator.yml | 3 +++ 4 files changed, 6 insertions(+) diff --git a/Resources/Locale/ru-RU/_sunrise/prototypes/access/accesses.ftl b/Resources/Locale/ru-RU/_sunrise/prototypes/access/accesses.ftl index a8b28787f42..3acc0fece16 100644 --- a/Resources/Locale/ru-RU/_sunrise/prototypes/access/accesses.ftl +++ b/Resources/Locale/ru-RU/_sunrise/prototypes/access/accesses.ftl @@ -1,2 +1,3 @@ id-card-access-level-blueshield = Синий Щит id-card-access-level-ntrep = Представитель NT +id-card-access-level-magistrat = Магистрат diff --git a/Resources/Prototypes/Access/command.yml b/Resources/Prototypes/Access/command.yml index ffca0890f07..da03795d5a9 100644 --- a/Resources/Prototypes/Access/command.yml +++ b/Resources/Prototypes/Access/command.yml @@ -22,6 +22,7 @@ - HeadOfPersonnel - Cryogenics - BlueShield + - Magistrat - Ntrep - type: accessLevel diff --git a/Resources/Prototypes/Access/misc.yml b/Resources/Prototypes/Access/misc.yml index 360690998d4..2b9d63de6dc 100644 --- a/Resources/Prototypes/Access/misc.yml +++ b/Resources/Prototypes/Access/misc.yml @@ -32,5 +32,6 @@ - Chapel - Hydroponics - Atmospherics + - Magistrat - BlueShield - Ntrep diff --git a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml index 3c5bc93b42c..5c32f7b4262 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml @@ -119,6 +119,9 @@ - CentralCommand - NuclearOperative - SyndicateAgent + - Blueshield + - Ntrep + - Magistrat privilegedIdSlot: name: id-card-console-privileged-id ejectSound: /Audio/Machines/id_swipe.ogg From 6c2159162f65095fcbe700965bbdc695ef0fcbd9 Mon Sep 17 00:00:00 2001 From: Rinary Date: Mon, 22 Jul 2024 20:51:41 +0300 Subject: [PATCH 7/8] locker ntrep access --- .../Entities/Structures/Storage/Closets/Lockers/lockers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml index 89dc4d47552..650d04f93a8 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -456,7 +456,7 @@ components: - type: Appearance - type: AccessReader - access: [["Command"]] + access: [["Ntrep"]] - type: EntityStorageVisuals stateBaseClosed: hop stateDoorOpen: hop_open From d342eeb965a560732c5124f340d7ce6a691b3acb Mon Sep 17 00:00:00 2001 From: Rinary Date: Mon, 22 Jul 2024 20:58:49 +0300 Subject: [PATCH 8/8] fix --- .../Prototypes/Entities/Objects/Tools/access_configurator.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml index 5c32f7b4262..d7374a96288 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml @@ -119,7 +119,7 @@ - CentralCommand - NuclearOperative - SyndicateAgent - - Blueshield + - BlueShield - Ntrep - Magistrat privilegedIdSlot: