Skip to content

Commit

Permalink
Планшет ID карт, фикс шлемов ОБР (#525)
Browse files Browse the repository at this point in the history
## Описание 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
FrisKisDr authored Sep 25, 2024
1 parent 8d32369 commit f35939a
Show file tree
Hide file tree
Showing 14 changed files with 180 additions and 0 deletions.
3 changes: 3 additions & 0 deletions Resources/Locale/ru-RU/ADT/personalization.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -346,3 +346,6 @@ ent-ADTOwlScimitar = Совиный клинок
ent-ADTClothingUniformZoroJumpsuit = легендарный деловой костюм
.desc = Легендарный, поношенный костюм. Весь белый с позолотой. От него пахнет ванилью...
.suffix = Именное, Rip_Zoro.
ent-ADTPlushieEmma = плюшевая Эмма
.desc = Кажется, она хочет заставить вас работать.
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 Resources/Prototypes/ADT/Entities/Objects/Devices/clipboard.yml
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
Original file line number Diff line number Diff line change
Expand Up @@ -927,6 +927,23 @@
sprite: ADT/Personalization/toys.rsi
state: plushie_liexer

- type: entity
parent: BasePlushie
id: ADTPlushieEmma
name: Emma
description: No
components:
- type: Sprite
sprite: ADT/Personalization/toys.rsi
state: plushie_emma
scale: 0.9, 0.9
- type: EmitSoundOnUse
sound:
path: /Audio/Items/Toys/rawr.ogg
- type: EmitSoundOnActivate
sound:
path: /Audio/Items/Toys/rawr.ogg

#Bolper
- type: entity
name: Bolper's katana
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@
- id: ClothingEyesHudCommand
- id: ClothingOuterCoatHOP # Corvax-Resprite
- id: PrinterDocFlatpack # Corvax-Printer
- id: ADTHoPClipboard #ADT-Tweak

- type: entity
id: LockerHeadOfPersonnelFilled
Expand Down
68 changes: 68 additions & 0 deletions Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -551,6 +551,23 @@
components:
- type: Sprite
sprite: Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi
- type: ToggleableLightVisuals
spriteLayer: light
clothingVisuals:
head:
- state: equipped-HELMET
- state: equipped-HELMET-unshaded
shader: unshaded
- state: equipped-HELMET-light
shader: unshaded
- type: Clothing
clothingVisuals:
head:
- state: equipped-HELMET
- state: equipped-HELMET-unshaded
shader: unshaded
- type: PointLight
color: "#fff7cd"

#ERT Chaplain Hardsuit
- type: entity
Expand Down Expand Up @@ -618,6 +635,23 @@
components:
- type: Sprite
sprite: Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi
- type: ToggleableLightVisuals
spriteLayer: light
clothingVisuals:
head:
- state: equipped-HELMET
- state: equipped-HELMET-unshaded
shader: unshaded
- state: equipped-HELMET-light
shader: unshaded
- type: Clothing
clothingVisuals:
head:
- state: equipped-HELMET
- state: equipped-HELMET-unshaded
shader: unshaded
- type: PointLight
color: "#fff7cd"

#ERT Security Hardsuit
- type: entity
Expand All @@ -628,6 +662,23 @@
components:
- type: Sprite
sprite: Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi
- type: ToggleableLightVisuals
spriteLayer: light
clothingVisuals:
head:
- state: equipped-HELMET
- state: equipped-HELMET-unshaded
shader: unshaded
- state: equipped-HELMET-light
shader: unshaded
- type: Clothing
clothingVisuals:
head:
- state: equipped-HELMET
- state: equipped-HELMET-unshaded
shader: unshaded
- type: PointLight
color: "#fff7cd"

#ERT Janitor Hardsuit
- type: entity
Expand All @@ -638,6 +689,23 @@
components:
- type: Sprite
sprite: Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi
- type: ToggleableLightVisuals
spriteLayer: light
clothingVisuals:
head:
- state: equipped-HELMET
- state: equipped-HELMET-unshaded
shader: unshaded
- state: equipped-HELMET-light
shader: unshaded
- type: Clothing
clothingVisuals:
head:
- state: equipped-HELMET
- state: equipped-HELMET-unshaded
shader: unshaded
- type: PointLight
color: "#fff7cd"


#ADT ert's end
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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 Resources/Textures/ADT/Objects/Devices/hop_clipboard.rsi/meta.json
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
}
]
}
3 changes: 3 additions & 0 deletions Resources/Textures/ADT/Personalization/toys.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.

0 comments on commit f35939a

Please sign in to comment.