Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds the Head of Greytide stamp #30189

Merged
merged 2 commits into from
Aug 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Resources/Locale/en-US/paper/stamp-component.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@
- id: CigarGold
- id: ClothingUniformJumpsuitFamilyGuy
- id: WristwatchGold
- id: RubberStampGreytide

- type: entity
name: Maint Loot Spawner
Expand Down
13 changes: 13 additions & 0 deletions Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 4 additions & 1 deletion Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -224,6 +224,9 @@
},
{
"name": "paper_stamp-generic"
},
{
"name": "paper_stamp-greytide"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 4 additions & 1 deletion Resources/Textures/Objects/Misc/stamps.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -60,6 +60,9 @@
},
{
"name": "stamp-warden"
},
{
"name": "stamp-greytide"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading