From 78965d1e368fa19549bfb043620c85d48188d78e Mon Sep 17 00:00:00 2001
From: lzk <124214523+lzk228@users.noreply.github.com>
Date: Wed, 27 Dec 2023 23:46:30 +0100
Subject: [PATCH] Move stamps out of big mess (#22877)
* gigacommit
* Update honkbot.yml
* foxing
* merg
* bring back mime sound
* ;
* :trollface:
---
Content.Shared/Paper/StampComponent.cs | 6 +-
.../Entities/Objects/Misc/paper.yml | 269 +-----------------
.../Entities/Objects/Misc/rubber_stamp.yml | 247 ++++++++++++++++
.../Objectives/stealTargetGroups.yml | 4 +-
.../Recipes/Crafting/Graphs/bots/honkbot.yml | 4 +-
.../Objects/Misc/bureaucracy.rsi/meta.json | 88 ++----
.../Objects/Misc/stamps.rsi/meta.json | 59 ++++
.../stamp-cap.png | Bin
.../stamp-ce.png | Bin
.../stamp-centcom.png | Bin
.../stamp-chaplain.png | Bin
.../stamp-clown.png | Bin
.../stamp-cmo.png | Bin
.../stamp-deny.png | Bin
.../stamp-hop.png | Bin
.../stamp-hos.png | Bin
.../stamp-mime.png | Bin
.../stamp-ok.png | Bin
.../stamp-qm.png | Bin
.../stamp-rd.png | Bin
.../stamp-syndicate.png | Bin
.../stamp-trader.png | Bin
.../stamp-warden.png | Bin
23 files changed, 337 insertions(+), 340 deletions(-)
create mode 100644 Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml
create mode 100644 Resources/Textures/Objects/Misc/stamps.rsi/meta.json
rename Resources/Textures/Objects/Misc/{bureaucracy.rsi => stamps.rsi}/stamp-cap.png (100%)
rename Resources/Textures/Objects/Misc/{bureaucracy.rsi => stamps.rsi}/stamp-ce.png (100%)
rename Resources/Textures/Objects/Misc/{bureaucracy.rsi => stamps.rsi}/stamp-centcom.png (100%)
rename Resources/Textures/Objects/Misc/{bureaucracy.rsi => stamps.rsi}/stamp-chaplain.png (100%)
rename Resources/Textures/Objects/Misc/{bureaucracy.rsi => stamps.rsi}/stamp-clown.png (100%)
rename Resources/Textures/Objects/Misc/{bureaucracy.rsi => stamps.rsi}/stamp-cmo.png (100%)
rename Resources/Textures/Objects/Misc/{bureaucracy.rsi => stamps.rsi}/stamp-deny.png (100%)
rename Resources/Textures/Objects/Misc/{bureaucracy.rsi => stamps.rsi}/stamp-hop.png (100%)
rename Resources/Textures/Objects/Misc/{bureaucracy.rsi => stamps.rsi}/stamp-hos.png (100%)
rename Resources/Textures/Objects/Misc/{bureaucracy.rsi => stamps.rsi}/stamp-mime.png (100%)
rename Resources/Textures/Objects/Misc/{bureaucracy.rsi => stamps.rsi}/stamp-ok.png (100%)
rename Resources/Textures/Objects/Misc/{bureaucracy.rsi => stamps.rsi}/stamp-qm.png (100%)
rename Resources/Textures/Objects/Misc/{bureaucracy.rsi => stamps.rsi}/stamp-rd.png (100%)
rename Resources/Textures/Objects/Misc/{bureaucracy.rsi => stamps.rsi}/stamp-syndicate.png (100%)
rename Resources/Textures/Objects/Misc/{bureaucracy.rsi => stamps.rsi}/stamp-trader.png (100%)
rename Resources/Textures/Objects/Misc/{bureaucracy.rsi => stamps.rsi}/stamp-warden.png (100%)
diff --git a/Content.Shared/Paper/StampComponent.cs b/Content.Shared/Paper/StampComponent.cs
index 790aa1d60a..615009a81e 100644
--- a/Content.Shared/Paper/StampComponent.cs
+++ b/Content.Shared/Paper/StampComponent.cs
@@ -32,8 +32,9 @@ public sealed partial class StampComponent : Component
///
[DataField("stampedName")]
public string StampedName { get; set; } = "stamp-component-stamped-name-default";
+
///
- /// 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.
///
[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
+ ///
+ /// The sound when stamp stamped
+ ///
[DataField("sound")]
public SoundSpecifier Sound = new SoundPathSpecifier("/Audio/Items/Stamp/thick_stamp_sub.ogg")
{
diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
index 2abec49138..5bfc31dbce 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
@@ -555,7 +555,7 @@
id: BoxFolderCentComClipboard
parent: BoxFolderClipboard
name: centcom clipboard
- description: A luxurious clipboard upholstered with green velvet. Often seen carried by CentCom officials, seldom seen actually used.
+ description: A luxurious clipboard upholstered with green velvet. Often seen carried by CentCom officials, seldom seen actually used.
components:
- type: Sprite
sprite: Objects/Misc/cc-clipboard.rsi
@@ -647,269 +647,4 @@
types:
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: quartermaster's rubber stamp
- 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: research director's rubber stamp
- 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
+ stealGroup: BoxFolderQmClipboard
\ 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
new file mode 100644
index 0000000000..cbd2a2c99c
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml
@@ -0,0 +1,247 @@
+- 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: quartermaster's rubber stamp
+ 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
+ state: stamp-qm
+
+- type: entity
+ name: research director's rubber stamp
+ 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
+ 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
diff --git a/Resources/Prototypes/Objectives/stealTargetGroups.yml b/Resources/Prototypes/Objectives/stealTargetGroups.yml
index 712b773eb4..5cb11a954a 100644
--- a/Resources/Prototypes/Objectives/stealTargetGroups.yml
+++ b/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
@@ -405,4 +405,4 @@
name: Pun Pun
sprite:
sprite: Mobs/Animals/monkey.rsi
- state: monkey
\ No newline at end of file
+ state: monkey
diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/bots/honkbot.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/bots/honkbot.yml
index 25a9104d59..ff3f6d2e2a 100644
--- a/Resources/Prototypes/Recipes/Crafting/Graphs/bots/honkbot.yml
+++ b/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
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
index 408dde620f..50de863313 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. 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,57 +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_talisman"
},
@@ -249,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": "paper_stamp-rd"
},
{
- "name": "stamp-rd"
+ "name": "paper_stamp-syndicate"
},
{
- "name": "stamp-syndicate"
+ "name": "paper_stamp-trader"
},
{
- "name": "stamp-trader"
+ "name": "paper_stamp-warden"
},
{
- "name": "stamp-warden"
+ "name": "paper_stamp-generic"
}
]
}
diff --git a/Resources/Textures/Objects/Misc/stamps.rsi/meta.json b/Resources/Textures/Objects/Misc/stamps.rsi/meta.json
new file mode 100644
index 0000000000..f755ac3b6f
--- /dev/null
+++ b/Resources/Textures/Objects/Misc/stamps.rsi/meta.json
@@ -0,0 +1,59 @@
+{
+ "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"
+ }
+ ]
+}
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-cap.png b/Resources/Textures/Objects/Misc/stamps.rsi/stamp-cap.png
similarity index 100%
rename from Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-cap.png
rename to Resources/Textures/Objects/Misc/stamps.rsi/stamp-cap.png
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-ce.png b/Resources/Textures/Objects/Misc/stamps.rsi/stamp-ce.png
similarity index 100%
rename from Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-ce.png
rename to Resources/Textures/Objects/Misc/stamps.rsi/stamp-ce.png
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-centcom.png b/Resources/Textures/Objects/Misc/stamps.rsi/stamp-centcom.png
similarity index 100%
rename from Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-centcom.png
rename to Resources/Textures/Objects/Misc/stamps.rsi/stamp-centcom.png
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-chaplain.png b/Resources/Textures/Objects/Misc/stamps.rsi/stamp-chaplain.png
similarity index 100%
rename from Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-chaplain.png
rename to Resources/Textures/Objects/Misc/stamps.rsi/stamp-chaplain.png
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-clown.png b/Resources/Textures/Objects/Misc/stamps.rsi/stamp-clown.png
similarity index 100%
rename from Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-clown.png
rename to Resources/Textures/Objects/Misc/stamps.rsi/stamp-clown.png
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-cmo.png b/Resources/Textures/Objects/Misc/stamps.rsi/stamp-cmo.png
similarity index 100%
rename from Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-cmo.png
rename to Resources/Textures/Objects/Misc/stamps.rsi/stamp-cmo.png
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-deny.png b/Resources/Textures/Objects/Misc/stamps.rsi/stamp-deny.png
similarity index 100%
rename from Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-deny.png
rename to Resources/Textures/Objects/Misc/stamps.rsi/stamp-deny.png
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-hop.png b/Resources/Textures/Objects/Misc/stamps.rsi/stamp-hop.png
similarity index 100%
rename from Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-hop.png
rename to Resources/Textures/Objects/Misc/stamps.rsi/stamp-hop.png
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-hos.png b/Resources/Textures/Objects/Misc/stamps.rsi/stamp-hos.png
similarity index 100%
rename from Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-hos.png
rename to Resources/Textures/Objects/Misc/stamps.rsi/stamp-hos.png
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-mime.png b/Resources/Textures/Objects/Misc/stamps.rsi/stamp-mime.png
similarity index 100%
rename from Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-mime.png
rename to Resources/Textures/Objects/Misc/stamps.rsi/stamp-mime.png
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-ok.png b/Resources/Textures/Objects/Misc/stamps.rsi/stamp-ok.png
similarity index 100%
rename from Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-ok.png
rename to Resources/Textures/Objects/Misc/stamps.rsi/stamp-ok.png
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-qm.png b/Resources/Textures/Objects/Misc/stamps.rsi/stamp-qm.png
similarity index 100%
rename from Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-qm.png
rename to Resources/Textures/Objects/Misc/stamps.rsi/stamp-qm.png
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-rd.png b/Resources/Textures/Objects/Misc/stamps.rsi/stamp-rd.png
similarity index 100%
rename from Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-rd.png
rename to Resources/Textures/Objects/Misc/stamps.rsi/stamp-rd.png
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-syndicate.png b/Resources/Textures/Objects/Misc/stamps.rsi/stamp-syndicate.png
similarity index 100%
rename from Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-syndicate.png
rename to Resources/Textures/Objects/Misc/stamps.rsi/stamp-syndicate.png
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-trader.png b/Resources/Textures/Objects/Misc/stamps.rsi/stamp-trader.png
similarity index 100%
rename from Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-trader.png
rename to Resources/Textures/Objects/Misc/stamps.rsi/stamp-trader.png
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-warden.png b/Resources/Textures/Objects/Misc/stamps.rsi/stamp-warden.png
similarity index 100%
rename from Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-warden.png
rename to Resources/Textures/Objects/Misc/stamps.rsi/stamp-warden.png
--
2.51.2