From 7a89fe5d33072e4f2d460761dd2ac5c56a2a4617 Mon Sep 17 00:00:00 2001 From: Velken <8467292+Velken@users.noreply.github.com> Date: Mon, 3 Mar 2025 12:54:43 -0300 Subject: [PATCH] Wizard's Magical Pen (#35623) * wizard pen * description change --- .../Prototypes/Entities/Objects/Devices/pda.yml | 2 +- .../Prototypes/Entities/Objects/Misc/pen.yml | 14 ++++++++++++++ .../Textures/Objects/Misc/pens.rsi/meta.json | 5 ++++- .../Textures/Objects/Misc/pens.rsi/pen_wizard.png | Bin 0 -> 523 bytes 4 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/Objects/Misc/pens.rsi/pen_wizard.png diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 126aa7c5be..3ef18d1b2e 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -1465,7 +1465,7 @@ - type: Pda id: WizardIDCard penSlot: - startingItem: LuxuryPen + startingItem: PenWiz priority: -1 whitelist: tags: diff --git a/Resources/Prototypes/Entities/Objects/Misc/pen.yml b/Resources/Prototypes/Entities/Objects/Misc/pen.yml index 55117e6360..d62a10a663 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/pen.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/pen.yml @@ -119,3 +119,17 @@ 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 diff --git a/Resources/Textures/Objects/Misc/pens.rsi/meta.json b/Resources/Textures/Objects/Misc/pens.rsi/meta.json index 738bc09ee3..b2e088a95c 100644 --- a/Resources/Textures/Objects/Misc/pens.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/pens.rsi/meta.json @@ -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 index 0000000000000000000000000000000000000000..3264870e3d8eab0171fe860675e827a4a9632a1f GIT binary patch literal 523 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCilI0(?STSqf}e7exphD^OFYV^$P4)LL$Dc3N9?Vn+eP#glCR|MNaP&MCkr z1ynvsOU3|5@s$Mm1^-6|46X<6oB+yj7I;J!0~H(wVaDV6D^h@h5+$w?CBgY=CFO}l zsSE*$nRz98ey$-3rh0~YCPMd@H3QXbOO5bM^YqkW-~e)18Kf9l85n^qFCdnNvO&Jn zU}Of1GXdF#j7$syKspMDGuv6f;#oj82qXY8NI#55vy_3EfnfqW0}D`vfswHR;{u4O zARVj=ASO)#vO$0eXbuxtWss!>kOkFcXaEWbhU?FEEAD+3zXiz5@^o z0*`Cp2BpdG|JPsV^3`!ZbWF88^aSUXgo|uj>l-%;uUr2n(es!-t6$wgUMJ=WyV(}* z*Em$ZD6+fty(_Z|i{;d)0~438ILaW9bjoO7FN5NJFCT^plX>olyf9m#%kY8W-dUrZ TC4D=efn4C}>gTe~DWM4fC0L42 literal 0 HcmV?d00001 -- 2.51.2