From: Ubaser <134914314+UbaserB@users.noreply.github.com> Date: Sat, 16 Dec 2023 08:21:24 +0000 (+1100) Subject: Luxury pens (#22542) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=6e38fed89625cbd93c5bfd27ba0985b59cd9cf60;p=space-station-14.git Luxury pens (#22542) * add * spawns * fix * spacing * cut down a bit * componenets sdsstsdsds --- diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 76096f0396..66e3656d6b 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -376,6 +376,8 @@ - type: Pda id: LibrarianIDCard state: pda-library + penSlot: + startingItem: LuxuryPen - type: PdaBorderColor borderColor: "#858585" - type: Icon @@ -390,6 +392,8 @@ - type: Pda id: LawyerIDCard state: pda-lawyer + penSlot: + startingItem: LuxuryPen - type: PdaBorderColor borderColor: "#6f6192" - type: Icon @@ -823,6 +827,8 @@ - type: Pda id: ReporterIDCard state: pda-reporter + penSlot: + startingItem: LuxuryPen - type: PdaBorderColor borderColor: "#3f3f74" - type: Icon diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml index 85c3d67467..088f333f18 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml @@ -250,6 +250,19 @@ materialComposition: Steel: 25 +#TODO: I want the luxury pen to write a cool font like Merriweather in the future. + +- type: entity + name: luxury pen + parent: Pen + id: LuxuryPen + description: A fancy and expensive pen that you only deserve to own if you're qualified to handle vast amounts of paperwork. + components: + - type: Sprite + state: luxury_pen + - type: Item + heldPrefix: luxury_pen + - type: entity name: Cybersun pen parent: BaseItem diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/luxury_pen.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/luxury_pen.png new file mode 100644 index 0000000000..c3e203170b Binary files /dev/null and b/Resources/Textures/Objects/Misc/bureaucracy.rsi/luxury_pen.png differ diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json index 523f7bc42b..c22a4d1e4a 100644 --- a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/bureaucracy.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. paper_stamp-syndicate by Veritius. paper_receipt, paper_receipt_horizontal by eoineoineoin. pen_centcom is a resprited version of pen_cap by PuroSlavKing (Github). New stamp- icons taken from tgstation at https://github.com/tgstation/tgstation/commit/fb1012102257b7b0a08d861fd2b8ba963c416e93. stamp-warden is a darker version of stamp-hos.", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. paper_stamp-syndicate by Veritius. paper_receipt, paper_receipt_horizontal by eoineoineoin. pen_centcom is a resprited version of pen_cap by PuroSlavKing (Github). New stamp- icons taken from tgstation at https://github.com/tgstation/tgstation/commit/fb1012102257b7b0a08d861fd2b8ba963c416e93. stamp-warden is a darker version of stamp-hos. Luxury pen is drawn by Ubaser.", "size": { "x": 32, "y": 32 @@ -222,6 +222,9 @@ { "name": "overpriced_pen" }, + { + "name": "luxury_pen" + }, { "name": "pen_blue" },