Move stamps out of big mess (#22877)

* gigacommit

* Update honkbot.yml

* foxing

* merg

* bring back mime sound

* ;

* :trollface:

(cherry picked from commit 78965d1e368fa19549bfb043620c85d48188d78e)

Content.Shared/Paper/StampComponent.cs

@@ -32,8 +32,9 @@ public sealed partial class StampComponent : Component
     /// </summary>
     [DataField("stampedName")]
     public string StampedName { get; set; } = "stamp-component-stamped-name-default";
+
     /// <summary>
-    ///     Tne sprite state of the stamp to display on the paper from bureacracy.rsi.
+    ///     Tne sprite state of the stamp to display on the paper from paper Sprite path.
     /// </summary>
     [DataField("stampState")]
     public string StampState { get; set; } = "paper_stamp-generic";
@@ -44,6 +45,9 @@ public sealed partial class StampComponent : Component
     [DataField("stampedColor")]
     public Color StampedColor = Color.FromHex("#BB3232"); // StyleNano.DangerousRedFore
 
+    /// <summary>
+    /// The sound when stamp stamped
+    /// </summary>
     [DataField("sound")]
     public SoundSpecifier Sound = new SoundPathSpecifier("/Audio/Items/Stamp/thick_stamp_sub.ogg")
     {

Resources/Prototypes/Entities/Objects/Misc/paper.yml

@@ -648,268 +648,3 @@
         Blunt: 10
   - type: StealTarget
     stealGroup: BoxFolderQmClipboard
-
-# Stamps
-- type: entity
-  name: generic rubber stamp
-  parent: BaseItem
-  id: RubberStampBase
-  description: A rubber stamp for stamping important documents.
-  abstract: true
-  components:
-  - type: Stamp
-    stampedName: stamp-component-stamped-name-default
-    stampState: "paper_stamp-generic"
-    stampedColor: "#a23e3e"
-    sound:
-      path: /Audio/Items/Stamp/thick_stamp_sub.ogg
-      params:
-        volume: -2
-        maxDistance: 5
-  - type: Sprite
-    sprite: Objects/Misc/bureaucracy.rsi
-    state: stamp-mime
-  - type: Item
-    size: Tiny
-  - type: StealTarget
-    stealGroup: Stamp
-
-- type: entity
-  name: alternate rubber stamp
-  parent: RubberStampBase
-  id: RubberStampBaseAlt
-  abstract: true
-  components:
-  - type: Stamp
-    stampedName: stamp-component-stamped-name-default
-    stampState: "paper_stamp-generic"
-    sound:
-      path: /Audio/Items/Stamp/automatic_stamp.ogg
-      params:
-        volume: -2
-        maxDistance: 5
-
-- type: entity
-  name: captain's rubber stamp
-  parent: RubberStampBase
-  id: RubberStampCaptain
-  suffix: DO NOT MAP
-  components:
-  - type: Stamp
-    stampedName: stamp-component-stamped-name-captain
-    stampedColor: "#3681bb"
-    stampState: "paper_stamp-cap"
-  - type: Sprite
-    sprite: Objects/Misc/bureaucracy.rsi
-    state: stamp-cap
-
-- type: entity
-  name: CentCom rubber stamp
-  parent: RubberStampBase
-  id: RubberStampCentcom
-  suffix: DO NOT MAP
-  components:
-  - type: Stamp
-    stampedName: stamp-component-stamped-name-centcom
-    stampedColor: "#006600"
-    stampState: "paper_stamp-centcom"
-  - type: Sprite
-    sprite: Objects/Misc/bureaucracy.rsi
-    state: stamp-centcom
-
-- type: entity
-  name: chaplain's rubber stamp
-  parent: RubberStampBase
-  id: RubberStampChaplain
-  suffix: DO NOT MAP
-  components:
-  - type: Stamp
-    stampedName: stamp-component-stamped-name-chaplain
-    stampedColor: "#d70601"
-    stampState: "paper_stamp-chaplain"
-  - type: Sprite
-    sprite: Objects/Misc/bureaucracy.rsi
-    state: stamp-chaplain
-
-- type: entity
-  name: clown's rubber stamp
-  parent: RubberStampBase
-  id: RubberStampClown
-  suffix: DO NOT MAP
-  components:
-  - type: Stamp
-    stampedName: stamp-component-stamped-name-clown
-    stampedColor: "#ff33cc"
-    stampState: "paper_stamp-clown"
-  - type: Sprite
-    sprite: Objects/Misc/bureaucracy.rsi
-    state: stamp-clown
-  - type: Tag
-    tags:
-      - ClownRubberStamp
-
-- type: entity
-  name: chief engineer's rubber stamp
-  parent: RubberStampBase
-  id: RubberStampCE
-  suffix: DO NOT MAP
-  components:
-  - type: Stamp
-    stampedName: stamp-component-stamped-name-ce
-    stampedColor: "#c69b17"
-    stampState: "paper_stamp-ce"
-  - type: Sprite
-    sprite: Objects/Misc/bureaucracy.rsi
-    state: stamp-ce
-
-- type: entity
-  name: chief medical officer's rubber stamp
-  parent: RubberStampBase
-  id: RubberStampCMO
-  suffix: DO NOT MAP
-  components:
-  - type: Stamp
-    stampedName: stamp-component-stamped-name-cmo
-    stampedColor: "#33ccff"
-    stampState: "paper_stamp-cmo"
-  - type: Sprite
-    sprite: Objects/Misc/bureaucracy.rsi
-    state: stamp-cmo
-
-- type: entity
-  name: head of personnel's rubber stamp
-  parent: RubberStampBase
-  id: RubberStampHop
-  suffix: DO NOT MAP
-  components:
-  - type: Stamp
-    stampedName: stamp-component-stamped-name-hop
-    stampedColor: "#6ec0ea"
-    stampState: "paper_stamp-hop"
-  - type: Sprite
-    sprite: Objects/Misc/bureaucracy.rsi
-    state: stamp-hop
-
-- type: entity
-  name: head of security's rubber stamp
-  parent: RubberStampBase
-  id: RubberStampHos
-  suffix: DO NOT MAP
-  components:
-  - type: Stamp
-    stampedName: stamp-component-stamped-name-hos
-    stampedColor: "#cc0000"
-    stampState: "paper_stamp-hos"
-  - type: Sprite
-    sprite: Objects/Misc/bureaucracy.rsi
-    state: stamp-hos
-
-- type: entity
-  name: mime's rubber stamp
-  parent: RubberStampBase
-  id: RubberStampMime
-  suffix: DO NOT MAP
-  components:
-  - type: Stamp
-    stampedName: stamp-component-stamped-name-mime
-    stampedColor: "#777777"
-    stampState: "paper_stamp-mime"
-    # TODO remove sound from mime's rubber stamp
-  - type: Sprite
-    sprite: Objects/Misc/bureaucracy.rsi
-    state: stamp-mime
-
-- type: entity
-  name: logistics officer's rubber stamp # DeltaV - Logistics Department replacing Cargo
-  parent: RubberStampBase
-  id: RubberStampQm
-  suffix: DO NOT MAP
-  components:
-  - type: Stamp
-    stampedName: stamp-component-stamped-name-qm
-    stampedColor: "#a23e3e"
-    stampState: "paper_stamp-qm"
-  - type: Sprite
-    sprite: Objects/Misc/bureaucracy.rsi
-    state: stamp-qm
-
-- type: entity
-  name: mystagogue's rubber stamp # DeltaV - Epistemics Department replacing Science
-  parent: RubberStampBase
-  id: RubberStampRd
-  suffix: DO NOT MAP
-  components:
-  - type: Stamp
-    stampedName: stamp-component-stamped-name-rd
-    stampedColor: "#1f66a0"
-    stampState: "paper_stamp-rd"
-  - type: Sprite
-    sprite: Objects/Misc/bureaucracy.rsi
-    state: stamp-rd
-
-- type: entity
-  name: trader's rubber stamp
-  parent: RubberStampBase
-  id: RubberStampTrader
-  components:
-  - type: Stamp
-    stampedName: stamp-component-stamped-name-trader
-    stampedColor: "#000000"
-    stampState: "paper_stamp-trader"
-  - type: Sprite
-    sprite: Objects/Misc/bureaucracy.rsi
-    state: stamp-trader
-
-- type: entity
-  name: syndicate rubber stamp
-  parent: RubberStampBase
-  id: RubberStampSyndicate
-  suffix: DO NOT MAP
-  components:
-  - type: Stamp
-    stampedName: stamp-component-stamped-name-syndicate
-    stampedColor: "#850000"
-    stampState: "paper_stamp-syndicate"
-  - type: Sprite
-    sprite: Objects/Misc/bureaucracy.rsi
-    state: stamp-syndicate
-
-- type: entity
-  name: warden's rubber stamp
-  parent: RubberStampBase
-  id: RubberStampWarden
-  suffix: DO NOT MAP
-  components:
-  - type: Stamp
-    stampedName: stamp-component-stamped-name-warden
-    stampedColor: "#5b0000"
-    stampState: "paper_stamp-warden"
-  - type: Sprite
-    sprite: Objects/Misc/bureaucracy.rsi
-    state: stamp-warden
-
-- type: entity
-  name: APPROVED rubber stamp
-  parent: RubberStampBaseAlt
-  id: RubberStampApproved
-  components:
-  - type: Stamp
-    stampedName: stamp-component-stamped-name-approved
-    stampedColor: "#00be00"
-    stampState: "paper_stamp-ok"
-  - type: Sprite
-    sprite: Objects/Misc/bureaucracy.rsi
-    state: stamp-ok
-
-- type: entity
-  name: DENIED rubber stamp
-  parent: RubberStampBaseAlt
-  id: RubberStampDenied
-  components:
-  - type: Stamp
-    stampedName: stamp-component-stamped-name-denied
-    stampedColor: "#a23e3e"
-    stampState: "paper_stamp-deny"
-  - type: Sprite
-    sprite: Objects/Misc/bureaucracy.rsi
-    state: stamp-deny

Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml

@@ -0,0 +1,249 @@
+- type: entity
+  name: generic rubber stamp
+  parent: BaseItem
+  id: RubberStampBase
+  description: A rubber stamp for stamping important documents.
+  abstract: true
+  components:
+  - type: Stamp
+    stampedName: stamp-component-stamped-name-default
+    stampState: "paper_stamp-generic"
+    stampedColor: "#a23e3e"
+    sound:
+      path: /Audio/Items/Stamp/thick_stamp_sub.ogg
+      params:
+        volume: -2
+        maxDistance: 5
+  - type: Sprite
+    sprite: Objects/Misc/stamps.rsi
+    state: stamp-mime
+  - type: Item
+    size: Tiny
+  - type: StealTarget
+    stealGroup: Stamp
+
+- type: entity
+  name: alternate rubber stamp
+  parent: RubberStampBase
+  id: RubberStampBaseAlt
+  abstract: true
+  components:
+  - type: Stamp
+    stampedName: stamp-component-stamped-name-default
+    stampState: "paper_stamp-generic"
+    sound:
+      path: /Audio/Items/Stamp/automatic_stamp.ogg
+      params:
+        volume: -2
+        maxDistance: 5
+
+- type: entity
+  name: captain's rubber stamp
+  parent: RubberStampBase
+  id: RubberStampCaptain
+  suffix: DO NOT MAP
+  components:
+  - type: Stamp
+    stampedName: stamp-component-stamped-name-captain
+    stampedColor: "#3681bb"
+    stampState: "paper_stamp-cap"
+  - type: Sprite
+    state: stamp-cap
+
+- type: entity
+  name: CentCom rubber stamp
+  parent: RubberStampBase
+  id: RubberStampCentcom
+  suffix: DO NOT MAP
+  components:
+  - type: Stamp
+    stampedName: stamp-component-stamped-name-centcom
+    stampedColor: "#006600"
+    stampState: "paper_stamp-centcom"
+  - type: Sprite
+    state: stamp-centcom
+
+- type: entity
+  name: chaplain's rubber stamp
+  parent: RubberStampBase
+  id: RubberStampChaplain
+  suffix: DO NOT MAP
+  components:
+  - type: Stamp
+    stampedName: stamp-component-stamped-name-chaplain
+    stampedColor: "#d70601"
+    stampState: "paper_stamp-chaplain"
+  - type: Sprite
+    state: stamp-chaplain
+
+- type: entity
+  name: clown's rubber stamp
+  parent: RubberStampBase
+  id: RubberStampClown
+  suffix: DO NOT MAP
+  components:
+  - type: Stamp
+    stampedName: stamp-component-stamped-name-clown
+    stampedColor: "#ff33cc"
+    stampState: "paper_stamp-clown"
+  - type: Sprite
+    state: stamp-clown
+  - type: Tag
+    tags:
+      - ClownRubberStamp
+
+- type: entity
+  name: chief engineer's rubber stamp
+  parent: RubberStampBase
+  id: RubberStampCE
+  suffix: DO NOT MAP
+  components:
+  - type: Stamp
+    stampedName: stamp-component-stamped-name-ce
+    stampedColor: "#c69b17"
+    stampState: "paper_stamp-ce"
+  - type: Sprite
+    state: stamp-ce
+
+- type: entity
+  name: chief medical officer's rubber stamp
+  parent: RubberStampBase
+  id: RubberStampCMO
+  suffix: DO NOT MAP
+  components:
+  - type: Stamp
+    stampedName: stamp-component-stamped-name-cmo
+    stampedColor: "#33ccff"
+    stampState: "paper_stamp-cmo"
+  - type: Sprite
+    state: stamp-cmo
+
+- type: entity
+  name: head of personnel's rubber stamp
+  parent: RubberStampBase
+  id: RubberStampHop
+  suffix: DO NOT MAP
+  components:
+  - type: Stamp
+    stampedName: stamp-component-stamped-name-hop
+    stampedColor: "#6ec0ea"
+    stampState: "paper_stamp-hop"
+  - type: Sprite
+    state: stamp-hop
+
+- type: entity
+  name: head of security's rubber stamp
+  parent: RubberStampBase
+  id: RubberStampHos
+  suffix: DO NOT MAP
+  components:
+  - type: Stamp
+    stampedName: stamp-component-stamped-name-hos
+    stampedColor: "#cc0000"
+    stampState: "paper_stamp-hos"
+  - type: Sprite
+    state: stamp-hos
+
+- type: entity
+  name: mime's rubber stamp
+  parent: RubberStampBase
+  id: RubberStampMime
+  suffix: DO NOT MAP
+  components:
+  - type: Stamp
+    stampedName: stamp-component-stamped-name-mime
+    stampedColor: "#777777"
+    stampState: "paper_stamp-mime"
+    # TODO remove sound from mime's rubber stamp
+  - type: Sprite
+    state: stamp-mime
+
+- type: entity
+  name: logistics officer's rubber stamp # DeltaV - Logistics Department replacing Cargo
+  parent: RubberStampBase
+  id: RubberStampQm
+  suffix: DO NOT MAP
+  components:
+    - type: Stamp
+      stampedName: stamp-component-stamped-name-qm
+      stampedColor: "#a23e3e"
+      stampState: "paper_stamp-qm"
+    - type: Sprite
+      sprite: Objects/Misc/bureaucracy.rsi
+      state: stamp-qm
+
+- type: entity
+  name: mystagogue's rubber stamp # DeltaV - Epistemics Department replacing Science
+  parent: RubberStampBase
+  id: RubberStampRd
+  suffix: DO NOT MAP
+  components:
+    - type: Stamp
+      stampedName: stamp-component-stamped-name-rd
+      stampedColor: "#1f66a0"
+      stampState: "paper_stamp-rd"
+    - type: Sprite
+      sprite: Objects/Misc/bureaucracy.rsi
+      state: stamp-rd
+
+- type: entity
+  name: trader's rubber stamp
+  parent: RubberStampBase
+  id: RubberStampTrader
+  components:
+  - type: Stamp
+    stampedName: stamp-component-stamped-name-trader
+    stampedColor: "#000000"
+    stampState: "paper_stamp-trader"
+  - type: Sprite
+    state: stamp-trader
+
+- type: entity
+  name: syndicate rubber stamp
+  parent: RubberStampBase
+  id: RubberStampSyndicate
+  suffix: DO NOT MAP
+  components:
+  - type: Stamp
+    stampedName: stamp-component-stamped-name-syndicate
+    stampedColor: "#850000"
+    stampState: "paper_stamp-syndicate"
+  - type: Sprite
+    state: stamp-syndicate
+
+- type: entity
+  name: warden's rubber stamp
+  parent: RubberStampBase
+  id: RubberStampWarden
+  suffix: DO NOT MAP
+  components:
+  - type: Stamp
+    stampedName: stamp-component-stamped-name-warden
+    stampedColor: "#5b0000"
+    stampState: "paper_stamp-warden"
+  - type: Sprite
+    state: stamp-warden
+
+- type: entity
+  name: APPROVED rubber stamp
+  parent: RubberStampBaseAlt
+  id: RubberStampApproved
+  components:
+  - type: Stamp
+    stampedName: stamp-component-stamped-name-approved
+    stampedColor: "#00be00"
+    stampState: "paper_stamp-ok"
+  - type: Sprite
+    state: stamp-ok
+
+- type: entity
+  name: DENIED rubber stamp
+  parent: RubberStampBaseAlt
+  id: RubberStampDenied
+  components:
+  - type: Stamp
+    stampedName: stamp-component-stamped-name-denied
+    stampedColor: "#a23e3e"
+    stampState: "paper_stamp-deny"
+  - type: Sprite
+    state: stamp-deny

Resources/Prototypes/Objectives/stealTargetGroups.yml

@@ -104,7 +104,7 @@
   id: Stamp
   name: stamps (any)
   sprite:
-    sprite: Objects/Misc/bureaucracy.rsi
+    sprite: Objects/Misc/stamps.rsi
     state: stamp-cap
     
 - type: stealTargetGroup

Resources/Prototypes/Recipes/Crafting/Graphs/bots/honkbot.yml

@@ -13,7 +13,7 @@
         name: box of hugs
       - tag: ClownRubberStamp
         icon:
-          sprite: Objects/Misc/bureaucracy.rsi
+          sprite: Objects/Misc/stamps.rsi
           state: stamp-clown
         name: clown's rubber stamp
         doAfter: 2
@@ -52,7 +52,7 @@
         name: happy honk meal
       - tag: ClownRubberStamp
         icon:
-          sprite: Objects/Misc/bureaucracy.rsi
+          sprite: Objects/Misc/stamps.rsi
           state: stamp-clown
         name: clown's rubber stamp
         doAfter: 2

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. pen_centcom is a resprited version of pen_cap by PuroSlavKing (Github). New stamp- icons taken from tgstation at https://github.com/tgstation/tgstation/commit/fb1012102257b7b0a08d861fd2b8ba963c416e93. stamp-warden is a darker version of stamp-hos. Luxury pen is drawn 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. pen_centcom is a resprited version of pen_cap by PuroSlavKing (Github). Luxury pen is drawn by Ubaser.",
   "size": {
     "x": 32,
     "y": 32
@@ -96,60 +96,6 @@
     {
       "name": "paper_plane"
     },
-    {
-      "name": "paper_stamp-cap"
-    },
-    {
-      "name": "paper_stamp-ce"
-    },
-    {
-      "name": "paper_stamp-centcom"
-    },
-    {
-      "name": "paper_stamp-chaplain"
-    },
-    {
-      "name": "paper_stamp-clown"
-    },
-    {
-      "name": "paper_stamp-cmo"
-    },
-    {
-      "name": "paper_stamp-deny"
-    },
-    {
-      "name": "paper_stamp-hop"
-    },
-    {
-      "name": "paper_stamp-hos"
-    },
-    {
-      "name": "paper_stamp-ok"
-    },
-    {
-      "name": "paper_stamp-mime"
-    },
-    {
-      "name": "paper_stamp-qm"
-    },
-    {
-      "name": "paper_stamp-rd"
-    },
-    {
-      "name": "paper_stamp-syndicate"
-    },
-    {
-      "name": "paper_stamp-trader"
-    },
-    {
-      "name": "paper_stamp-warden"
-    },
-    {
-      "name": "paper_stamp-generic"
-    },
-    {
-      "name": "paper_stamp-mantis"
-    },
     {
       "name": "paper_talisman"
     },
@@ -252,52 +198,55 @@
       "name": "scrap_bloodied"
     },
     {
-      "name": "stamp-cap"
+      "name": "paper_stamp-cap"
     },
     {
-      "name": "stamp-ce"
+      "name": "paper_stamp-ce"
     },
     {
-      "name": "stamp-centcom"
+      "name": "paper_stamp-centcom"
     },
     {
-      "name": "stamp-chaplain"
+      "name": "paper_stamp-chaplain"
     },
     {
-      "name": "stamp-clown"
+      "name": "paper_stamp-clown"
     },
     {
-      "name": "stamp-cmo"
+      "name": "paper_stamp-cmo"
     },
     {
-      "name": "stamp-deny"
+      "name": "paper_stamp-deny"
     },
     {
-      "name": "stamp-hop"
+      "name": "paper_stamp-hop"
     },
     {
-      "name": "stamp-hos"
+      "name": "paper_stamp-hos"
     },
     {
-      "name": "stamp-ok"
+      "name": "paper_stamp-ok"
     },
     {
-      "name": "stamp-mime"
+      "name": "paper_stamp-mime"
     },
     {
-      "name": "stamp-qm"
+      "name": "paper_stamp-qm"
     },
     {
-      "name": "stamp-rd"
+      "name": "paper_stamp-rd"
     },
     {
-      "name": "stamp-syndicate"
+      "name": "paper_stamp-syndicate"
     },
     {
-      "name": "stamp-trader"
+      "name": "paper_stamp-trader"
     },
     {
-      "name": "stamp-warden"
+      "name": "paper_stamp-warden"
+    },
+    {
+      "name": "paper_stamp-generic"
     }
   ]
 }

Resources/Textures/Objects/Misc/stamps.rsi/meta.json

@@ -0,0 +1,62 @@
+{
+  "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.",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "stamp-cap"
+    },
+    {
+      "name": "stamp-ce"
+    },
+    {
+      "name": "stamp-centcom"
+    },
+    {
+      "name": "stamp-chaplain"
+    },
+    {
+      "name": "stamp-clown"
+    },
+    {
+      "name": "stamp-cmo"
+    },
+    {
+      "name": "stamp-deny"
+    },
+    {
+      "name": "stamp-hop"
+    },
+    {
+      "name": "stamp-hos"
+    },
+    {
+      "name": "stamp-ok"
+    },
+    {
+      "name": "stamp-mime"
+    },
+    {
+      "name": "stamp-qm"
+    },
+    {
+      "name": "stamp-rd"
+    },
+    {
+      "name": "stamp-syndicate"
+    },
+    {
+      "name": "stamp-trader"
+    },
+    {
+      "name": "stamp-warden"
+    },
+    {
+      "name": "paper_stamp-mantis"
+    }
+  ]
+}