]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Wizard's Magical Pen (#35623)
authorVelken <8467292+Velken@users.noreply.github.com>
Mon, 3 Mar 2025 15:54:43 +0000 (12:54 -0300)
committerGitHub <noreply@github.com>
Mon, 3 Mar 2025 15:54:43 +0000 (16:54 +0100)
* wizard pen

* description change

Resources/Prototypes/Entities/Objects/Devices/pda.yml
Resources/Prototypes/Entities/Objects/Misc/pen.yml
Resources/Textures/Objects/Misc/pens.rsi/meta.json
Resources/Textures/Objects/Misc/pens.rsi/pen_wizard.png [new file with mode: 0644]

index 126aa7c5bebe757c66502843b35b647d42fa4905..3ef18d1b2e5f9990af98564332aa296d752f9e71 100644 (file)
   - type: Pda
     id: WizardIDCard
     penSlot:
-      startingItem: LuxuryPen
+      startingItem: PenWiz
       priority: -1
       whitelist:
         tags:
index 55117e636024344c81cb36c169d1c4d06c4ef989..d62a10a6636c221aa19affdd83c9b20352e25e6a 100644 (file)
   components:
   - type: Sprite
     state: pen_hop
+
+- type: entity
+  name: wizard's magical pen
+  parent: [ PenEmbeddable, BaseMagicalContraband ]
+  id: PenWiz
+  description: A luxurious fountain pen. Seems to have a magical crystal eraser.
+  components:
+  - type: Sprite
+    state: pen_wizard
+  - type: Tag
+    tags:
+    - WriteIgnoreStamps
+    - Write
+    - Pen
index 738bc09ee3332e358a284592c7bfcb1c694d983e..b2e088a95cde9f65c38658d6656158b34d243dc6 100644 (file)
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. pen_centcom is a resprited version of pen_cap by PuroSlavKing (Github). Luxury pen is drawn by Ubaser.",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. pen_centcom is a resprited version of pen_cap by PuroSlavKing (Github). Luxury pen is drawn by Ubaser. pen_wizard based on overpriced_pen by Velken.",
   "size": {
     "x": 32,
     "y": 32
@@ -31,6 +31,9 @@
     {
       "name": "pen_red"
     },
+       {
+         "name": "pen_wizard"
+       },
     {
       "name": "pen-inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Objects/Misc/pens.rsi/pen_wizard.png b/Resources/Textures/Objects/Misc/pens.rsi/pen_wizard.png
new file mode 100644 (file)
index 0000000..3264870
Binary files /dev/null and b/Resources/Textures/Objects/Misc/pens.rsi/pen_wizard.png differ