From: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com> Date: Tue, 11 Mar 2025 12:44:32 +0000 (-0700) Subject: Mail Resprite (#35776) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=81a1ae1623b5dec5e531bba4747daa8501f6d88f;p=space-station-14.git Mail Resprite (#35776) * init commit * init commit * delete those * added github to copyright info --- diff --git a/Resources/Prototypes/Entities/Objects/Deliveries/deliveries.yml b/Resources/Prototypes/Entities/Objects/Deliveries/deliveries.yml index 203d4f577e..ff9ba7e68f 100644 --- a/Resources/Prototypes/Entities/Objects/Deliveries/deliveries.yml +++ b/Resources/Prototypes/Entities/Objects/Deliveries/deliveries.yml @@ -49,7 +49,6 @@ components: - type: Sprite sprite: Objects/Specific/Cargo/mail_large.rsi - scale: 0.85,0.85 layers: - state: icon map: [ "enum.DeliveryVisualLayers.Icon" ] @@ -58,8 +57,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 @@ -89,7 +87,6 @@ components: - type: Sprite sprite: Objects/Specific/Cargo/mail.rsi - scale: 0.8,0.8 layers: - state: icon map: [ "enum.DeliveryVisualLayers.Icon" ] @@ -98,8 +95,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 diff --git a/Resources/Textures/Objects/Specific/Cargo/mail.rsi/broken.png b/Resources/Textures/Objects/Specific/Cargo/mail.rsi/broken.png index afce59853e..e1de8f99d8 100644 Binary files a/Resources/Textures/Objects/Specific/Cargo/mail.rsi/broken.png and b/Resources/Textures/Objects/Specific/Cargo/mail.rsi/broken.png differ diff --git a/Resources/Textures/Objects/Specific/Cargo/mail.rsi/fragile.png b/Resources/Textures/Objects/Specific/Cargo/mail.rsi/fragile.png index a17f4b5fc3..02409831b9 100644 Binary files a/Resources/Textures/Objects/Specific/Cargo/mail.rsi/fragile.png and b/Resources/Textures/Objects/Specific/Cargo/mail.rsi/fragile.png differ diff --git a/Resources/Textures/Objects/Specific/Cargo/mail.rsi/icon.png b/Resources/Textures/Objects/Specific/Cargo/mail.rsi/icon.png index bcfe67ceda..418e6c2bf3 100644 Binary files a/Resources/Textures/Objects/Specific/Cargo/mail.rsi/icon.png and b/Resources/Textures/Objects/Specific/Cargo/mail.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Specific/Cargo/mail.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Cargo/mail.rsi/inhand-left.png new file mode 100644 index 0000000000..dec72a8183 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Cargo/mail.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Cargo/mail.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Cargo/mail.rsi/inhand-right.png new file mode 100644 index 0000000000..635cca5e0d Binary files /dev/null and b/Resources/Textures/Objects/Specific/Cargo/mail.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Cargo/mail.rsi/locked.png b/Resources/Textures/Objects/Specific/Cargo/mail.rsi/locked.png index 8292644fb1..4039004916 100644 Binary files a/Resources/Textures/Objects/Specific/Cargo/mail.rsi/locked.png and b/Resources/Textures/Objects/Specific/Cargo/mail.rsi/locked.png differ diff --git a/Resources/Textures/Objects/Specific/Cargo/mail.rsi/meta.json b/Resources/Textures/Objects/Specific/Cargo/mail.rsi/meta.json index 9d5374b551..2759dded51 100644 --- a/Resources/Textures/Objects/Specific/Cargo/mail.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Cargo/mail.rsi/meta.json @@ -1,23 +1,31 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a", + "copyright": "Sprites made by Princess Cheeseballs (Discord), (https://github.com/Pronana).", "size": { "x": 32, "y": 32 }, "states": [ + { + "name": "broken" + }, + { + "name": "fragile" + }, { "name": "icon" }, { - "name": "locked" + "name": "inhand-left", + "directions": 4 }, { - "name": "trash" + "name": "inhand-right", + "directions": 4 }, { - "name": "fragile" + "name": "locked" }, { "name": "priority" @@ -26,7 +34,7 @@ "name": "priority_inactive" }, { - "name": "broken" + "name": "trash" }, { "name": "postmark" diff --git a/Resources/Textures/Objects/Specific/Cargo/mail.rsi/postmark.png b/Resources/Textures/Objects/Specific/Cargo/mail.rsi/postmark.png index 5d55ab0b15..540167df0d 100644 Binary files a/Resources/Textures/Objects/Specific/Cargo/mail.rsi/postmark.png and b/Resources/Textures/Objects/Specific/Cargo/mail.rsi/postmark.png differ diff --git a/Resources/Textures/Objects/Specific/Cargo/mail.rsi/priority.png b/Resources/Textures/Objects/Specific/Cargo/mail.rsi/priority.png index f2c0106f38..ebff1a1486 100644 Binary files a/Resources/Textures/Objects/Specific/Cargo/mail.rsi/priority.png and b/Resources/Textures/Objects/Specific/Cargo/mail.rsi/priority.png differ diff --git a/Resources/Textures/Objects/Specific/Cargo/mail.rsi/priority_inactive.png b/Resources/Textures/Objects/Specific/Cargo/mail.rsi/priority_inactive.png index 034991aaaa..e53f3211eb 100644 Binary files a/Resources/Textures/Objects/Specific/Cargo/mail.rsi/priority_inactive.png and b/Resources/Textures/Objects/Specific/Cargo/mail.rsi/priority_inactive.png differ diff --git a/Resources/Textures/Objects/Specific/Cargo/mail.rsi/trash.png b/Resources/Textures/Objects/Specific/Cargo/mail.rsi/trash.png index 1faadffe1d..e2d88f7c5d 100644 Binary files a/Resources/Textures/Objects/Specific/Cargo/mail.rsi/trash.png and b/Resources/Textures/Objects/Specific/Cargo/mail.rsi/trash.png differ diff --git a/Resources/Textures/Objects/Specific/Cargo/mail_large.rsi/broken.png b/Resources/Textures/Objects/Specific/Cargo/mail_large.rsi/broken.png index 1c798c4075..b8f1ddc664 100644 Binary files a/Resources/Textures/Objects/Specific/Cargo/mail_large.rsi/broken.png and b/Resources/Textures/Objects/Specific/Cargo/mail_large.rsi/broken.png differ diff --git a/Resources/Textures/Objects/Specific/Cargo/mail_large.rsi/fragile.png b/Resources/Textures/Objects/Specific/Cargo/mail_large.rsi/fragile.png index 0917000cbe..f7a29717de 100644 Binary files a/Resources/Textures/Objects/Specific/Cargo/mail_large.rsi/fragile.png and b/Resources/Textures/Objects/Specific/Cargo/mail_large.rsi/fragile.png differ diff --git a/Resources/Textures/Objects/Specific/Cargo/mail_large.rsi/icon.png b/Resources/Textures/Objects/Specific/Cargo/mail_large.rsi/icon.png index f3974ab116..8bdf7efe8a 100644 Binary files a/Resources/Textures/Objects/Specific/Cargo/mail_large.rsi/icon.png and b/Resources/Textures/Objects/Specific/Cargo/mail_large.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Specific/Cargo/mail_large.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Cargo/mail_large.rsi/inhand-left.png index ccbc87cf3b..1155c22aec 100644 Binary files a/Resources/Textures/Objects/Specific/Cargo/mail_large.rsi/inhand-left.png and b/Resources/Textures/Objects/Specific/Cargo/mail_large.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Cargo/mail_large.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Cargo/mail_large.rsi/inhand-right.png index ccbc87cf3b..2155aa8d4f 100644 Binary files a/Resources/Textures/Objects/Specific/Cargo/mail_large.rsi/inhand-right.png and b/Resources/Textures/Objects/Specific/Cargo/mail_large.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Cargo/mail_large.rsi/locked.png b/Resources/Textures/Objects/Specific/Cargo/mail_large.rsi/locked.png index 1cacaf1921..fd38e69dc7 100644 Binary files a/Resources/Textures/Objects/Specific/Cargo/mail_large.rsi/locked.png and b/Resources/Textures/Objects/Specific/Cargo/mail_large.rsi/locked.png differ diff --git a/Resources/Textures/Objects/Specific/Cargo/mail_large.rsi/meta.json b/Resources/Textures/Objects/Specific/Cargo/mail_large.rsi/meta.json index cf7609b450..2759dded51 100644 --- a/Resources/Textures/Objects/Specific/Cargo/mail_large.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Cargo/mail_large.rsi/meta.json @@ -1,43 +1,43 @@ { - "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.", - "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" - } - ] + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites made by Princess Cheeseballs (Discord), (https://github.com/Pronana).", + "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" + } + ] } diff --git a/Resources/Textures/Objects/Specific/Cargo/mail_large.rsi/postmark.png b/Resources/Textures/Objects/Specific/Cargo/mail_large.rsi/postmark.png index 3267a6e2d0..d371deee82 100644 Binary files a/Resources/Textures/Objects/Specific/Cargo/mail_large.rsi/postmark.png and b/Resources/Textures/Objects/Specific/Cargo/mail_large.rsi/postmark.png differ diff --git a/Resources/Textures/Objects/Specific/Cargo/mail_large.rsi/priority.png b/Resources/Textures/Objects/Specific/Cargo/mail_large.rsi/priority.png index 9c5a74ad10..9f577aec6f 100644 Binary files a/Resources/Textures/Objects/Specific/Cargo/mail_large.rsi/priority.png and b/Resources/Textures/Objects/Specific/Cargo/mail_large.rsi/priority.png differ diff --git a/Resources/Textures/Objects/Specific/Cargo/mail_large.rsi/priority_inactive.png b/Resources/Textures/Objects/Specific/Cargo/mail_large.rsi/priority_inactive.png index fc03165b57..37aaaba0e3 100644 Binary files a/Resources/Textures/Objects/Specific/Cargo/mail_large.rsi/priority_inactive.png and b/Resources/Textures/Objects/Specific/Cargo/mail_large.rsi/priority_inactive.png differ diff --git a/Resources/Textures/Objects/Specific/Cargo/mail_large.rsi/trash.png b/Resources/Textures/Objects/Specific/Cargo/mail_large.rsi/trash.png index 2ef4ee7233..82c6fbe2b7 100644 Binary files a/Resources/Textures/Objects/Specific/Cargo/mail_large.rsi/trash.png and b/Resources/Textures/Objects/Specific/Cargo/mail_large.rsi/trash.png differ