From 775ce685e2771a74562a29d810e689f51f046b99 Mon Sep 17 00:00:00 2001 From: CrimeMoot Date: Mon, 23 Dec 2024 17:08:42 +0500 Subject: [PATCH 1/6] resprait flatpack --- .../construction/components/flatpack.ftl | 19 ++++++++ .../Catalog/Cargo/cargo_engines.yml | 2 +- .../Entities/Objects/Devices/flatpack.yml | 6 +-- .../Objectives/stealTargetGroups.yml | 2 +- Resources/Prototypes/Parallaxes/test.yml | 4 +- .../Graphs/utilities/solarpanel.yml | 2 +- .../Objects/Devices/flatpack.rsi/ame-part.png | Bin 0 -> 418 bytes .../Objects/Devices/flatpack.rsi/base.png | Bin 0 -> 296 bytes .../containment-field-generator.png | Bin 0 -> 433 bytes .../Devices/flatpack.rsi/grounding-rod.png | Bin 0 -> 450 bytes .../Devices/flatpack.rsi/icon-default.png | Bin 0 -> 204 bytes .../Objects/Devices/flatpack.rsi/meta.json | 44 ++++++++++++++++++ .../Objects/Devices/flatpack.rsi/overlay.png | Bin 0 -> 319 bytes .../flatpack.rsi/radiation-collector.png | Bin 0 -> 480 bytes .../flatpack.rsi/singularity-generator.png | Bin 0 -> 447 bytes .../flatpack.rsi/solar-assembly-part.png | Bin 0 -> 469 bytes .../Devices/flatpack.rsi/tesla-coil.png | Bin 0 -> 414 bytes .../Devices/flatpack.rsi/tesla-generator.png | Bin 0 -> 442 bytes 18 files changed, 71 insertions(+), 8 deletions(-) create mode 100644 Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/ame-part.png create mode 100644 Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/base.png create mode 100644 Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/containment-field-generator.png create mode 100644 Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/grounding-rod.png create mode 100644 Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/icon-default.png create mode 100644 Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/meta.json create mode 100644 Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/overlay.png create mode 100644 Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/radiation-collector.png create mode 100644 Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/singularity-generator.png create mode 100644 Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/solar-assembly-part.png create mode 100644 Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/tesla-coil.png create mode 100644 Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/tesla-generator.png diff --git a/Resources/Locale/ru-RU/construction/components/flatpack.ftl b/Resources/Locale/ru-RU/construction/components/flatpack.ftl index be150ba26fc..46b3596bb7e 100644 --- a/Resources/Locale/ru-RU/construction/components/flatpack.ftl +++ b/Resources/Locale/ru-RU/construction/components/flatpack.ftl @@ -13,3 +13,22 @@ flatpacker-ui-pack-button = Упаковать # backmen flatpack-unpack-grid-error = Данная зона запрещает распаковывать предметы! flatpack-unpack-user-error = Данная зона запрещает Вам распаковывать предметы! + +ent-AmePartFlatpack = детали ДАМ + .desc = упаковка, используемая для сборки экранирования ДАМ. +ent-ContainmentFieldGeneratorFlatpack = детали генератора сдерживающего поля + .desc = упаковка, используемая для сборки генератора сдерживающего поля. +ent-RadiationCollectorFlatpack = детали накопителя радиации + .desc = упаковка, используемая для сборки накопителя радиации. +ent-SingularityGeneratorFlatpack = детали генератора гравитационной сингулярности + .desc = упаковка, используемая для сборки генератора гравитационной сингулярности. +ent-TeslaGeneratorFlatpack = детали генератора Теслы + .desc = упаковка, используемая для сборки генератора Теслы. +ent-TeslaGroundingRodFlatpack = детали заземляющего стержня + .desc = упаковка, используемая для сборки заземляющего стержня. +ent-TeslaCoilFlatpack = детали катушки Теслы + .desc = упаковка, используемая для сборки катушки Теслы. +ent-ThrusterFlatpack = детали двигателя + .desc = упаковка, используемая для сборки двигятеля. +ent-GyroscopeFlatpack = детали гироскопа + .desc = упаковка, используемая для сборки гироскопа. \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml b/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml index 8e2b89d8672..7aa800eae6d 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml @@ -63,7 +63,7 @@ - type: cargoProduct id: EngineSolar icon: - sprite: Objects/Devices/flatpack.rsi + sprite: _SpaceCats/Objects/Devices/flatpack.rsi # Cats edit state: solar-assembly-part product: CrateEngineeringSolar cost: 1250 diff --git a/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml b/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml index 82d43cf7d82..399ccc94f57 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml @@ -3,13 +3,13 @@ id: BaseFlatpack name: base flatpack description: A flatpack used for constructing something. - categories: - - HideSpawnMenu +# categories: +# - HideSpawnMenu components: - type: Item size: Large - type: Sprite - sprite: Objects/Devices/flatpack.rsi + sprite: _SpaceCats/Objects/Devices/flatpack.rsi # Cats edit layers: - state: base - state: overlay diff --git a/Resources/Prototypes/Objectives/stealTargetGroups.yml b/Resources/Prototypes/Objectives/stealTargetGroups.yml index b21e0dc2dea..bb29a45b09a 100644 --- a/Resources/Prototypes/Objectives/stealTargetGroups.yml +++ b/Resources/Prototypes/Objectives/stealTargetGroups.yml @@ -211,7 +211,7 @@ id: AmePartFlatpack name: steal-target-groups-ame-part-flatpack sprite: - sprite: Objects/Devices/flatpack.rsi + sprite: _SpaceCats/Objects/Devices/flatpack.rsi # Cats edit state: ame-part - type: stealTargetGroup diff --git a/Resources/Prototypes/Parallaxes/test.yml b/Resources/Prototypes/Parallaxes/test.yml index 8a7a6e83107..41717d1f6cc 100644 --- a/Resources/Prototypes/Parallaxes/test.yml +++ b/Resources/Prototypes/Parallaxes/test.yml @@ -17,7 +17,7 @@ scale: "3, 3" - texture: !type:ImageParallaxTextureSource - path: "/Textures/Objects/Devices/flatpack.rsi/ame-part.png" + path: "/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/ame-part.png" # Cats edit slowness: 0.995 tiled: false controlHomePosition: "-128, -128" @@ -38,7 +38,7 @@ scale: "1, 1" - texture: !type:ImageParallaxTextureSource - path: "/Textures/Objects/Devices/flatpack.rsi/ame-part.png" + path: "/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/ame-part.png" # Cats edit slowness: 0.0 tiled: false controlHomePosition: "0, 32" diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/solarpanel.yml b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/solarpanel.yml index f27b751572b..05239404eea 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/solarpanel.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/solarpanel.yml @@ -9,7 +9,7 @@ - tag: SolarAssemblyFlatpack name: solar assembly parts icon: - sprite: Objects/Devices/flatpack.rsi + sprite: _SpaceCats/Objects/Devices/flatpack.rsi # Cats edit state: solar-assembly-part doAfter: 1 diff --git a/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/ame-part.png b/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/ame-part.png new file mode 100644 index 0000000000000000000000000000000000000000..575e4aa2ab98089ea40aa1ed36640152cea57705 GIT binary patch literal 418 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DX&fq^l^ z)5S3)qBZ%?|Nr)f9hjCeZmqq-xR_6(l!2L3t6*4A(9ma|-qFP+@Bxjg6g zVULZ>5j)#BB_5UBd8n?e}?t-1p%3K>7f&9b` z6P??h@ijz#`(;@vcKE=Bj;87Q@dt0-pI@I=@j)i^-<{TejX&%cjd&=LG)!E0yIMH6?&rz{`6+fAjj!60jN;O1w zJXhmpx?Yk`pe2Ylx}WMmfQR!RX{-X5r?(9EA7 zAt5&*LGB`7!_Q}DPrv8Mj}r>|Jv)Qlpzm9co220DYMtDnm{ Hr-UW|IN+m{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/base.png b/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..0d0a61d8b660fa6566f860f3cf1cbb826cf0f2f7 GIT binary patch literal 296 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWND0s`$ z#W5tJ_3d;=z9s_!*ZSUqu(aY!8Kl`RKGdOHr#lUcF zn?_gbemj%$d%xn`ANwt4ao)78R)P z*v{G{&$cLEKJ%1`jg@C?fMOxfj?;iF7(lV$-GQkCOlk+_;~EaqpC3Whu{^O~v0i^5 z08M{D##Rxu@3^1DhKU5UNj0Kw#iIrZT?}2XIu^fqX^afeX{*w0`ZkzR{#<#(mr)4t b?*V=Q5MO;rg73KT00000NkvXXu0mjfFl@gL literal 0 HcmV?d00001 diff --git a/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/grounding-rod.png b/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/grounding-rod.png new file mode 100644 index 0000000000000000000000000000000000000000..c9ba5231262b8dde358918c1e86dbf52b1de6d88 GIT binary patch literal 450 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DX&fq}8a z)5S3)qBZ%?|Nr)f9hjCeZmqq-xR_6(l!2L3t6)}zMLG@4#5{ioBsxjg6g zVULZ>50y^*L?Bj}d^*&oFU91_x*3|tgpZ)N2^&eFk nL%VjyV;ARLT*2(NhnZp9+QM9^g~>C3k;35V>gTe~DWM4f1gErr literal 0 HcmV?d00001 diff --git a/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/icon-default.png b/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/icon-default.png new file mode 100644 index 0000000000000000000000000000000000000000..2be3304cf9900e003594a04735fec142894de030 GIT binary patch literal 204 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWNC|Kv| z;usRq`u5sJ!3G5$)(id5Mb<1xK437-s$&|TaYO4XY*75IPuuPRc)&0jO4d@aEPgg&ebxsLQ0A+bbjQ{`u literal 0 HcmV?d00001 diff --git a/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/meta.json b/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/meta.json new file mode 100644 index 00000000000..fcddb67df8f --- /dev/null +++ b/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/meta.json @@ -0,0 +1,44 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made for the Imperial Space community, authors'es discord nickname: pyrolizz", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "overlay" + }, + { + "name": "icon-default" + }, + { + "name": "solar-assembly-part" + }, + { + "name": "ame-part" + }, + { + "name": "singularity-generator" + }, + { + "name": "tesla-generator" + }, + { + "name": "radiation-collector" + }, + { + "name": "tesla-coil" + }, + { + "name": "grounding-rod" + }, + { + "name": "containment-field-generator" + } + ] +} diff --git a/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/overlay.png b/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/overlay.png new file mode 100644 index 0000000000000000000000000000000000000000..3eb93408d7050f33e59b6930332d135ff3443d2f GIT binary patch literal 319 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWNDEQIS z#W5tJ_3gBcye$Siu5T~*9%T7)uTiX0I%ZMNT0 zg-jC3E!JOmZLMNE!63=NaBn5Ii;B_bW%sN385+**e9vHDJSElg=BiyAg1_$3l`!Qw z{A#C0*L}vGqaj~I9tJ+sb#QTTDNf4HDPrHXu6f^k@%PWRt#S$teO8n4Q>NQPMTtX^ z!T9mTE8BCek6J%3i%xuZV8(^&{jUzh{h8>;n;3h2_rGPCXLjc8XE!=f%%CG&t9Gx7 zt6-Xe)H0d%Y%^SdhR^;d;1smo$NXW8Qc`5XKSfWr9Z}~kStTFjGuj>g6O-}5;I|pj O^9-J@elF{r5}E*FVt5U1({;oe?r<(`-5c^RUOiP37SJs(4dolaS(>?FOfNpQr>J z@nlSCcli56i46qU*<3m7_jNq{w6gn4;en6A%fX&|rXR&5?%mU!Xi@jd(8R4iRTJo|WDKF(mmrOOJp7&jz+{r}yZ=RD_>f+Ig<)|G8ZH+j_{_@03w*0Qbg U@`l^@fKkTa>FVdQ&MBb@0F~y*ZU6uP literal 0 HcmV?d00001 diff --git a/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/singularity-generator.png b/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/singularity-generator.png new file mode 100644 index 0000000000000000000000000000000000000000..357b267da2de3fa74c7a3e5965147fc36076cb0e GIT binary patch literal 447 zcmV;w0YLtVP)AlNy_xy4%_rh_65R5Y_ zV|6b9N`Mjoz*H8|W^;o!iub#?lezC?lprabo;8#Yp3KMrBC}V#6{nPZh0n*HumKReYMhXy_ z8-`H`BKI}49Se1}0bSSeaQ_I~vDk|eqEHEJ$3jh!bDIMNPGE0$2a+U0l0+OG9>DXu zI5|BV9Y8y9V`G-tcYPrMj=u$wM9AphaaPFlCI|rTuNu){C{^LdJKhdl{N|;R86aw_ pB=pf?bhs>kPPOIBs08@;0ADsdaj5q63vvJe002ovPDHLkV1lesyU73m literal 0 HcmV?d00001 diff --git a/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/solar-assembly-part.png b/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/solar-assembly-part.png new file mode 100644 index 0000000000000000000000000000000000000000..0adcec5ad596af33749414ed822638b561f91266 GIT binary patch literal 469 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DX&fq}8z z)5S3)qBZ%?|Nr)f9hjCeZmqq-xR_6(l!2L3t6R@ZrtIh$Uozun%jxjg6g zVULZ>5Dt%ea&)KRw}T8*9ORM z?v*hzDQ7sdDV%@(#8g8bo?eZLpPxkM)K2`Vefa3+@PH@t_1&Ky7Lwm&*CjLIaZ$UY z&o9oytC!nL*nG+pzGmP#)zN2G^TVr`k*bH^fP zc?E4QFD`9~Nx_f7o{^Dx`*3C5yEm;Wvt7$X7Ni>{ZIUr_DB-Z#_m`!W-@Cx}uWUqZ z-#R(*1eIlxc^PZI%TGJuRN5~Xvj5j6QDBg%gq)kd*JbW23AQ6kEI&N^czpYO1A`c~ zdp3(?8M+^b`_~)nsj6z%*m{Iv(V~WF2?w$d2eS8AF)&DcXkfnl+${_kPYj-}elF{r G5}E+mLcEFq literal 0 HcmV?d00001 diff --git a/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/tesla-coil.png b/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/tesla-coil.png new file mode 100644 index 0000000000000000000000000000000000000000..99b69ba47b4d52c73daedc139527d5c95ca42d2d GIT binary patch literal 414 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DX&fq^l= z)5S3)qBZ%?|Nr)f9hjCeZmqq-xR_6(l!2L3t6)}zMLG@4#5{ioBsxjg6g zVULZ>5M!+o^)mMTZWiv-kzS1 zOIXgzZgB8wdw6s6avts_DQw3WInU2C@bL6BRG z^GiO)&_|gA{uwiT`=QG4`TcE%(_2~ysyFqiVc->1W%&H>HbJ#SM**jtJcihmDN`8k z+_}SW=gu9X)KlaDY~aL&3k*AU?4ZO5${es{&K!ml7cMZUsHhB#17cEA7%U77utou0 z9KgZA!EoWi4Tg@63G{b>k5350ix)58*vBV?EOUr13BNx=&HY=ptRYD~MGg>WI?Eu= z@tA=@5|YOW0X@mb3=9m98D26`sUSiIyn?ED^EkxkkBK&qXa~TG)zANKGkkuJzl0;k k=P Date: Mon, 23 Dec 2024 17:33:24 +0500 Subject: [PATCH 2/6] Update flatpack.ftl --- .../construction/components/flatpack.ftl | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/Resources/Locale/ru-RU/construction/components/flatpack.ftl b/Resources/Locale/ru-RU/construction/components/flatpack.ftl index 46b3596bb7e..be150ba26fc 100644 --- a/Resources/Locale/ru-RU/construction/components/flatpack.ftl +++ b/Resources/Locale/ru-RU/construction/components/flatpack.ftl @@ -13,22 +13,3 @@ flatpacker-ui-pack-button = Упаковать # backmen flatpack-unpack-grid-error = Данная зона запрещает распаковывать предметы! flatpack-unpack-user-error = Данная зона запрещает Вам распаковывать предметы! - -ent-AmePartFlatpack = детали ДАМ - .desc = упаковка, используемая для сборки экранирования ДАМ. -ent-ContainmentFieldGeneratorFlatpack = детали генератора сдерживающего поля - .desc = упаковка, используемая для сборки генератора сдерживающего поля. -ent-RadiationCollectorFlatpack = детали накопителя радиации - .desc = упаковка, используемая для сборки накопителя радиации. -ent-SingularityGeneratorFlatpack = детали генератора гравитационной сингулярности - .desc = упаковка, используемая для сборки генератора гравитационной сингулярности. -ent-TeslaGeneratorFlatpack = детали генератора Теслы - .desc = упаковка, используемая для сборки генератора Теслы. -ent-TeslaGroundingRodFlatpack = детали заземляющего стержня - .desc = упаковка, используемая для сборки заземляющего стержня. -ent-TeslaCoilFlatpack = детали катушки Теслы - .desc = упаковка, используемая для сборки катушки Теслы. -ent-ThrusterFlatpack = детали двигателя - .desc = упаковка, используемая для сборки двигятеля. -ent-GyroscopeFlatpack = детали гироскопа - .desc = упаковка, используемая для сборки гироскопа. \ No newline at end of file From 2a154c2564bd540047fb198d1773a8150cbbbd6b Mon Sep 17 00:00:00 2001 From: CrimeMoot Date: Mon, 23 Dec 2024 17:50:37 +0500 Subject: [PATCH 3/6] fix --- .../Objects/Devices/flatpack.rsi/emitter.png | Bin 0 -> 326 bytes .../Devices/flatpack.rsi/fax-machine.png | Bin 0 -> 429 bytes .../Objects/Devices/flatpack.rsi/meta.json | 17 ++++++++++++++++- .../Objects/Devices/flatpack.rsi/oracle.png | Bin 0 -> 409 bytes .../Objects/Devices/flatpack.rsi/sophie.png | Bin 0 -> 425 bytes .../Devices/flatpack.rsi/supermatter.png | Bin 0 -> 419 bytes 6 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/emitter.png create mode 100644 Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/fax-machine.png create mode 100644 Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/oracle.png create mode 100644 Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/sophie.png create mode 100644 Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/supermatter.png diff --git a/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/emitter.png b/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/emitter.png new file mode 100644 index 0000000000000000000000000000000000000000..c663886f9cce33df769cbe389312c741626769c3 GIT binary patch literal 326 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCijK0(?ST4UBZ%J)P4s5(({UE>gxK>zz`c7 zYiDQ2(q;zKq!wP11f&E?g8YJkYLEfL1Lasrpd4p`M`SSr1K(i~W;~w1A_XYe?CIhd zV&VUG;%mMJ1rE1^-et!3|K~QloL%~jp|sB8TcH`7Q^iAZCD#Ti&u)ea_JBt^4VN-> zk^{77$T4Y^aITVWDl9%Ub6P@v(_2n%L!oOP@i)p2$u|qm{=Uz;Y1;!e`?tC#MZcR~ zO5e%;aV@W|%=jJ2@yWZX#U;?X#);!0%VY~9-rbe4j6mlwc)I$ztaD0e0sv(1 Bdo%z5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/fax-machine.png b/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/fax-machine.png new file mode 100644 index 0000000000000000000000000000000000000000..428918e73103bb12c6fd84ed3cbd52c18847456a GIT binary patch literal 429 zcmV;e0aE^nP)Px$XGugsR9J=Wm9b01Kop06ic8a*n@L*elt5{yrE7aAs2QBZwQK&Ztm1S-M8rYd zLMtsoG8LR!(_A!MGH(`-!f|) zi4<4WTJFL@u!P9IOaY_QTK9S^*{?Fio>?!BPVA`5cbpY{kPc{2PIUZnv90k4B@y z#etmv0Ap;c+b|5l7~8Sq7X${h56oVQMT5eUmnxq znyziEW!;>@0&&ElR0#lJHhbThms~z^!~p=)$#m}^0tBYv`Q>S$N%(O8Bs6Iy5{cv! X-JEd&LsJ*g00000NkvXXu0mjfyehg_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/meta.json b/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/meta.json index fcddb67df8f..ad4537936fc 100644 --- a/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/meta.json +++ b/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made for the Imperial Space community, authors'es discord nickname: pyrolizz", + "copyright": "Made for the Imperial Space community, authors'es discord nickname: pyrolizz, Created by EmoGarbage404 (github) for SS14, solar-assembly-part taken from tgstation and modified at https://tgstation13.org/wiki/Guide_to_construction#Solar_Panels_and_Trackers, ame-part taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1b7952787c06c21ef1623e494dcfe7cb1f46e041; singularity-generator, tesla-generator, radiation-collector, containment-field-generator, tesla-coil, grounding-rod inner icons made by lzk228; emitter made by pigeonpeas. fax-machine made by moomoobeef", "size": { "x": 32, "y": 32 @@ -13,6 +13,15 @@ { "name": "overlay" }, + { + "name": "oracle" + }, + { + "name": "sophie" + }, + { + "name": "supermatter" + }, { "name": "icon-default" }, @@ -39,6 +48,12 @@ }, { "name": "containment-field-generator" + }, + { + "name": "emitter" + }, + { + "name": "fax-machine" } ] } diff --git a/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/oracle.png b/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/oracle.png new file mode 100644 index 0000000000000000000000000000000000000000..34c3cecbe9abe1e658e27f1c868f318e0a1de420 GIT binary patch literal 409 zcmV;K0cQS*P)Px$Q%OWYR9J=Wm9a|0Kpe(D#VNh1gPEjT;R>OlLSG<4jL^l>;t&wTCvYtY^#S?> zjvX9|t2j6p3Q9^K2fjc}2TLK%dM>tBjk!xxaJk=GJr;w>j4Pe#`UaucQD-f`N;qLk#ul?|suI%bKyEz4|P{fM} zqtP>}W)*LfNxlHf9k76b5Dk|-H(A&N2+_a-hEnN3YUfhej>TugId8TaT!v<=!Dquc zw;hY0U%1?MEMe~mdm!nPzZ>4_y6BrieXamW=If?E*IC)!xN=LV0Kx!eSI_jqta@P+ zb_X3qQM_6gee=)1Ac|si2c7K(003H{I6gT7A=>ASwTJC5b6TO_>cViEKR~>QpcM!J z;P$GYdK54905JB(!a)Q`OhcK|EQ!a5C#gxRP$(21x|)Px$V@X6oR9J=Wm9a|0P!xuL#VNg01~W;w!VQFm3VneHF+vwh#UUVwPvBY*>I3u% z96LA^S8;GI6qJ-e0=_^^hn7N`^|}~LX-uw(*5!Un;P7Am|J+>80R#ep;Gfyy5$O$$ z6*X{P-As=?9&<(6|FLlp%)oOlGl1UEShINusY2j;KJITG@HPlGbTwPS`RysFN)fF> zjK?pi>vg@+Bb1>H&ZhheZ-_yQ THyt|v00000NkvXXu0mjf9pttj literal 0 HcmV?d00001 diff --git a/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/supermatter.png b/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/supermatter.png new file mode 100644 index 0000000000000000000000000000000000000000..3027880680a8807a15773c8d6d83669f80f6b64c GIT binary patch literal 419 zcmV;U0bKrxP)Px$T}ebiR9J=WmAy*CP#A_E#VI{qI#>{-;Fdz^kC0w~1%JTeAl^dnp%>5_=_U^1 zB7$Ck1*JtuphLl>nu0DSS>qrnDK^PzQ+4pXOMcFK@;+Y@z7Ld?l$8EhYci%vt>iBo z(0_c2&Df9$&*wK64z}$HGW%iyDz%bt7`td0fn{2BPCnS#%6#*U#xCv4EP7GLa~*oU z2g;Q)uP-m@0D=lE(?ST1&aD>V6bSL>HEBO* zr2*EH4D((&!2A9De=EwrG(eo9Abt&C6i*32j|0pLOZyoT0Y+nYdY-HM z)2hSa;d^2KN&vb;1IO_q*TdnCtiYB9NGd`-gi=O~RY&yYx*$NlEEn=o9!ZZ78>o@BaV* N002ovPDHLkV1l< Date: Mon, 23 Dec 2024 18:13:38 +0500 Subject: [PATCH 4/6] do --- .../Objects/Devices/flatpack.rsi/ame-part.png | Bin 418 -> 410 bytes .../containment-field-generator.png | Bin 433 -> 425 bytes .../Objects/Devices/flatpack.rsi/emitter.png | Bin 326 -> 283 bytes .../Devices/flatpack.rsi/fax-machine.png | Bin 429 -> 379 bytes .../Devices/flatpack.rsi/grounding-rod.png | Bin 450 -> 442 bytes .../Devices/flatpack.rsi/icon-default.png | Bin 204 -> 196 bytes .../Objects/Devices/flatpack.rsi/meta.json | 2 +- .../Objects/Devices/flatpack.rsi/oracle.png | Bin 409 -> 406 bytes .../Objects/Devices/flatpack.rsi/overlay.png | Bin 319 -> 311 bytes .../flatpack.rsi/radiation-collector.png | Bin 480 -> 472 bytes .../flatpack.rsi/singularity-generator.png | Bin 447 -> 439 bytes .../flatpack.rsi/solar-assembly-part.png | Bin 469 -> 451 bytes .../Objects/Devices/flatpack.rsi/sophie.png | Bin 425 -> 393 bytes .../Devices/flatpack.rsi/supermatter.png | Bin 419 -> 414 bytes .../Objects/Devices/flatpack.rsi/tesla-coil.png | Bin 414 -> 406 bytes .../Devices/flatpack.rsi/tesla-generator.png | Bin 442 -> 434 bytes 16 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/ame-part.png b/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/ame-part.png index 575e4aa2ab98089ea40aa1ed36640152cea57705..43dbb84814b0e77d51021a23de7f5dea42097cc1 100644 GIT binary patch delta 21 dcmZ3)Jd1gP3KwH>kh>GZx^prwH=5-z0su*g2PFUi delta 29 icmbQmyoh;%iV$akM`SSr1Gg{;GcwGYBe790hY3KwH>kh>GZx^prwH=0#50su?@2T}k4 delta 29 icmZ3z zDV-0{FH{1RGy)-qPzxj^lny9JL8cKPU?ZG6g0f4*s-B=TL63x$nF-s?Sa3Vzk4X#X zy&tyVDMB$k{V62U6r6j4jGGG4G`B#pYGgNzp}19Q@U<`Zo^Sz^6F4#r01*+D00000 LNkvXXu0mjf@w7i0 delta 198 zcmV;%06G7g0>%Q6F%1M~K}|sb0I`n?{9y%=E?a*Ia7bBm000id000id0mpBsWB>pF zgGod|R5(xVk?RhCAP7dmOLjBg|80Xr&87ALb$&SZaW)1*c;Oc!MSvPfivV~BP~t3r z(r7GWP%D@o0xEO~svClFbHbUHU~hu$2@5e2)<|F2cETTn5u5kEJA$_0CO_>hG;;fb z>Xt5`)1|naQeK4W)R_BO2=YsUghWw0d_oA}1d}*24ZC?=0RR9107*qoM6N<$g1swE Ay#N3J diff --git a/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/fax-machine.png b/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/fax-machine.png index 428918e73103bb12c6fd84ed3cbd52c18847456a..9e25c4dddb9f44883e2c57e923360a488605ebcb 100644 GIT binary patch delta 339 zcmV-Z0j&P51N#DyF@H5lL_t(oh3%F*PQ)+}hJO%>l#XrKGb|E_M=oGdAaaScxmK>= zB8Xyd5FP@Fy+NdG{E!2m}KEog+@t{lnc>+fB1Z z6h%98i3s!gnem?|(Fa?&i)<_pn8dG5xmH<+~TIiHOX{e=Zdnl+GoW!+j z{;jOybVEeMLEJ(sEkZICoLbW*%OxG_Vgj``y(FT`eN*!8UEcS&a1W43B$9vTKqSfN zwAMunOkUqIYaEFbSJhhX!a=Zv$i7SgqtjaVdM8k-1it4Z2!ED4b5*qlP1g`d9IiV? z+i2rsu_z~ybl`hF2vI;tBlBav=c8Uf7V2C`003NfjApZeyIYpVhQlE$l?qm?6>Qs1 zoVQMT5eUmnxqnyziEW!;>@0&&ElR0#lJHhbThms~z^!~p=)$#m}^0tBYv`Q>S$ jN%(O8Bs6Iy5{cv!-JEd&LsJ*g00000NkvXXu0mjf^RKk) diff --git a/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/grounding-rod.png b/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/grounding-rod.png index c9ba5231262b8dde358918c1e86dbf52b1de6d88..883671c3a22f94b82d9a42ebe43b04d09963e5e8 100644 GIT binary patch delta 21 dcmX@ayo-5)3KwH>kh>GZx^prwH=6Y@0sv0Q2ZaCt delta 29 icmdnRe2961iV$akM`SSr1Gg{;GcwGYBe7AhhYkh>GZx^prwCz?$I07xPSegFUf delta 28 hcmX@Yc!qI;iV$akM`SSr1Gg{;GcwGYBQa5L8USV42F3sY diff --git a/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/meta.json b/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/meta.json index ad4537936fc..27b92ac5f35 100644 --- a/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/meta.json +++ b/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made for the Imperial Space community, authors'es discord nickname: pyrolizz, Created by EmoGarbage404 (github) for SS14, solar-assembly-part taken from tgstation and modified at https://tgstation13.org/wiki/Guide_to_construction#Solar_Panels_and_Trackers, ame-part taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1b7952787c06c21ef1623e494dcfe7cb1f46e041; singularity-generator, tesla-generator, radiation-collector, containment-field-generator, tesla-coil, grounding-rod inner icons made by lzk228; emitter made by pigeonpeas. fax-machine made by moomoobeef", + "copyright": "Made for the Imperial Space community, authors'es discord nickname: pyrolizz | supermatter, sophie, oracle, fax-machine, authors'es github: CrimeMoot", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/oracle.png b/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/oracle.png index 34c3cecbe9abe1e658e27f1c868f318e0a1de420..443397d9a518470cc5c3b6431fec5ac87d7feb23 100644 GIT binary patch delta 366 zcmV-!0g?Wh1C|4jF@I1=L_t(og=1hC1*2dTjC8NU|?V{+WCipX|@tv{MM3}3~DjraQ?s4dvLYauU#i-E)%g1 zpcNoG1kl01)O!$yJvW?<95OU_0Nk=AFUhhPZVuTxsRW1$fq$1TU%}buI9M1Mav!0{ zpE-%d=U{;+K4g8k08!cStKVJ|6|6U=+Xr00et(k7Z2r6#xJL M07*qoM6N<$fMHG^+z;Jx^%9(yw8y1t*;I1HzdsY?xD)(l>+AAdqC5U_yZ?)o0D{qUEr z?CLnXIR&jy#ES@{(KD)M6>pPCz5vS|uz-OO4VOJPS=a*z(ZB+RQt3cy=Tg{?#b?7g zZ?+m-hGwh5XTv$S9gCk|xZHLuVebfgAnB988{X===$k@)t^i5q>!v@~S=rsVa!aTH z!T@Dg&-B8qdTL=4b_X3qQM_6gee=)1Ac|si2c7K(003H{I6gT7A=>ASwTJC5b6TO_ z>cViEKR~>QpcM!J;P$GYdK54905JB(!a)Q`OhcK|EQ!a5C#gxRP$(21x|)kh>GZx^prwH=1!W0su`V2KoR1 delta 29 icmdnaw4Z5$iV$akM`SSr1Gg{;GcwGYBe7ABlMw)EWClV2 diff --git a/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/radiation-collector.png b/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/radiation-collector.png index 116ccee9797d023b64b5f795795bfd5084c9fa72..49ba401636582f7cc6862460713b778e6f605a3d 100644 GIT binary patch delta 21 dcmaFBe1my{3KwH>kh>GZx^prwH=3kh>GZx^prwH=1=a0su}+2Ydhk delta 29 icmdnayq|f3iV$akM`SSr1Gg{;GcwGYBe7AhlMw)Fng+xG diff --git a/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/solar-assembly-part.png b/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/solar-assembly-part.png index 0adcec5ad596af33749414ed822638b561f91266..48318e641b04c474646f4b9d6dbcf94270ccacee 100644 GIT binary patch delta 425 zcmV;a0apIi1H%K5B!2;OQb$4nuFf3k0004fNkl1o#lT;bRq&XN~J^jIuat^;z zqN6}oRR*hgPk#qV>d^t&iO|Q-lR;cuj6qXNlOZ`Zp5f)oR}5P=Z710rvJ;`WxENkO zO&!qF-@%}%rGLqwsinzqVE;il8&`DT17t-(Nnr&;a%wyS0|NttgQGn>)z6*1kYuyS zjso;7MogB&28a%U$G4xL@L>tAr@sTM&(YQ60z_5E21dI7VTmkM_ZUI-t1nwIFfc$u z<-)nk)TxePKunqgZytYq`w0WXW#Y{v+5xaQe)aSR!y>DvcZgCu3P!;wAO-*c9A9`L TX=nIc00000NkvXXu0mjfFb2R# delta 443 zcmV;s0Yv`81JwhNB!3BTNLh0L01FcU01FcV0GgZ_0004pNkl;~u>%+w7#K9QG#MBe7#PIl zFEU7~DZ<4s?!LyL@2UmoKfiS!uJ-!1>jcdm8c~1^Jim1xgMW=2GBkGp%(7PxuaRXj z3=EAZc=_@boPCk`E5pUJS5V}iFGuCW5+AZYiX4#Ra)&`o`U%6Ur#~1x@@^B>FiDj` zOqzq?)zcpYl@c8VvZ^vz#e4cYNK%gu$WDYlex3~C;$jS%TAB>WsqqXiU%q14vS~ZX z=8&BT#l^+&@_%XSfS&#i22CwZ22CwZh6DQ#!r8c@10NtO3Q7tq7?M-t85kHC7#tk! z;i-P^?1dzoMRpXRXE9>395z672t2<11ceVva6SDUSbdJJ9v5IFrde)itoI+5$U=3G z5mdkWvK0dZ10+<=pS?t#>KF#Zq&e{B@yEBHFfd#u-ZVU-9RQ2tS5JR1yn1?vD7C}@ lqN0G7V8Cm`Q3s4V000>9fCJO#Mpgg-002ovPDHLkV1hJBy9WRO diff --git a/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/sophie.png b/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/sophie.png index d7a03c55e721885cc2f41f2710ef30ec0e5e91b1..e9391dddac0e751d0585b3847ee83558ace7ffcd 100644 GIT binary patch delta 353 zcmV-n0iOP;1BnBWF@HlzL_t(og=1hC1*2dTjC8NU|?V{+WCipX|@tv{MM3}3~DjraQ?s4dvLYauU#i-E)%g1 zpcNoG1kl01)O!$yJvW?<95OU_0Nk=AFUhhPZVuTxsRW1$fq$1TU%}buI9M1Mav!0{ zpE-%d=U{;+K4g8k08!cSt_mucIW|7c9Y8HWwgb?EoZKiND-B3j zaxpw@|3Nj8_=hN;kAhJ!3Sa;Lh&W~!tPRde00000NkvXXu0mjf*z%lO delta 385 zcmV-{0e=381E~X$F@Ix8L_t(oh3%EGO2beThJVE=y;BA=Nw>lcgoX-zfe0}|7fZz< zAc#-kS`g|3^a&h0I22cLa4r;-lt2Q$Kuw31LYnou7))tQu8G#=eoNr+U;h8xT+RUm z0)gP4+2IlC4UH8wa9-U^k3Al9McMzcaS+VFb1pN0-q2XHd4CA0Lg0Ho?r$FOHV8I! zHCw^??J1~A5v@Xu$1kYsb-YifJhVG4wiqp$X&LO|(q^V*_yQHyt|v00000NkvXXu0mjfw9>FS diff --git a/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/supermatter.png b/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/supermatter.png index 3027880680a8807a15773c8d6d83669f80f6b64c..43c1a504e45579fe1c70a2a40cd33d2463de47cc 100644 GIT binary patch delta 374 zcmV-+0g3*j1D*qrF@IP|L_t(og=1hC1*2dT3@~6Mq`=+N`9F-E=Xipkfs^)Iz}Y*u z?%gx17(DWB6E<;@Dub9b2g9qUKNwQZ5mruA6v(Q|5TlGN^%SK6 z&L^ZfjH(WJxiyG^>9r%n%dJ85cfiZ7K@3V#+$emyIe`0oES!Ds*;lOMG<5*X(to1+ z;bIE20|cu}10&u4;^JZq3=9kmp}NNi8o2th6$1kU zq#(L*?lN_%V;B&V=D?fBAK!k$z;Kxq6Nz*HtXO^Z^asPMr+0`_I|@d@C>SyT08BS) UV1%NrO#lD@07*qoM6N<$g64gwVgLXD delta 379 zcmV->0fhdZ1ET|wF@If2L_t(oh3%ESO2beXh9AW#JzY9j5TxLiLg|l?UVsIEz~Ug@ zLhqp$&>QI{4&ow$UVsIqMM$7S!KIplE+$#yASo#}$!Sw{@VrZY&U^AcUlP6#l$4Z| z{#a`=rb?~kFB{N*e2UH3kO|M{Hx~}J?FlmbVgV|(l5ZHhXnz@jWm=4{1I!Cc z`xz1eMq_t+o^-4G)2hSa;d^2KN&vb;1IO_q*TdnCtiYB9NGd`-gi=O~RY&yYx*$NlEEn Z=o9!ZZ78>o@BaV*002ovPDHLkV1j~Au%!S1 diff --git a/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/tesla-coil.png b/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/tesla-coil.png index 99b69ba47b4d52c73daedc139527d5c95ca42d2d..497fb7590649460a2cd82307f2fce546d3f1820d 100644 GIT binary patch delta 21 dcmbQoJdJsR3KwH>kh>GZx^prwH=1QI0su(i2N?hW delta 29 icmbQnJdb&TiV$akM`SSr1Gg{;GcwGYBe790gAo8@AO>Lo diff --git a/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/tesla-generator.png b/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/tesla-generator.png index 5853c2f696c25e31f2184149f74f230841a2bcf9..ceeec99b575cc4def5e57cb7faf543be6c84a522 100644 GIT binary patch delta 21 dcmdnRyoq^&3KwH>kh>GZx^prwH=4CD0su{U2W Date: Mon, 23 Dec 2024 18:18:52 +0500 Subject: [PATCH 5/6] fix emitter --- .../Objects/Devices/flatpack.rsi/emitter.png | Bin 283 -> 273 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/emitter.png b/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/emitter.png index 1d0f656ba89469105034d7a0fed6f2cddb212012..7ecf44a17d984a1d3bba0a2964a30e99b7001a91 100644 GIT binary patch delta 144 zcmV;B0B`@B0+9lciGOoRL_t(IjpfkM3V<*OKv6}7YOVhNZ`0Kx$T_H|=t3cMm^4^B z!QTKPa!qFk5V44qhv+dV3tpWN0YD{3h;RqQG}LrG?0-FMmiGO`bL_t(IjqQ@j3V<*SL^EC0TK)gOHAPywd(?yPPzLfKBq^N_ z&@WU1l{5k&hfoV7B$N&)NI|9%AYdb$JA$%H#Hya4GeM7pm6-|K%~)_dh($07*qo IM6N<$f=|Fc6951J From 5d6e5b0a3ae3eaa53e3c618ac25ece1f3bee1d01 Mon Sep 17 00:00:00 2001 From: CrimeMoot Date: Mon, 23 Dec 2024 18:19:08 +0500 Subject: [PATCH 6/6] todo --- .../Textures/_SpaceCats/Objects/Devices/flatpack.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/meta.json b/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/meta.json index 27b92ac5f35..f415581496b 100644 --- a/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/meta.json +++ b/Resources/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made for the Imperial Space community, authors'es discord nickname: pyrolizz | supermatter, sophie, oracle, fax-machine, authors'es github: CrimeMoot", + "copyright": "Made for the Imperial Space community, authors'es discord nickname: pyrolizz | supermatter, sophie, oracle, fax-machine, emitter, authors'es github: CrimeMoot", "size": { "x": 32, "y": 32