From fca9a87fe809fa93303aab6390e0dafd665372b1 Mon Sep 17 00:00:00 2001 From: Ratyyy <138193222+Ratyyy@users.noreply.github.com> Date: Thu, 17 Aug 2023 23:26:13 +0300 Subject: [PATCH 1/2] cargo teg --- .../catalog/fills/crates/engineering.ftl | 6 ++++++ .../Catalog/Cargo/cargo_engineering.yml | 20 ++++++++++++++++++ .../Catalog/Fills/Crates/engines.yml | 18 ++++++++++++++++ .../Power/Generation/teg.rsi/icon_circ.png | Bin 0 -> 805 bytes .../Power/Generation/teg.rsi/icon_mid.png | Bin 0 -> 689 bytes .../Power/Generation/teg.rsi/meta.json | 6 ++++++ 6 files changed, 50 insertions(+) create mode 100644 Resources/Textures/Structures/Power/Generation/teg.rsi/icon_circ.png create mode 100644 Resources/Textures/Structures/Power/Generation/teg.rsi/icon_mid.png diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/engineering.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/engineering.ftl index 668dcf63746dcf..b7382b48d7805c 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/engineering.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/engineering.ftl @@ -31,3 +31,9 @@ ent-CrateAirlockKit = ящик компонентов шлюзов ent-CrateEvaKit = ящик набора EVA .desc = Набор, состоящий из двух престижных костюмов EVA и шлемов. .suffix = { "" } +ent-CrateEngineeringTegCenter = ящик центра ТЭГ + .desc = Набор, центра ТЭГ. + .suffix = { "" } +ent-CrateEngineeringTegCirculator = ящик циркулятора ТЭГ + .desc = Набор, состоящий из циркулятора ТЭГ. + .suffix = { "" } diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml b/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml index 63b56de7b65aa4..330a721cc141f2 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml @@ -87,3 +87,23 @@ cost: 5000 category: Engineering group: market + +- type: cargoProduct + id: TegCenterCargo + icon: + sprite: Structures\Power\Generation\teg.rsi + state: icon_mid + product: CrateEngineeringTegCenter + cost: 10000 + category: Engineering + group: market + +- type: cargoProduct + id: TegCirculatorCargo + icon: + sprite: Structures\Power\Generation\teg.rsi + state: icon_circ + product: CrateEngineeringTegCirculator + cost: 5000 + category: Engineering + group: market \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Fills/Crates/engines.yml b/Resources/Prototypes/Catalog/Fills/Crates/engines.yml index 11e0224207f584..3db892a288ad71 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/engines.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/engines.yml @@ -116,3 +116,21 @@ - id: WallmountGeneratorAPUElectronics - id: HandheldGPSBasic - id: InflatableDoorStack1 + +- type: entity + name: Crate with center thermo electric generator + id: CrateEngineeringTegCenter + parent: CrateEngineeringSecure + components: + - type: StorageFill + contents: + - id: TegCenter + +- type: entity + name: Crate with circulator thermo electric generator + id: CrateEngineeringTegCirculator + parent: CrateEngineeringSecure + components: + - type: StorageFill + contents: + - id: TegCirculator diff --git a/Resources/Textures/Structures/Power/Generation/teg.rsi/icon_circ.png b/Resources/Textures/Structures/Power/Generation/teg.rsi/icon_circ.png new file mode 100644 index 0000000000000000000000000000000000000000..82b27316a7db5405ec6b5113199cd92712ef777c GIT binary patch literal 805 zcmV+=1KRwFP)Px%-$_J4R9J<@m%mCQQ5431y6FU!DKi5}5l0XiNFk2;076<_Hoc@u5q6(o_XPxt zRKs);v#j+%I-3oF0d1@_7Qs;jK|!$27Va4)^FMADKM1+^+;h+O%{k}ZN#KJqH;r?( zS{>){ySTW>9XFSw5VzayTtS=7W^N&w4%KRPEX1W!DVKoJXygmY5|O$nA&y*#Ez3exRqpQYCiXNMjfjve5rrfHVf1=EEXx8wRaI)W8jjcpe-vC5dle!Hy8{6&@>IhFfa_m zPr1}SSfXHmlu9Mq?KaJ3a~$r4Ts>@lAuS>*In9 z@@$a6av>>-f?*i3BD08PJg4jW_~77xZnsNZ{bvp7gL=J=ZQINPtgo;CSJF5LX93{y z@-or!=FS!th-wUQ``dONp0M~URw#Uau|0BN@ zvi8Iwvjnc|(&=;}PY#Vgmmm$VudnakI}-u_f{7CJ z`+fRTp5rtOheL+LVSWMI+uM=XvFp0AP4@i!oGGAEsYH5UG#YVyd>k*}{{B8QXb^+J jfZN;KR3G`Dn8fi1BvDH@?rHEq00000NkvXXu0mjfIwyLv literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Power/Generation/teg.rsi/icon_mid.png b/Resources/Textures/Structures/Power/Generation/teg.rsi/icon_mid.png new file mode 100644 index 0000000000000000000000000000000000000000..9d39df763acb27ae890c35d357df38c2cb54dc67 GIT binary patch literal 689 zcmV;i0#5yjP)Px%Ye_^wR9J=0S22qsF%>RNl4yN>A1S|i5_ES$U_F4%F*H{cJ z(~G2&x$X)JF${=>m0%%w#ci^a#Bp@jUGHnmdr7|ca(G3xT0MK7heDx%IF7j+ zhGAel9-~&P;T}**(QdbKI-P`%bNjxJ<#L$=07IP^$1#E+$Rxi6Rpe|olWfOvv^kOh z9@zJNX;8P@m25%?`u)D->-BmXxys{t-gN=$ghzw(Co^FH|Ms7+J`6+AY1{Tg0;`-s z5WsPq^K!Y&8S22!OGnrvj6N(P3`4wh-Z(LmIlp~~{Q=Pa1wa2Jj31vb;OQB7x&Unp z@cU~8{D&F%417=TdU^()F5pYH;FtN5pmJQ|6as=EKomt6iAtrC=G*W0nF7*k%u1!A3jl!Oa3~Et9*>CQ81wlYlv3@a zQ%bSfY_tHBQV>Gmx-N>vqSikc3@!@*fP6kL*=bu*E|;a>G^l*r?N+ig-vZ0B&}cM3 z2+2xZBs@dRv#u!}Jy}J4+iqgLgZxN9U$iY{g6#>?|h00000NkvXXu0mjfy~sQ_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Power/Generation/teg.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/teg.rsi/meta.json index f0c0b58f05e769..4628f69794a8f2 100644 --- a/Resources/Textures/Structures/Power/Generation/teg.rsi/meta.json +++ b/Resources/Textures/Structures/Power/Generation/teg.rsi/meta.json @@ -274,6 +274,12 @@ { "name": "circ-0-light", "directions": 4 + }, + { + "name": "icon_circ" + }, + { + "name": "icon_mid" } ] } \ No newline at end of file From aadd8a86830a51e43ceaa195502d510c0ff1f7fa Mon Sep 17 00:00:00 2001 From: Ratyyy <138193222+Ratyyy@users.noreply.github.com> Date: Sun, 20 Aug 2023 22:31:37 +0300 Subject: [PATCH 2/2] Update cargo_engineering.yml --- Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml b/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml index 330a721cc141f2..605309b8d4f0ee 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml @@ -91,7 +91,7 @@ - type: cargoProduct id: TegCenterCargo icon: - sprite: Structures\Power\Generation\teg.rsi + sprite: Structures/Power/Generation/teg.rsi state: icon_mid product: CrateEngineeringTegCenter cost: 10000 @@ -101,7 +101,7 @@ - type: cargoProduct id: TegCirculatorCargo icon: - sprite: Structures\Power\Generation\teg.rsi + sprite: Structures/Power/Generation/teg.rsi state: icon_circ product: CrateEngineeringTegCirculator cost: 5000