Adds the Head of Greytide stamp (#30189)

suggested changes from discord discussion, sprite change, add to refactored loot table

diff --git a/Resources/Locale/en-US/paper/stamp-component.ftl b/Resources/Locale/en-US/paper/stamp-component.ftl
index c7dc1a1bdacef326eae40531ab42b2a4c5807bf9..36be70d61fbce964c67fdfcc57bb0486a6096873 100644 (file)
--- 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 521dde5a65ebc4cb0d99f76f531498a7df62058a..58586f321682468775b4adc4da88da36620e6124 100644 (file)
--- 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 fc362bb9c7293b526295ef71784965749f0dabc5..66ff215f30f4227799d9c40908bb71aebff24260 100644 (file)
--- 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 af1f3ce5d3db1610320259339b3a41d6ac11ede8..17ac88cefd602136e7b9646955070fa4264a6802 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.",
+  "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 (file)
index 0000000..067be84
Binary files /dev/null and b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-greytide.png differ

diff --git a/Resources/Textures/Objects/Misc/stamps.rsi/meta.json b/Resources/Textures/Objects/Misc/stamps.rsi/meta.json
index 8ce4882a2f8880c0fcbe9ee08ad79e0f0b02cc65..4e3d2cda76b9a3fbf4b4519efa0a9c20b6c78c23 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.",
+    "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 (file)
index 0000000..064c74a
Binary files /dev/null and b/Resources/Textures/Objects/Misc/stamps.rsi/stamp-greytide.png differ