From ca74166d5cb41881d7c0882e7f2189c194fd6264 Mon Sep 17 00:00:00 2001 From: Morb <14136326+Morb0@users.noreply.github.com> Date: Thu, 29 Jun 2023 03:31:50 +0300 Subject: [PATCH] Add syndicate crate sprites (#1179) --- .../catalog/fills/crates/syndicate.ftl | 8 ++-- .../structures/storage/crates/crates.ftl | 2 + .../structures/storage/crates/crates.ftl | 2 + .../Catalog/Fills/Crates/syndicate.yml | 4 +- .../Structures/Storage/Crates/crates.yml | 9 ++++ .../Storage/Crates/syndicate.rsi/base.png | Bin 0 -> 305 bytes .../Storage/Crates/syndicate.rsi/closed.png | Bin 0 -> 264 bytes .../Storage/Crates/syndicate.rsi/icon.png | Bin 0 -> 343 bytes .../Storage/Crates/syndicate.rsi/meta.json | 39 ++++++++++++++++++ .../Storage/Crates/syndicate.rsi/open.png | Bin 0 -> 239 bytes .../Storage/Crates/syndicate.rsi/sparking.png | Bin 0 -> 206 bytes .../Storage/Crates/syndicate.rsi/welded.png | Bin 0 -> 270 bytes 12 files changed, 58 insertions(+), 6 deletions(-) create mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/structures/storage/crates/crates.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/structures/storage/crates/crates.ftl create mode 100644 Resources/Prototypes/Corvax/Entities/Structures/Storage/Crates/crates.yml create mode 100644 Resources/Textures/Corvax/Structures/Storage/Crates/syndicate.rsi/base.png create mode 100644 Resources/Textures/Corvax/Structures/Storage/Crates/syndicate.rsi/closed.png create mode 100644 Resources/Textures/Corvax/Structures/Storage/Crates/syndicate.rsi/icon.png create mode 100644 Resources/Textures/Corvax/Structures/Storage/Crates/syndicate.rsi/meta.json create mode 100644 Resources/Textures/Corvax/Structures/Storage/Crates/syndicate.rsi/open.png create mode 100644 Resources/Textures/Corvax/Structures/Storage/Crates/syndicate.rsi/sparking.png create mode 100644 Resources/Textures/Corvax/Structures/Storage/Crates/syndicate.rsi/welded.png diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/syndicate.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/syndicate.ftl index 8fc1e7e6fc..be60328720 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/syndicate.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/syndicate.ftl @@ -1,4 +1,4 @@ -ent-CrateSyndicateSurplusBundle = { ent-CrateGenericSteel } - .desc = { ent-CrateGenericSteel.desc } -ent-CrateSyndicateSuperSurplusBundle = { ent-CrateGenericSteel } - .desc = { ent-CrateGenericSteel.desc } +ent-CrateSyndicateSurplusBundle = { ent-CrateSyndicate } + .desc = { ent-CrateSyndicate.desc } +ent-CrateSyndicateSuperSurplusBundle = { ent-CrateSyndicate } + .desc = { ent-CrateSyndicate.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/structures/storage/crates/crates.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/structures/storage/crates/crates.ftl new file mode 100644 index 0000000000..be1ef444db --- /dev/null +++ b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/structures/storage/crates/crates.ftl @@ -0,0 +1,2 @@ +ent-CrateSyndicate = syndicate crate + .desc = { ent-CrateBaseWeldable.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/structures/storage/crates/crates.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/structures/storage/crates/crates.ftl new file mode 100644 index 0000000000..9171ed037a --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/structures/storage/crates/crates.ftl @@ -0,0 +1,2 @@ +ent-CrateSyndicate = ящик синдиката + .desc = { ent-CrateBaseWeldable.desc } diff --git a/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml b/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml index 04c58c05b4..fac0cd8c94 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml @@ -1,13 +1,13 @@ - type: entity id: CrateSyndicateSurplusBundle - parent: CrateGenericSteel + parent: CrateSyndicate components: - type: SurplusBundle totalPrice: 50 - type: entity id: CrateSyndicateSuperSurplusBundle - parent: CrateGenericSteel + parent: CrateSyndicate components: - type: SurplusBundle totalPrice: 125 diff --git a/Resources/Prototypes/Corvax/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/Corvax/Entities/Structures/Storage/Crates/crates.yml new file mode 100644 index 0000000000..bfce9145d4 --- /dev/null +++ b/Resources/Prototypes/Corvax/Entities/Structures/Storage/Crates/crates.yml @@ -0,0 +1,9 @@ +- type: entity + parent: CrateBaseWeldable + id: CrateSyndicate + name: syndicate crate + components: + - type: Icon + sprite: Corvax/Structures/Storage/Crates/syndicate.rsi + - type: Sprite + sprite: Corvax/Structures/Storage/Crates/syndicate.rsi diff --git a/Resources/Textures/Corvax/Structures/Storage/Crates/syndicate.rsi/base.png b/Resources/Textures/Corvax/Structures/Storage/Crates/syndicate.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..91ff3ac770c617783c019838875149cc311b6017 GIT binary patch literal 305 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCik70(?ST?S(ZXrL;^Wq@@G|B_!qK71VTfja^(km+EU;TH0&t7y}iye$RXi zqslu#P_WL^#WBRf|LwWge9a0xZ4b}g zTp#f6e_c4A((F?2p3l?QcP@O==l567K_a34^DrpUXO@geCwrcWLGT literal 0 HcmV?d00001 diff --git a/Resources/Textures/Corvax/Structures/Storage/Crates/syndicate.rsi/closed.png b/Resources/Textures/Corvax/Structures/Storage/Crates/syndicate.rsi/closed.png new file mode 100644 index 0000000000000000000000000000000000000000..041054878cd29efe28bc83c77596a8d04cb62ee1 GIT binary patch literal 264 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil&0(?ST*?YcV&VU`&zg%tQH1&G_x=A{%~vn# z&Dgx5_j1btfk}@Jh)Uh(;CwRY{);bWElx+yn5A7-Hf7cEV{sCq*6? zZ|_F#KmWg5*|03?=)5>LJ-AI~me{HMAKbm~IaqoOmzGpXF?B~|rv?f8JBG|H=9=?) zt-?vSf)}~{OjciZiR)O&uugf)Bh~cX&L``VVoZePu?VyGTS|BvLqEDrEeKdPuR^fp zqiJXBjF~Oohwd&u@Z-WMcPFjzmE0>iUPgL2ugDZNh<<6XGBfhCX!*kv=UeCGuU(?- UvYCNX2Iy7>Pgg&ebxsLQ0M+hz-2eap literal 0 HcmV?d00001 diff --git a/Resources/Textures/Corvax/Structures/Storage/Crates/syndicate.rsi/meta.json b/Resources/Textures/Corvax/Structures/Storage/Crates/syndicate.rsi/meta.json new file mode 100644 index 0000000000..4ac171967c --- /dev/null +++ b/Resources/Textures/Corvax/Structures/Storage/Crates/syndicate.rsi/meta.json @@ -0,0 +1,39 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7687a28e7ceecea6b9e0aacdb58a2271b063f9d3 and lock display removed by github:Morb0 & custom welded sprite", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "closed" + }, + { + "name": "open" + }, + { + "name": "welded" + }, + { + "name": "sparking", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Corvax/Structures/Storage/Crates/syndicate.rsi/open.png b/Resources/Textures/Corvax/Structures/Storage/Crates/syndicate.rsi/open.png new file mode 100644 index 0000000000000000000000000000000000000000..1a0f2ef3d87990258f99340b1eda5fb4a959549e GIT binary patch literal 239 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCiji0(?STkxVRSB%wSSWOG^_I z6I0-17LXH;Vbqp3J79H1B!QiS)#tzj2B8xSIt;-L;yqdo4S}oz4#li*-Y_Jslq{_% Ssagg!m%-E3&t;ucLK6Tn|35$g literal 0 HcmV?d00001 diff --git a/Resources/Textures/Corvax/Structures/Storage/Crates/syndicate.rsi/sparking.png b/Resources/Textures/Corvax/Structures/Storage/Crates/syndicate.rsi/sparking.png new file mode 100644 index 0000000000000000000000000000000000000000..87b78b9b4653d54a703643d161f7f8bf353995df GIT binary patch literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^2|(QXSZ^$5X5FCBsLJs@fG2hgpXAxzo?UdK185n8r>mdKI;Vst0DN#gB>(^b literal 0 HcmV?d00001 diff --git a/Resources/Textures/Corvax/Structures/Storage/Crates/syndicate.rsi/welded.png b/Resources/Textures/Corvax/Structures/Storage/Crates/syndicate.rsi/welded.png new file mode 100644 index 0000000000000000000000000000000000000000..db35bb850ee2648911a18ee1709902bffa2eea59 GIT binary patch literal 270 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCilo1AIbUGt$!o0s;~f5^5?c^7Hc>8ydnxLL3|%T%4Txy1IgcgC|d(3{-3P z!Ob5?@sY1WUxAvz+#gjvq wY`a!1?r>mdKI;Vst0L)ijL;wH) literal 0 HcmV?d00001