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

diff --git a/Resources/Locale/en-US/paper/stamp-component.ftl b/Resources/Locale/en-US/paper/stamp-component.ftl
index 36be70d61fbce964c67fdfcc57bb0486a6096873..a5910ed086f49cb510be08cdb224daba768ba1fe 100644 (file)
--- 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 66ff215f30f4227799d9c40908bb71aebff24260..8707e6fca8998daf3b73fb3f734d0acab443cd2b 100644 (file)
--- 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 57b8e3984228a99bdcebfda9abf8191e374912e5..74e45a605b287ead82d2939f439d19bdc3d061f9 100644 (file)
--- 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 17ac88cefd602136e7b9646955070fa4264a6802..9005034d3fd19191dacc5d138face3f3d39a36b4 100644 (file)
--- 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 (file)
index 0000000..401e3e1
Binary files /dev/null and b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-psychologist.png differ

diff --git a/Resources/Textures/Objects/Misc/stamps.rsi/meta.json b/Resources/Textures/Objects/Misc/stamps.rsi/meta.json
index 4e3d2cda76b9a3fbf4b4519efa0a9c20b6c78c23..9eafd62cb19a597a693b450697aa6d08548360a7 100644 (file)
--- 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 (file)
index 0000000..08675d1
Binary files /dev/null and b/Resources/Textures/Objects/Misc/stamps.rsi/stamp-psychologist.png differ