diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/misc/pen.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/misc/pen.ftl index 8e83cad80a6..d7ed7fed1c9 100644 --- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/misc/pen.ftl +++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/misc/pen.ftl @@ -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 diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/misc/pen.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/misc/pen.ftl index e770460ff0d..85d1ebf4c30 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/misc/pen.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/misc/pen.ftl @@ -8,3 +8,5 @@ ent-QmPen = ручка КМ .desc = Отлично подойдет для добавления нулей к стоимости. ent-RdPen = ручка НР .desc = Исследуйте её. +ent-UEGPen = ручка ОПЗ + .desc = Данная ручка выдается высшей судейской коллегией ОПЗ магистратам. diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/pda.yml index 3337acbedb3..d44c1010a5e 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/pda.yml @@ -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 diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/pen.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/pen.yml index a2b17b5ea68..13ddea17e5c 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/pen.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/pen.yml @@ -69,4 +69,17 @@ - type: Sprite state: pen_rd - type: Item - heldPrefix: pen_rd \ No newline at end of file + 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 diff --git a/Resources/Textures/_Sunrise/Objects/Misc/pens.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Misc/pens.rsi/meta.json index a2a8adbf7d4..3025af89ab9 100644 --- a/Resources/Textures/_Sunrise/Objects/Misc/pens.rsi/meta.json +++ b/Resources/Textures/_Sunrise/Objects/Misc/pens.rsi/meta.json @@ -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 @@ -22,6 +22,9 @@ { "name": "pen_rd" }, + { + "name": "pen_ueg" + }, { "name": "pen_hop" }, @@ -32,6 +35,14 @@ { "name": "pen-inhand-right", "directions": 4 + }, + { + "name": "pen_ueg-inhand-left", + "directions": 4 + }, + { + "name": "pen_ueg-inhand-right", + "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/_Sunrise/Objects/Misc/pens.rsi/pen_ueg-inhand-left.png b/Resources/Textures/_Sunrise/Objects/Misc/pens.rsi/pen_ueg-inhand-left.png new file mode 100644 index 00000000000..ac73b88e2bd Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Misc/pens.rsi/pen_ueg-inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Misc/pens.rsi/pen_ueg-inhand-right.png b/Resources/Textures/_Sunrise/Objects/Misc/pens.rsi/pen_ueg-inhand-right.png new file mode 100644 index 00000000000..49acea1a1e4 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Misc/pens.rsi/pen_ueg-inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Misc/pens.rsi/pen_ueg.png b/Resources/Textures/_Sunrise/Objects/Misc/pens.rsi/pen_ueg.png new file mode 100644 index 00000000000..92ed705d0f6 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Misc/pens.rsi/pen_ueg.png differ