From e964e9c98eece37fb7bd8f9154ec4e57a2be7943 Mon Sep 17 00:00:00 2001 From: cohanna <160202097+cohanna@users.noreply.github.com> Date: Fri, 20 Sep 2024 08:42:57 -0600 Subject: [PATCH] Psychologist's Stamp (#31881) * added sprite and began implementation * fixed sprite name, fixed meta files * silly whitespace * added paper-stamp file * figured out where to add the componet, added 'credits' * spelling is hard * hmm * GAHHHHH * how did i do this again --- Resources/Locale/en-US/paper/stamp-component.ftl | 1 + .../Entities/Objects/Misc/rubber_stamp.yml | 14 ++++++++++++++ .../Roles/Jobs/Wildcards/psychologist.yml | 6 +++--- .../Objects/Misc/bureaucracy.rsi/meta.json | 5 ++++- .../bureaucracy.rsi/paper_stamp-psychologist.png | Bin 0 -> 188 bytes .../Textures/Objects/Misc/stamps.rsi/meta.json | 5 ++++- .../Misc/stamps.rsi/stamp-psychologist.png | Bin 0 -> 308 bytes 7 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-psychologist.png create mode 100644 Resources/Textures/Objects/Misc/stamps.rsi/stamp-psychologist.png diff --git a/Resources/Locale/en-US/paper/stamp-component.ftl b/Resources/Locale/en-US/paper/stamp-component.ftl index 36be70d61f..a5910ed086 100644 --- a/Resources/Locale/en-US/paper/stamp-component.ftl +++ b/Resources/Locale/en-US/paper/stamp-component.ftl @@ -18,3 +18,4 @@ 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 diff --git a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml index 66ff215f30..8707e6fca8 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml @@ -284,3 +284,17 @@ stampState: "paper_stamp-greytide" - type: Sprite state: stamp-greytide + +- type: entity + name: psychologist's rubber stamp + parent: RubberStampBase + id: RubberStampPsychologist + suffix: DO NOT MAP + description: A rubber stamp for stamping important documents. Prescribe those treatments! + components: + - type: Stamp + stampedName: stamp-component-stamped-name-psychologist + stampedColor: "#5B97BC" + stampState: "paper_stamp-psychologist" + - type: Sprite + state: stamp-psychologist \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml index 57b8e39842..74e45a605b 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml @@ -18,6 +18,6 @@ shoes: ClothingShoesLeather id: PsychologistPDA ears: ClothingHeadsetMedical - #storage: - #back: - #- Stuff + storage: + back: + - RubberStampPsychologist diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json index 17ac88cefd..9005034d3f 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", + "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", "size": { "x": 32, "y": 32 @@ -227,6 +227,9 @@ }, { "name": "paper_stamp-greytide" + }, + { + "name": "paper_stamp-psychologist" } ] } diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-psychologist.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-psychologist.png new file mode 100644 index 0000000000000000000000000000000000000000..401e3e15c72a66f9bc5e1ba1c30a05288dfa10bb GIT binary patch literal 188 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>U|>mi z^mSxl*x1kgCy|wbfq}EYBeIx*K};2d89jqkJ}@va1bVtShD5k0ORz3Z5b0?OG~jY$ zGtS?a1>N2@bmQ gFugns%*+gL-f4AJOq!v^z`(%Z>FVdQ&MBb@0898cCjbBd 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 4e3d2cda76..9eafd62cb1 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.", + "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.", "size": { "x": 32, "y": 32 @@ -63,6 +63,9 @@ }, { "name": "stamp-greytide" + }, + { + "name": "stamp-psychologist" } ] } diff --git a/Resources/Textures/Objects/Misc/stamps.rsi/stamp-psychologist.png b/Resources/Textures/Objects/Misc/stamps.rsi/stamp-psychologist.png new file mode 100644 index 0000000000000000000000000000000000000000..08675d1591940092998aabf5ce3c3bea5263f119 GIT binary patch literal 308 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>U|>mi z^mSxl*x1kgCy|wbfq}EYBeIx*K};2d89jqkJ}@vaob+^Y42f`mJH?*QNs;H+>dwW@ zuWwtjcZVl@VtQpgp?kG(_yyw~r_Vk6;>LdFxcuCCp0j`W_|$X$)KCrZiV6~O4Xiu6 zMr-!jhjXTJFM8-$a%=6;=N$*0{*FH7kQgpLyE0U)!t#al#WZgL)`l(X+l<-|%@bN; zo!kFZdO