From: Brassica Prime <114382089+Pumkin69@users.noreply.github.com> Date: Thu, 27 Feb 2025 08:26:30 +0000 (-0700) Subject: Wizard Stamp (#35552) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=f850b69e897dcc46e2b0dd8f7e01d1f0ff42f767;p=space-station-14.git Wizard Stamp (#35552) * First go around adds everything necessary to work * fixes issues with attribution and a whitespace * Update Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> * Update Resources/Textures/Objects/Misc/stamps.rsi/meta.json Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> --------- Co-authored-by: Pumkin69 Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> --- diff --git a/Resources/Locale/en-US/paper/stamp-component.ftl b/Resources/Locale/en-US/paper/stamp-component.ftl index a5910ed086..6521deafd9 100644 --- a/Resources/Locale/en-US/paper/stamp-component.ftl +++ b/Resources/Locale/en-US/paper/stamp-component.ftl @@ -18,4 +18,5 @@ stamp-component-stamped-name-trader = Trader stamp-component-stamped-name-syndicate = Syndicate stamp-component-stamped-name-ce = Chief Engineer stamp-component-stamped-name-greytide = Greytide -stamp-component-stamped-name-psychologist = Psychologist \ No newline at end of file +stamp-component-stamped-name-psychologist = Psychologist +stamp-component-stamped-name-wizard = Wizard diff --git a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml index c994c1fb10..0437d40baf 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml @@ -298,3 +298,17 @@ stampState: "paper_stamp-psychologist" - type: Sprite state: stamp-psychologist + +- type: entity + name: wizard's rubber stamp + parent: [RubberStampBase, BaseMagicalContraband] + id: RubberStampWizard + description: A chaotic wizard stamp for serving unchaotic paperwork, how ironic. + categories: [ DoNotMap ] + components: + - type: Stamp + stampedName: Wizard + stampedColor: "#881bc1" + stampState: "paper_stamp-wizard" + - type: Sprite + state: stamp-wizard diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json index bc9ba80adf..d92fe17b66 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. paper_stamp-greytide by ubaser. paper_stamp-psychologist by clinux. syndicate_card by Aserovich", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. paper_stamp-syndicate by Veritius. paper_receipt, paper_receipt_horizontal by eoineoineoin. paper_stamp-greytide by ubaser. paper_stamp-psychologist by clinux. syndicate_card by Aserovich. paper_stamp_wizard by brassicaprime69 (Discord)", "size": { "x": 32, "y": 32 @@ -233,6 +233,9 @@ }, { "name": "paper_stamp-psychologist" + }, + { + "name": "paper_stamp-wizard" } ] } diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-wizard.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-wizard.png new file mode 100644 index 0000000000..4c73559cc6 Binary files /dev/null and b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-wizard.png differ diff --git a/Resources/Textures/Objects/Misc/stamps.rsi/meta.json b/Resources/Textures/Objects/Misc/stamps.rsi/meta.json index 9eafd62cb1..4057c02712 100644 --- a/Resources/Textures/Objects/Misc/stamps.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/stamps.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. New stamp- icons taken from tgstation at https://github.com/tgstation/tgstation/commit/fb1012102257b7b0a08d861fd2b8ba963c416e93. stamp-warden is a darker version of stamp-hos. stamp-lawyer is a darker version of stamp-cap. paper_stamp-greytide is a grey and shaded in version of stamp-hos. paper_stamp-psychologist is a recolored stamp-cmo.", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. New stamp- icons taken from tgstation at https://github.com/tgstation/tgstation/commit/fb1012102257b7b0a08d861fd2b8ba963c416e93. stamp-warden is a darker version of stamp-hos. stamp-lawyer is a darker version of stamp-cap. paper_stamp-greytide is a grey and shaded in version of stamp-hos. paper_stamp-psychologist is a recolored stamp-cmo. paper_stamp-wizard is a recolored stamp-rd by brassicaprime69 (Discord)", "size": { "x": 32, "y": 32 @@ -66,6 +66,9 @@ }, { "name": "stamp-psychologist" + }, + { + "name": "stamp-wizard" } ] } diff --git a/Resources/Textures/Objects/Misc/stamps.rsi/stamp-wizard.png b/Resources/Textures/Objects/Misc/stamps.rsi/stamp-wizard.png new file mode 100644 index 0000000000..13646dd9bd Binary files /dev/null and b/Resources/Textures/Objects/Misc/stamps.rsi/stamp-wizard.png differ