From e1f294c3992ea2a4b80912e70b36b093465e1685 Mon Sep 17 00:00:00 2001 From: CaypenNow <66198468+CaypenNow@users.noreply.github.com> Date: Sat, 16 Mar 2024 20:55:14 +0500 Subject: [PATCH] Zip Locks and fixes (#212) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: typing... * fix: переводы * add: zip locks * fix: ziplock fix * fix * fix: proto & textures to white * fix: security proto --- .../Locale/ru-RU/administration/bwoink.ftl | 5 +++ .../ru-RU/chat/managers/chat-manager.ftl | 2 +- .../ru-RU/items/components/item-component.ftl | 2 +- .../ru-RU/locales-new/autotranslate-56.ftl | 10 ++++++ .../Catalog/Fills/Boxes/security.yml | 19 +---------- .../Catalog/Fills/Lockers/security.yml | 1 + .../White/Catalog/Fills/Boxes/security.yml | 31 ++++++++++++++++++ .../White/Entities/Objects/Misc/ziplock.yml | 25 ++++++++++++++ .../Objects/Storage/boxes.rsi/meta.json | 5 ++- .../Objects/Storage/boxes.rsi/ziplock.png | Bin 0 -> 152 bytes .../Objects/Storage/ziplocks.rsi/icon.png | Bin 0 -> 2790 bytes .../Objects/Storage/ziplocks.rsi/meta.json | 14 ++++++++ 12 files changed, 93 insertions(+), 21 deletions(-) create mode 100644 Resources/Locale/ru-RU/locales-new/autotranslate-56.ftl create mode 100644 Resources/Prototypes/White/Catalog/Fills/Boxes/security.yml create mode 100644 Resources/Prototypes/White/Entities/Objects/Misc/ziplock.yml create mode 100644 Resources/Textures/Objects/Storage/boxes.rsi/ziplock.png create mode 100644 Resources/Textures/White/Objects/Storage/ziplocks.rsi/icon.png create mode 100644 Resources/Textures/White/Objects/Storage/ziplocks.rsi/meta.json diff --git a/Resources/Locale/ru-RU/administration/bwoink.ftl b/Resources/Locale/ru-RU/administration/bwoink.ftl index 17d13c5f88..92bddfeda8 100644 --- a/Resources/Locale/ru-RU/administration/bwoink.ftl +++ b/Resources/Locale/ru-RU/administration/bwoink.ftl @@ -2,3 +2,8 @@ bwoink-user-title = Сообщение от администратора bwoink-system-starmute-message-no-other-users = *Система: Никто не доступен для получения вашего сообщения. Попробуйте обратиться к администраторам игры в Discord. bwoink-system-messages-being-relayed-to-discord = Ваши сообщения передаются администраторам через Discord. bwoink-system-starmute-message-no-other-users-webhook = *Система: Ваше сообщение было передано администраторам в Discord. + +bwoink-system-typing-indicator = {$players} {$count -> +[one] печатает +*[other] печатают +}... diff --git a/Resources/Locale/ru-RU/chat/managers/chat-manager.ftl b/Resources/Locale/ru-RU/chat/managers/chat-manager.ftl index a8b8d7ea46..ca119bae8f 100644 --- a/Resources/Locale/ru-RU/chat/managers/chat-manager.ftl +++ b/Resources/Locale/ru-RU/chat/managers/chat-manager.ftl @@ -26,7 +26,7 @@ chat-manager-entity-say-wrap-message = [BubbleHeader][bold][Name]{$entityName}[/ chat-manager-entity-say-bold-wrap-message = [BubbleHeader][bold][Name]{$entityName}[/Name][/bold][/BubbleHeader] {$verb}, [font={$fontType} size={$fontSize}]"[BubbleContent][bold]{$message}[/bold][/BubbleContent]"[/font] chat-manager-entity-whisper-wrap-message = [font size=11][italic][BubbleHeader]{$entityName}[/BubbleHeader] шепчет,"[BubbleContent]{$message}[/BubbleContent]"[/italic][/font] -chat-manager-entity-whisper-unknown-wrap-message = [font size=11][italic][BubbleHeader]Someone[/BubbleHeader] шепчет, "[BubbleContent]{$message}[/BubbleContent]"[/italic][/font] +chat-manager-entity-whisper-unknown-wrap-message = [font size=11][italic][BubbleHeader]Некто[/BubbleHeader] шепчет, "[BubbleContent]{$message}[/BubbleContent]"[/italic][/font] chat-manager-entity-me-wrap-message = { $entityName } { $message } diff --git a/Resources/Locale/ru-RU/items/components/item-component.ftl b/Resources/Locale/ru-RU/items/components/item-component.ftl index 1e59ec7869..7f644392c1 100644 --- a/Resources/Locale/ru-RU/items/components/item-component.ftl +++ b/Resources/Locale/ru-RU/items/components/item-component.ftl @@ -6,7 +6,7 @@ pick-up-verb-get-data-text = Подобрать pick-up-verb-get-data-text-inventory = Взять в руку -item-component-on-examine-size = Это {INDEFINITE($size)} [bold]{$size}[/bold] предмет. +item-component-on-examine-size = Это [bold]{$size}[/bold] предмет. item-component-size-Tiny = крошечный item-component-size-Small = маленький diff --git a/Resources/Locale/ru-RU/locales-new/autotranslate-56.ftl b/Resources/Locale/ru-RU/locales-new/autotranslate-56.ftl new file mode 100644 index 0000000000..a4d7b42611 --- /dev/null +++ b/Resources/Locale/ru-RU/locales-new/autotranslate-56.ftl @@ -0,0 +1,10 @@ +ent-SmartFridge = умный ходольник + .desc = Хранит продукты холодными и свежими. +ent-TrainingBomb = тренировочная бомба + .desc = Бомба для оттачивания навыков сапера. Не содержит взрывчатку. +ent-Dresser = комод + .desc = Может хранить в себе вещи, идеально подходит для нижнего белья. +ent-ZipLock = зип пакет + .desc = Предназначен для хранения улик. +ent-BoxZipLocks = коробка зип пакетов + .desc = Заполнена зип пакетами. Обрадуйте детектива! \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/security.yml b/Resources/Prototypes/Catalog/Fills/Boxes/security.yml index 553df26d79..36de9f5d3d 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/security.yml @@ -80,21 +80,4 @@ - type: Sprite layers: - state: box_security - - state: forensic - -#White - -- type: entity - name: body camera box - parent: BoxCardboard - id: BoxBodyCamera - description: A box full of body cameras. - components: - - type: StorageFill - contents: - - id: SurveillanceBodyCamera - amount: 3 - - type: Sprite - layers: - - state: box_security - - state: bodycam + - state: forensic \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index 90eecb2b57..5fea75ab0e 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -138,6 +138,7 @@ - id: BoxBodyCamera - id: VoiceRecorder - id: ClothingEyesGlassesSecurity + - id: BoxZipLocks - type: entity id: ClosetBombFilled diff --git a/Resources/Prototypes/White/Catalog/Fills/Boxes/security.yml b/Resources/Prototypes/White/Catalog/Fills/Boxes/security.yml new file mode 100644 index 0000000000..1db1ff7a53 --- /dev/null +++ b/Resources/Prototypes/White/Catalog/Fills/Boxes/security.yml @@ -0,0 +1,31 @@ +- type: entity + name: body camera box + parent: BoxCardboard + id: BoxBodyCamera + description: A box full of body cameras. + components: + - type: StorageFill + contents: + - id: SurveillanceBodyCamera + amount: 3 + - type: Sprite + layers: + - state: box_security + - state: bodycam + +- type: entity + name: zip lock box + parent: BoxCardboard + id: BoxZipLocks + description: A box full of zip locks. + components: + - type: Storage + maxItemSize: Normal + - type: StorageFill + contents: + - id: ZipLock + amount: 4 + - type: Sprite + layers: + - state: box_security + - state: ziplock \ No newline at end of file diff --git a/Resources/Prototypes/White/Entities/Objects/Misc/ziplock.yml b/Resources/Prototypes/White/Entities/Objects/Misc/ziplock.yml new file mode 100644 index 0000000000..0e342f5094 --- /dev/null +++ b/Resources/Prototypes/White/Entities/Objects/Misc/ziplock.yml @@ -0,0 +1,25 @@ +- type: entity + id: ZipBase + parent: BaseStorageItem + abstract: true + components: + - type: Item + size: Small + - type: Storage + maxItemSize: Small + grid: + - 0,0,2,2 + +- type: entity + name: zip lock + parent: ZipBase + id: ZipLock + description: Designed for storing evidence. + components: + - type: Item + sprite: White/Objects/Storage/ziplocks.rsi + shape: + - 0,0,1,0 + - type: Sprite + sprite: White/Objects/Storage/ziplocks.rsi + state: icon diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json index 562299b7d5..b3a4c00d3b 100644 --- a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json +++ b/Resources/Textures/Objects/Storage/boxes.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/cc65477c04f7403ca8a457bd5bae69a01abadbf0, encryptokey was taken from Baystation12 at https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/radio.dmi and modified by lapatison. boxwidetoy, shelltoy, swab, flare, inflatable, trashbag, magazine, holo and forensic created by potato1234x (github) for ss14 based on toys.rsi, mouth_swab.rsi, flare.rsi, inflatable_wall.rsi, trashbag.rsi, caseless_pistol_mag.rsi, guardians.rsi and bureaucracy.rsi respectively, candle and darts created by TheShuEd for ss14, vials was drawn by Ubaser, evidence_markers by moomoobeef.", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/cc65477c04f7403ca8a457bd5bae69a01abadbf0, encryptokey was taken from Baystation12 at https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/radio.dmi and modified by lapatison. boxwidetoy, shelltoy, swab, flare, inflatable, trashbag, magazine, holo and forensic created by potato1234x (github) for ss14 based on toys.rsi, mouth_swab.rsi, flare.rsi, inflatable_wall.rsi, trashbag.rsi, caseless_pistol_mag.rsi, guardians.rsi and bureaucracy.rsi respectively, candle and darts created by TheShuEd for ss14, vials was drawn by Ubaser, evidence_markers by moomoobeef, ziplock by CaypenNow.", "size": { "x": 32, "y": 32 @@ -211,6 +211,9 @@ }, { "name": "bodycam" + }, + { + "name": "ziplock" } ] } diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/ziplock.png b/Resources/Textures/Objects/Storage/boxes.rsi/ziplock.png new file mode 100644 index 0000000000000000000000000000000000000000..e30b1632ee91938937ff05a636e45bf17b652460 GIT binary patch literal 152 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}L7py-ArY-_ z&pGloIPkb!bh^;WUDGq=VuJ@VVD_U zC<6{NG_fI~0ue<-1QkJoA_k0xBC#Thg@9ne9*`iQ#9$OrQF$}6R&?d%y_c8YA7_1Q zpS|}zXYYO1x&V;8{kgn!SPFnNo`4_X z6{c}T{8k*B#$jdxfFg<9uYy1K45IaYvHg`_dOZM)Sy63ve6hvv1)yUy0P^?0*fb9UASvow z`@mQCp^4`uNg&9uGcn1|&Nk+9SjOUl{-OWr@Hh0;_l(8q{wNRKos+;6rV8ldy0Owz z(}jF`W(JeRp&R{qi2rfmU!TJ;gp(Kmm5I1s5m_f-n#TRsj}B0%?E` zvOzxB2#P=n*a3EfYETOrKoe*ICqM@{4K9Go;5xVgZi5G41dM~{UdP z6d+Yd3o?MrAqM0Kc|iV92owdyL5UC#5<>aVCa44|hpM4Es0sQWIt5*Tu0n&*J!lk~ zf_{hI!w5`*sjxDv4V%CW*ah~3!{C*0BD@;TgA3v9a1~q+AA{TB3-ERLHar49hi4Ih z5D^-ph8Q6X#0?2VqLBoIkE}zAkxHZUgRb+f=natP#6>iMMoK->`~sRLq)(kHo*Vn{;LcG6+e zdD1=7D>9j^O?D{Qg|tCDK{ym)H7&wDr6*;uGTJg8GHjVb znL{!cWyUB7MT6o-VNo_w8Yq`2<5Ub)hw4L3rj}5@qxMs0WMyP6Wy582WNT#4$d1qu znl{acmP#w5ouJ*Jy_Zv#bCKi7ZIf$}8dZdVy&)LYdbX%I9R8VMQ|8r>Q*nyQ)sn)#Z|n)kKvS`4iutvy=3T65Yu+7a4Yv^%sX zb>ww?bn(=Yu(!=O6^iuTp>)p_Y^{w=i^lS773}6Fm1Fpe-gF!>I zp{*g$u-szvGhed; zvo5pW&GpS$<~8QGEXWp~7V9lKEnZq0SaK{6Sl+dwSOr*ZvFf(^Xl-N7w{EeXveC4O zv)N}e%%C!Y7^RFWwrE>d+x51mZQt2h+X?JW*!^a2WS?Sx)P8cQ&Qi|OhNWW;>JChY zI)@QQx?`Nj^#uJBl~d&PK+RZLOLos~K(b5>qmrMN0})tOkySZ3_WICNY@+|jrX%s^&6b2i>5 zeqa0y%Z;^%^_=a@u3%4b9605ii3Ep)@`TAmhs0fpQ%O!ql}XcFH*PieWwLj2ZSq`7 zV9Mc?h17`D)-+sNT-qs~3@?S(ldh7UlRlVXkWrK|vf6I-?$tAVKYn8-l({mqQ$Q8{ zO!WzMg`0(=S&msXS#Pt$vrpzo=kRj+a`kh!z=6$;cwT88(J6|n-WB%w`m$h~4 zpmp)YIh_3ETV2tjiAU!0h1dxU-n=E9e!)6|Z;4?!H=SSy{V>ut&IOq{_dlbFb#!9eY1iCsp6Bajj|H zr?hX|zPbJE{X++w546-O*Ot`2Kgd0Jx6Z4syTu9enWavU5N9)I?I-1m1* z_?_rJ$vD~agVqoG+9++s?NEDe`%Fht$4F;X=in*dQ{7$mU2Q)a|9JSc+Uc4zvS-T9 z63!N$T{xF_ZuWe}`RNOZ7sk3{yB}PPym+f8xTpV;-=!;;JuhGEb?H5K#o@~7t9DmU zU1MD9xNd#Dz0azz?I)|B+WM{g+Xrk0I&awC=o(x)cy`EX=)z6+o0o6-+`4{y+3mqQ z%kSJBju{@g%f35#FZJHb`&swrA8dGtepviS>QUumrN{L@>;2q1Vm)$Z)P1z?N$8UY zW2~{~zhwUMVZ87u`Dx{Z>O|9|`Q+&->FRy-Sjp7DHsy69KwU-!MxeeuI@&cF4| zM9z%AmA zQ@aR-h~Sbp^(Yr|fQZP?CU)U8tL?pb4*2pkp%A^Y%Kpp+>WTs;aI5Pmx>${w} sJhs3Z!p825%wLA7fC{L9h=|A=Hy$hwr3kw7e*gdg07*qoM6N<$g3fzw00000 literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Storage/ziplocks.rsi/meta.json b/Resources/Textures/White/Objects/Storage/ziplocks.rsi/meta.json new file mode 100644 index 0000000000..d5d388118a --- /dev/null +++ b/Resources/Textures/White/Objects/Storage/ziplocks.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Maked by CaypenNow", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] +}