From: Velken <8467292+Velken@users.noreply.github.com> Date: Mon, 3 Mar 2025 15:54:43 +0000 (-0300) Subject: Wizard's Magical Pen (#35623) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=7a89fe5d33072e4f2d460761dd2ac5c56a2a4617;p=space-station-14.git Wizard's Magical Pen (#35623) * wizard pen * description change --- 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 0000000000..3264870e3d Binary files /dev/null and b/Resources/Textures/Objects/Misc/pens.rsi/pen_wizard.png differ