Zip Locks and fixes (#212)
* fix: typing... * fix: переводы * add: zip locks * fix: ziplock fix * fix * fix: proto & textures to white * fix: security proto
This commit is contained in:
@@ -2,3 +2,8 @@ bwoink-user-title = Сообщение от администратора
|
|||||||
bwoink-system-starmute-message-no-other-users = *Система: Никто не доступен для получения вашего сообщения. Попробуйте обратиться к администраторам игры в Discord.
|
bwoink-system-starmute-message-no-other-users = *Система: Никто не доступен для получения вашего сообщения. Попробуйте обратиться к администраторам игры в Discord.
|
||||||
bwoink-system-messages-being-relayed-to-discord = Ваши сообщения передаются администраторам через Discord.
|
bwoink-system-messages-being-relayed-to-discord = Ваши сообщения передаются администраторам через Discord.
|
||||||
bwoink-system-starmute-message-no-other-users-webhook = *Система: Ваше сообщение было передано администраторам в Discord.
|
bwoink-system-starmute-message-no-other-users-webhook = *Система: Ваше сообщение было передано администраторам в Discord.
|
||||||
|
|
||||||
|
bwoink-system-typing-indicator = {$players} {$count ->
|
||||||
|
[one] печатает
|
||||||
|
*[other] печатают
|
||||||
|
}...
|
||||||
|
|||||||
@@ -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-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-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 }
|
chat-manager-entity-me-wrap-message = { $entityName } { $message }
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ pick-up-verb-get-data-text = Подобрать
|
|||||||
|
|
||||||
pick-up-verb-get-data-text-inventory = Взять в руку
|
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-Tiny = крошечный
|
||||||
item-component-size-Small = маленький
|
item-component-size-Small = маленький
|
||||||
|
|||||||
10
Resources/Locale/ru-RU/locales-new/autotranslate-56.ftl
Normal file
10
Resources/Locale/ru-RU/locales-new/autotranslate-56.ftl
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
ent-SmartFridge = умный ходольник
|
||||||
|
.desc = Хранит продукты холодными и свежими.
|
||||||
|
ent-TrainingBomb = тренировочная бомба
|
||||||
|
.desc = Бомба для оттачивания навыков сапера. Не содержит взрывчатку.
|
||||||
|
ent-Dresser = комод
|
||||||
|
.desc = Может хранить в себе вещи, идеально подходит для нижнего белья.
|
||||||
|
ent-ZipLock = зип пакет
|
||||||
|
.desc = Предназначен для хранения улик.
|
||||||
|
ent-BoxZipLocks = коробка зип пакетов
|
||||||
|
.desc = Заполнена зип пакетами. Обрадуйте детектива!
|
||||||
@@ -81,20 +81,3 @@
|
|||||||
layers:
|
layers:
|
||||||
- state: box_security
|
- state: box_security
|
||||||
- state: forensic
|
- 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
|
|
||||||
|
|||||||
@@ -138,6 +138,7 @@
|
|||||||
- id: BoxBodyCamera
|
- id: BoxBodyCamera
|
||||||
- id: VoiceRecorder
|
- id: VoiceRecorder
|
||||||
- id: ClothingEyesGlassesSecurity
|
- id: ClothingEyesGlassesSecurity
|
||||||
|
- id: BoxZipLocks
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
id: ClosetBombFilled
|
id: ClosetBombFilled
|
||||||
|
|||||||
31
Resources/Prototypes/White/Catalog/Fills/Boxes/security.yml
Normal file
31
Resources/Prototypes/White/Catalog/Fills/Boxes/security.yml
Normal file
@@ -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
|
||||||
25
Resources/Prototypes/White/Entities/Objects/Misc/ziplock.yml
Normal file
25
Resources/Prototypes/White/Entities/Objects/Misc/ziplock.yml
Normal file
@@ -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
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"version": 1,
|
"version": 1,
|
||||||
"license": "CC-BY-SA-3.0",
|
"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": {
|
"size": {
|
||||||
"x": 32,
|
"x": 32,
|
||||||
"y": 32
|
"y": 32
|
||||||
@@ -211,6 +211,9 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "bodycam"
|
"name": "bodycam"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "ziplock"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
BIN
Resources/Textures/Objects/Storage/boxes.rsi/ziplock.png
Normal file
BIN
Resources/Textures/Objects/Storage/boxes.rsi/ziplock.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 152 B |
BIN
Resources/Textures/White/Objects/Storage/ziplocks.rsi/icon.png
Normal file
BIN
Resources/Textures/White/Objects/Storage/ziplocks.rsi/icon.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.7 KiB |
@@ -0,0 +1,14 @@
|
|||||||
|
{
|
||||||
|
"version": 1,
|
||||||
|
"license": "CC-BY-SA-3.0",
|
||||||
|
"copyright": "Maked by CaypenNow",
|
||||||
|
"size": {
|
||||||
|
"x": 32,
|
||||||
|
"y": 32
|
||||||
|
},
|
||||||
|
"states": [
|
||||||
|
{
|
||||||
|
"name": "icon"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user