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 0000000000..e30b1632ee Binary files /dev/null and b/Resources/Textures/Objects/Storage/boxes.rsi/ziplock.png differ diff --git a/Resources/Textures/White/Objects/Storage/ziplocks.rsi/icon.png b/Resources/Textures/White/Objects/Storage/ziplocks.rsi/icon.png new file mode 100644 index 0000000000..4a44e3888e Binary files /dev/null and b/Resources/Textures/White/Objects/Storage/ziplocks.rsi/icon.png differ 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" + } + ] +}