-
Notifications
You must be signed in to change notification settings - Fork 58
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Планшет ID карт, фикс шлемов ОБР (#525)
## Описание PR <!-- Что вы изменили в этом пулл реквесте? --> Добавил планшет ID карт для ХоПа, подобный тому, что есть у КМа. Фиксанул шлемы ОБР. Теперь вместо них не появляется шлем синдиката. И добавил плюшку Эммы UwU ## Почему / Баланс Подобная штука с планшетом есть в СС13, но более сложная, ведь планшет там - это портативный компьютер с кучей программ. Идем по легкому пути **Ссылка на публикацию в Discord** <!-- Укажите ссылки на соответствующие обсуждения, проблемы, баги, заказы в разработку или предложения - [Баги](https://discord.com/channels/901772674865455115/1288143870785355808) - Планшет и плюшку сам захотел ## Требования <!-- В связи с наплывом ПР'ов нам необходимо убедиться, что ПР'ы следуют правильным рекомендациям. Пожалуйста, уделите время прочтению, если делаете пулл реквест (ПР) впервые. Отметьте поля ниже, чтобы подтвердить, что Вы действительно видели их (поставьте X в скобках, например [X]): --> - [x] Я прочитал(а) и следую [Руководство по созданию пулл реквестов](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html). Я понимаю, что в противном случае мой ПР может быть закрыт по усмотрению мейнтейнера. - [x] Я добавил скриншоты/видео к этому пулл реквесту, демонстрирующие его изменения в игре, **или** этот пулл реквест не требует демонстрации в игре **Чейнджлог** :cl: Friskis - add: ГП получил планшет ID карт - fix: Пофикшено отображение шлемов ОБР
- Loading branch information
Showing
14 changed files
with
180 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 2 additions & 0 deletions
2
Resources/Locale/ru-RU/ADT/prototypes/Entities/Devices/clipboard.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
ent-ADTHoPClipboard = планшет ID карт | ||
.desc = Портативный планшет для выдачи доступов на ID карты. |
56 changes: 56 additions & 0 deletions
56
Resources/Prototypes/ADT/Entities/Objects/Devices/clipboard.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
- type: entity | ||
id: ADTHoPClipboard | ||
parent: [BaseItem, BaseGrandTheftContraband] | ||
name: access digi-board | ||
description: A portable tablet for granting access. | ||
components: | ||
- type: Sprite | ||
sprite: ADT/Objects/Devices/hop_clipboard.rsi | ||
layers: | ||
- state: hop_clipboard | ||
- state: hop_clipboard-unshaded | ||
shader: unshaded | ||
- type: Item | ||
sprite: ADT/Objects/Devices/hop_clipboard.rsi | ||
size: Normal | ||
- type: Clothing | ||
slots: [belt] | ||
quickEquip: false | ||
sprite: ADT/Objects/Devices/hop_clipboard.rsi | ||
- type: IdCardConsole | ||
privilegedIdSlot: | ||
name: id-card-console-privileged-id | ||
ejectSound: /Audio/Machines/id_swipe.ogg | ||
insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg | ||
ejectOnBreak: true | ||
swap: false | ||
whitelist: | ||
components: | ||
- IdCard | ||
targetIdSlot: | ||
name: id-card-console-target-id | ||
ejectSound: /Audio/Machines/id_swipe.ogg | ||
insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg | ||
ejectOnBreak: true | ||
swap: false | ||
whitelist: | ||
components: | ||
- IdCard | ||
- type: ActivatableUI | ||
key: enum.IdCardConsoleUiKey.Key | ||
- type: UserInterface | ||
interfaces: | ||
enum.IdCardConsoleUiKey.Key: | ||
type: IdCardConsoleBoundUserInterface | ||
- type: CrewManifestViewer | ||
ownerKey: enum.IdCardConsoleUiKey.Key | ||
- type: ItemSlots | ||
- type: ContainerContainer | ||
containers: | ||
board: !type:Container | ||
IdCardConsole-privilegedId: !type:ContainerSlot | ||
IdCardConsole-targetId: !type:ContainerSlot | ||
- type: MeleeWeapon | ||
damage: | ||
types: | ||
Blunt: 10 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file added
BIN
+648 Bytes
Resources/Textures/ADT/Objects/Devices/hop_clipboard.rsi/equipped-BELT.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+672 Bytes
...urces/Textures/ADT/Objects/Devices/hop_clipboard.rsi/hop_clipboard-unshaded.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+679 Bytes
Resources/Textures/ADT/Objects/Devices/hop_clipboard.rsi/hop_clipboard.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+782 Bytes
Resources/Textures/ADT/Objects/Devices/hop_clipboard.rsi/inhand-left.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+777 Bytes
Resources/Textures/ADT/Objects/Devices/hop_clipboard.rsi/inhand-right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 30 additions & 0 deletions
30
Resources/Textures/ADT/Objects/Devices/hop_clipboard.rsi/meta.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
{ | ||
"version": 1, | ||
"license": "CC-BY-SA-3.0", | ||
"copyright": "Clipboard sprites are by Endecc (Github) for SS14 Wizard's Den, taken from https://github.com/space-wizards/space-station-14/pull/21023, hop_clipboard is a modified version of the qm_clipboard.rsi from Friskis", | ||
"size": | ||
{ | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"states": [ | ||
{ | ||
"name": "hop_clipboard" | ||
}, | ||
{ | ||
"name": "hop_clipboard-unshaded" | ||
}, | ||
{ | ||
"name": "equipped-BELT", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "inhand-left", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "inhand-right", | ||
"directions": 4 | ||
} | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -181,6 +181,9 @@ | |
{ | ||
"name": "pochita-inhand-left", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "plushie_emma" | ||
} | ||
] | ||
} |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.