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

Mail Resprite #35776

Merged
merged 5 commits into from
Mar 11, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
components:
- type: Sprite
sprite: Objects/Specific/Cargo/mail_large.rsi
scale: 0.85,0.85
layers:
- state: icon
map: [ "enum.DeliveryVisualLayers.Icon" ]
Expand All @@ -56,8 +55,7 @@
visible: false
- state: postmark
- map: [ "enum.DeliveryVisualLayers.JobStamp" ]
scale: 0.6, 0.6
offset: -0.23, -0.23
offset: -0.21875, -0.25
- state: fragile
map: [ "enum.DeliveryVisualLayers.FragileStamp" ]
visible: false
Expand Down Expand Up @@ -87,7 +85,6 @@
components:
- type: Sprite
sprite: Objects/Specific/Cargo/mail.rsi
scale: 0.8,0.8
layers:
- state: icon
map: [ "enum.DeliveryVisualLayers.Icon" ]
Expand All @@ -96,8 +93,7 @@
visible: false
- state: postmark
- map: [ "enum.DeliveryVisualLayers.JobStamp" ]
scale: 0.8, 0.8
offset: 0.225, 0.165
offset: -0.125, -0.0625
- state: fragile
map: [ "enum.DeliveryVisualLayers.FragileStamp" ]
visible: false
Expand Down
Binary file not shown.
Binary file modified Resources/Textures/Objects/Specific/Cargo/mail.rsi/broken.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Specific/Cargo/mail.rsi/fragile.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Specific/Cargo/mail.rsi/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Specific/Cargo/mail.rsi/locked.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
74 changes: 41 additions & 33 deletions Resources/Textures/Objects/Specific/Cargo/mail.rsi/meta.json
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

new json file needs to be 4 spaced

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be fixed for both files

Original file line number Diff line number Diff line change
@@ -1,35 +1,43 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "locked"
},
{
"name": "trash"
},
{
"name": "fragile"
},
{
"name": "priority"
},
{
"name": "priority_inactive"
},
{
"name": "broken"
},
{
"name": "postmark"
}
]
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Sprites made by Princess Cheeseballs (Discord).",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "broken"
},
{
"name": "fragile"
},
{
"name": "icon"
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "locked"
},
{
"name": "priority"
},
{
"name": "priority_inactive"
},
{
"name": "trash"
},
{
"name": "postmark"
}
]
}
Binary file modified Resources/Textures/Objects/Specific/Cargo/mail.rsi/postmark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Specific/Cargo/mail.rsi/priority.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Specific/Cargo/mail.rsi/trash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Specific/Cargo/mail_large.rsi/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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 (obj/storage/closet.dmi, obj/service/bureaucracy.dmi), modified by Whatstone (Discord). broken, inhand-left, inhand-right by Whatstone.",
"copyright": "Sprites made by Princess Cheeseballs (Discord).",
"size": {
"x": 32,
"y": 32
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Specific/Cargo/mail_large.rsi/trash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading