]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Wizard Stamp (#35552)
authorBrassica Prime <114382089+Pumkin69@users.noreply.github.com>
Thu, 27 Feb 2025 08:26:30 +0000 (01:26 -0700)
committerGitHub <noreply@github.com>
Thu, 27 Feb 2025 08:26:30 +0000 (11:26 +0300)
* 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 <judeb@DESKTOP-M4B8G5D>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Resources/Locale/en-US/paper/stamp-component.ftl
Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml
Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-wizard.png [new file with mode: 0644]
Resources/Textures/Objects/Misc/stamps.rsi/meta.json
Resources/Textures/Objects/Misc/stamps.rsi/stamp-wizard.png [new file with mode: 0644]

index a5910ed086f49cb510be08cdb224daba768ba1fe..6521deafd98156c091974197c7c51a53fd1f90ca 100644 (file)
@@ -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
index c994c1fb109cee8e794ae1fcb20203e1c480e049..0437d40bafadf151abe0b7f0d17cbdf7639a81bd 100644 (file)
     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
index bc9ba80adfd5ebf77cfc9c03ce8d2818056f5bbd..d92fe17b66e025d5ef76f7c5afcf9cb6e7e0a0e8 100644 (file)
@@ -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
     },
     {
       "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 (file)
index 0000000..4c73559
Binary files /dev/null and b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-wizard.png differ
index 9eafd62cb19a597a693b450697aa6d08548360a7..4057c0271225f115ea30800611d85927bcec2cbe 100644 (file)
@@ -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 (file)
index 0000000..13646dd
Binary files /dev/null and b/Resources/Textures/Objects/Misc/stamps.rsi/stamp-wizard.png differ