From adea4c91dec874c74a140ebe40fb2a6561546787 Mon Sep 17 00:00:00 2001 From: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> Date: Sun, 25 Aug 2024 03:35:22 -0700 Subject: [PATCH] Adds the Head of Greytide stamp (#30189) suggested changes from discord discussion, sprite change, add to refactored loot table --- Resources/Locale/en-US/paper/stamp-component.ftl | 1 + .../Markers/Spawners/Random/maintenance.yml | 1 + .../Entities/Objects/Misc/rubber_stamp.yml | 13 +++++++++++++ .../Objects/Misc/bureaucracy.rsi/meta.json | 5 ++++- .../bureaucracy.rsi/paper_stamp-greytide.png | Bin 0 -> 168 bytes .../Textures/Objects/Misc/stamps.rsi/meta.json | 5 ++++- .../Objects/Misc/stamps.rsi/stamp-greytide.png | Bin 0 -> 1219 bytes 7 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-greytide.png create mode 100644 Resources/Textures/Objects/Misc/stamps.rsi/stamp-greytide.png diff --git a/Resources/Locale/en-US/paper/stamp-component.ftl b/Resources/Locale/en-US/paper/stamp-component.ftl index c7dc1a1bda..36be70d61f 100644 --- a/Resources/Locale/en-US/paper/stamp-component.ftl +++ b/Resources/Locale/en-US/paper/stamp-component.ftl @@ -17,3 +17,4 @@ stamp-component-stamped-name-warden = Warden 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 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index 521dde5a65..58586f3216 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -161,6 +161,7 @@ - id: CigarGold - id: ClothingUniformJumpsuitFamilyGuy - id: WristwatchGold + - id: RubberStampGreytide - type: entity name: Maint Loot Spawner diff --git a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml index fc362bb9c7..66ff215f30 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml @@ -271,3 +271,16 @@ stampState: "paper_stamp-detective" - type: Sprite state: stamp-detective + +- type: entity + name: greytide's rubber stamp + parent: RubberStampBase + id: RubberStampGreytide + description: A rubber stamp for stamping important documents. The tide washes over you, just looking at it... + components: + - type: Stamp + stampedName: stamp-component-stamped-name-greytide + stampedColor: "#323232" + stampState: "paper_stamp-greytide" + - type: Sprite + state: stamp-greytide diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json index af1f3ce5d3..17ac88cefd 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.", + "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", "size": { "x": 32, "y": 32 @@ -224,6 +224,9 @@ }, { "name": "paper_stamp-generic" + }, + { + "name": "paper_stamp-greytide" } ] } diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-greytide.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-greytide.png new file mode 100644 index 0000000000000000000000000000000000000000..067be8405becf99fc333e85881a38792ce6af2dd GIT binary patch literal 168 zcmeAS@N?(olHy`uVBq!ia0vp^3Lq@N1|*eVE!z&H@;zM~Lo)8Yy}FV2fC7(8;A!p+ z-R234LwFvxnMU+8Dh0WiEb(v`__^Nk!UAhaMJAvYh6Cwm&YX$b9e#H6yQ`s1?IJ-Q zf4|tIi7s5tvOaF_t`iYQwk?+P*4g-FV*NYw`q#7S#s943*vAOcX&fshWjpQCe90vs No~Nsy%Q~loCIAbTJktOG literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/stamps.rsi/meta.json b/Resources/Textures/Objects/Misc/stamps.rsi/meta.json index 8ce4882a2f..4e3d2cda76 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.", + "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.", "size": { "x": 32, "y": 32 @@ -60,6 +60,9 @@ }, { "name": "stamp-warden" + }, + { + "name": "stamp-greytide" } ] } diff --git a/Resources/Textures/Objects/Misc/stamps.rsi/stamp-greytide.png b/Resources/Textures/Objects/Misc/stamps.rsi/stamp-greytide.png new file mode 100644 index 0000000000000000000000000000000000000000..064c74a2a87965a8563591031f516e7ac2757667 GIT binary patch literal 1219 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}e5nzhX}-P; zT0k}j5QD&_;K@Lev%n*=n1MlK76>znTPbd0U|`P642dX-@b$4u&d=3LOvz75)vL%Y z0PC`;umUo3Q%e#RDspr3imfVamB1>jfNYSkzLEl1NlCV?QiN}Sf^&XRs)CuGfu4bq z9hZWFf=y9MnpKdC8&o@xXRDM^Qc_^0uU}qXu2*iXmtT~wZ)j<0sc&GUZ)BtkRH0j3 znOBlnp_^B%3^4>|j!SBBa#3bMNoIbY0?6FNr2NtnTO}osMQ{LdXG${Mo`TY%9I!1Z z$@-}|sky0nCB^!NdWQPg^p#|$AzYYO3=Ixo!03ZyfZ7bOYV#~8Nj3q7lxqdhJy8Dv z9hwZbx40xlA4!3}k%57Qu7Q!Rk)=M|e?aHkq$FFFWR~Qlf&&ijA8-gd=9Hj{g4Bb8 zASV+PvQ{~XdFi%F6}l;@X^EvdB}#UlzV7jc#>OT#`Vdv9x*?*dhT7<3vEK&dYpckh z)Z+Y{Qc$?t8JPji#1KWq07ORwRvpNq=sE&2@=Nl8DXJ(l*)y*swWy#7n7SY~LhZw? z0^KZx<)L|*C3Z$o1JHz#bRor#m19v!d45rL2skDX!H81{)EG#RBBfAB@&^Y$F#X$c z+33Ubk{wstCygb*40grS#W5s;^KGyp*I@&m5bx;@)A%@5f;+bVIUN7u{^!=T43A|# z>y})LjN-C-aY3oEcAD^;*GunSfAOfrWL|fZUhV%3UGJmPMS|aFu=YImD2?5JA-3}W>x1`o_kWJA znK!#c#^-9xpU#&3i+|c_@4vpA`CWtchkCv{j8oDa3M#uVh=2+ZPgg&ebxsLQ08}E3 AbN~PV literal 0 HcmV?d00001 -- 2.51.2