Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ручка магистрата #762

Merged
merged 1 commit into from
Dec 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@ ent-QmPen = pen-Qm-name
.desc = pen-Qm-description
ent-RdPen = pen-Rd-name
.desc = pen-Rd-description
ent-UEGPen = pen-UEG-name
.desc = pen-UEG-description
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@ ent-QmPen = ручка КМ
.desc = Отлично подойдет для добавления нулей к стоимости.
ent-RdPen = ручка НР
.desc = Исследуйте её.
ent-UEGPen = ручка ОПЗ
.desc = Данная ручка выдается высшей судейской коллегией ОПЗ магистратам.
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,7 @@
id: MagistratIDCard
state: pda-captain
penSlot:
startingItem: Pen
priority: -1
whitelist:
tags:
- Write
startingItem: UEGPen
- type: PdaBorderColor
borderColor: "#7C5D00"
- type: Icon
Expand Down
15 changes: 14 additions & 1 deletion Resources/Prototypes/_Sunrise/Entities/Objects/Misc/pen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,17 @@
- type: Sprite
state: pen_rd
- type: Item
heldPrefix: pen_rd
heldPrefix: pen_rd

- type: entity
name: pen-UEG-name
parent: [BaseAdvancedPen, BaseCentcommContraband]
id: UEGPen
description: pen-UEG-description
components:
- type: Sprite
state: pen_ueg
sprite: _Sunrise/Objects/Misc/pens.rsi
- type: Item
sprite: _Sunrise/Objects/Misc/pens.rsi
heldPrefix: pen_ueg
15 changes: 13 additions & 2 deletions Resources/Textures/_Sunrise/Objects/Misc/pens.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Sprited by discord: Mascot_valera",
"copyright": "Sprited by discord: Mascot_valera and fr1zya",
"size": {
"x": 32,
"y": 32
Expand All @@ -22,6 +22,9 @@
{
"name": "pen_rd"
},
{
"name": "pen_ueg"
},
{
"name": "pen_hop"
},
Expand All @@ -32,6 +35,14 @@
{
"name": "pen-inhand-right",
"directions": 4
},
{
"name": "pen_ueg-inhand-left",
"directions": 4
},
{
"name": "pen_ueg-inhand-right",
"directions": 4
}
]
}
}
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