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

space-sunrise · Dec 2, 2024 · 4b2dadd · 4b2dadd
1 parent 4541daf
commit 4b2dadd
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 8 deletions.
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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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
     }
   ]
-}
+}
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
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
diff --git a/Resources/Textures/_Sunrise/Objects/Misc/pens.rsi/pen_ueg.png b/Resources/Textures/_Sunrise/Objects/Misc/pens.rsi/pen_ueg.png