From ec28e777c1ed7a93b953b6939a291c7daf5e8344 Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Wed, 28 Feb 2024 23:02:02 +0100 Subject: [PATCH] Remake cargo orders to contains flatpacks (#25647) * Remake cargo orders to contains flatpacks * whoop * grounging plamsa --- .../Catalog/Cargo/cargo_shuttle.yml | 4 +- .../Catalog/Fills/Crates/engines.yml | 19 +-- .../Catalog/Fills/Crates/shuttle.yml | 19 +++ .../Entities/Objects/Devices/flatpack.yml | 114 ++++++++++++++++++ .../containment-field-generator.png | Bin 0 -> 451 bytes .../Devices/flatpack.rsi/grounding-rod.png | Bin 0 -> 469 bytes .../Objects/Devices/flatpack.rsi/meta.json | 20 ++- .../flatpack.rsi/radiation-collector.png | Bin 0 -> 487 bytes .../flatpack.rsi/singularity-generator.png | Bin 0 -> 484 bytes .../flatpack.rsi/solar-assembly-part.png | Bin 447 -> 499 bytes .../Devices/flatpack.rsi/tesla-coil.png | Bin 0 -> 443 bytes .../Devices/flatpack.rsi/tesla-generator.png | Bin 0 -> 447 bytes 12 files changed, 164 insertions(+), 12 deletions(-) create mode 100644 Resources/Prototypes/Catalog/Fills/Crates/shuttle.yml create mode 100644 Resources/Textures/Objects/Devices/flatpack.rsi/containment-field-generator.png create mode 100644 Resources/Textures/Objects/Devices/flatpack.rsi/grounding-rod.png create mode 100644 Resources/Textures/Objects/Devices/flatpack.rsi/radiation-collector.png create mode 100644 Resources/Textures/Objects/Devices/flatpack.rsi/singularity-generator.png create mode 100644 Resources/Textures/Objects/Devices/flatpack.rsi/tesla-coil.png create mode 100644 Resources/Textures/Objects/Devices/flatpack.rsi/tesla-generator.png diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_shuttle.yml b/Resources/Prototypes/Catalog/Cargo/cargo_shuttle.yml index bc0f60fcf3..96a193881e 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_shuttle.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_shuttle.yml @@ -3,7 +3,7 @@ icon: sprite: Structures/Shuttles/thruster.rsi state: base - product: ThrusterUnanchored + product: CrateEngineeringThruster cost: 1500 category: Shuttle group: market @@ -13,7 +13,7 @@ icon: sprite: Structures/Shuttles/gyroscope.rsi state: base - product: GyroscopeUnanchored + product: CrateEngineeringGyroscope cost: 4000 category: Shuttle group: market diff --git a/Resources/Prototypes/Catalog/Fills/Crates/engines.yml b/Resources/Prototypes/Catalog/Fills/Crates/engines.yml index 315c4dda2c..9b47036b01 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/engines.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/engines.yml @@ -42,17 +42,18 @@ components: - type: StorageFill contents: - - id: Emitter + - id: Emitter # TODO change to flatpack - type: entity id: CrateEngineeringSingularityCollector parent: CrateEngineeringSecure name: radiation collector crate - description: A radiation collector, best used for singularity engines. + description: A radiation collector, best used for singularity engines. Plasma is included. components: - type: StorageFill contents: - - id: RadiationCollectorFullTank + - id: RadiationCollectorFlatpack + - id: PlasmaTankFilled - type: entity id: CrateEngineeringSingularityContainment @@ -62,7 +63,7 @@ components: - type: StorageFill contents: - - id: ContainmentFieldGenerator + - id: ContainmentFieldGeneratorFlatpack - type: entity id: CrateEngineeringSingularityGenerator @@ -72,7 +73,7 @@ components: - type: StorageFill contents: - - id: SingularityGenerator + - id: SingularityGeneratorFlatpack # Particle Accelerator @@ -113,7 +114,7 @@ components: - type: StorageFill contents: - - id: DebugGenerator + - id: DebugGenerator # TODO change to flatpack - type: entity id: CrateEngineeringSolar @@ -147,7 +148,7 @@ components: - type: StorageFill contents: - - id: TeslaGenerator + - id: TeslaGeneratorFlatpack - type: entity id: CrateEngineeringTeslaCoil @@ -157,7 +158,7 @@ components: - type: StorageFill contents: - - id: TeslaCoil + - id: TeslaCoilFlatpack - type: entity id: CrateEngineeringTeslaGroundingRod @@ -167,4 +168,4 @@ components: - type: StorageFill contents: - - id: TeslaGroundingRod + - id: TeslaGroundingRodFlatpack diff --git a/Resources/Prototypes/Catalog/Fills/Crates/shuttle.yml b/Resources/Prototypes/Catalog/Fills/Crates/shuttle.yml new file mode 100644 index 0000000000..e81fcb29a8 --- /dev/null +++ b/Resources/Prototypes/Catalog/Fills/Crates/shuttle.yml @@ -0,0 +1,19 @@ +- type: entity + parent: CrateEngineering + id: CrateEngineeringThruster + name: thruster crate + description: Contains a thruster flatpack. + components: + - type: StorageFill + contents: + - id: ThrusterFlatpack + +- type: entity + parent: CrateEngineering + id: CrateEngineeringGyroscope + name: thruster crate + description: Contains a gyroscope flatpack. + components: + - type: StorageFill + contents: + - id: GyroscopeFlatpack diff --git a/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml b/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml index 5ac66affdf..5499348bd1 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml @@ -67,3 +67,117 @@ guides: [ AME, Power ] - type: StealTarget stealGroup: AmePartFlatpack + +- type: entity + parent: BaseFlatpack + id: SingularityGeneratorFlatpack + name: singularity generator flatpack + description: A flatpack used for constructing a singularity generator. + components: + - type: Flatpack + entity: SingularityGenerator + - type: Sprite + layers: + - state: singularity-generator + - type: GuideHelp + guides: [ Singularity, Power ] + +- type: entity + parent: BaseFlatpack + id: RadiationCollectorFlatpack + name: radiation collector flatpack + description: A flatpack used for constructing a radiation collector. + components: + - type: Flatpack + entity: RadiationCollectorNoTank + - type: Sprite + layers: + - state: radiation-collector + - type: GuideHelp + guides: [ Singularity, Power ] + +- type: entity + parent: BaseFlatpack + id: ContainmentFieldGeneratorFlatpack + name: containment field generator flatpack + description: A flatpack used for constructing a containment field generator. + components: + - type: Flatpack + entity: ContainmentFieldGenerator + - type: Sprite + layers: + - state: containment-field-generator + - type: GuideHelp + guides: [ Singularity, Power ] + +- type: entity + parent: BaseFlatpack + id: TeslaGeneratorFlatpack + name: tesla generator flatpack + description: A flatpack used for constructing a tesla generator. + components: + - type: Flatpack + entity: TeslaGenerator + - type: Sprite + layers: + - state: tesla-generator + - type: GuideHelp + guides: [ Power ] # TODO add tesla guide + +- type: entity + parent: BaseFlatpack + id: TeslaCoilFlatpack + name: tesla coil flatpack + description: A flatpack used for constructing a tesla coil. + components: + - type: Flatpack + entity: TeslaCoil + - type: Sprite + layers: + - state: tesla-coil + - type: GuideHelp + guides: [ Power ] # TODO add tesla guide + +- type: entity + parent: BaseFlatpack + id: TeslaGroundingRodFlatpack + name: grounding rod flatpack + description: A flatpack used for constructing a grounding rod. + components: + - type: Flatpack + entity: TeslaGroundingRod + - type: Sprite + layers: + - state: grounding-rod + - type: GuideHelp + guides: [ Power ] # TODO add tesla guide + +- type: entity + parent: BaseFlatpack + id: GyroscopeFlatpack + name: gyroscope flatpack + description: A flatpack used for constructing a gyroscope. + components: + - type: Flatpack + entity: Gyroscope + - type: Sprite + layers: + - state: base + - state: overlay + color: "#cec8ac" + - state: icon-default + +- type: entity + parent: BaseFlatpack + id: ThrusterFlatpack + name: thruster flatpack + description: A flatpack used for constructing a thruster. + components: + - type: Flatpack + entity: Thruster + - type: Sprite + layers: + - state: base + - state: overlay + color: "#cec8ac" + - state: icon-default diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/containment-field-generator.png b/Resources/Textures/Objects/Devices/flatpack.rsi/containment-field-generator.png new file mode 100644 index 0000000000000000000000000000000000000000..63c0450e730199ddd53fce86f27060ca797d6324 GIT binary patch literal 451 zcmV;!0X+VRP)F6XAut*OqaiTBA;3tC{RT$5|A|qDP0fXKm+{)c zLdal{<>KOEgp^^(zkKd9i<^hx`nBr}Z2_Mdl%%*ZEW7vYD?`-= zUItAqO@?n@zc8FSb(TTjK%e2o^XCK|j@JP&AAl_9;o)Lv+rx#!Kpvnx1K5%B^0Gwv z9A*%~C`dQF#?bawoMFwXO$2=t66VJMQeX9um!Mjh0wzK#u?0Cu&xCK-b>dQw%N~Lb zz@?FO{!~J4CrX}d2mDUVCdvXripX}rfQG=)qesCWgVBV1iBFzj2!Qf9G5}e6;lc&5 z5Qs*11iE@cjw6^27vC~t`10jC+#G9bYX%U;2EKgx#sE?eED;FV3zsM80FX*h3FqPE z0xpbj0g&Y&b;tlz91{Wr9RMm?K}9hLRJpvwTNH!TfYgJ)#S0f12vtNNbp&fecTZ=s tYQmk{_YyRlQ0R=xkA}c#2#kyn002jRZe04-M4JEr002ovPDHLkV1k`VyVd{z literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/grounding-rod.png b/Resources/Textures/Objects/Devices/flatpack.rsi/grounding-rod.png new file mode 100644 index 0000000000000000000000000000000000000000..847aab55366ca2d1608537db0e1bc583b8ec7d83 GIT binary patch literal 469 zcmV;`0V@89P)pzq(oeNx}=`bRVB$H5RzRB(5k+9BroVIG;$;7i)mTRdowePKMRDpzVKS zZ8;PRrw-sa%20phpc@+{XU%yZ1J$f?ILjL_C7ev}StAgqzZ8|!AI3GPzC zdMX3WW)q!f6?A4rDgz|CdViW#+v`tdK-YDYk4m63D_8^cj|V}bwr%6&e9=3nO-%DS zgY0j3_M*adt;w8Ls}(uZbw?oncq4GSlR9gFn6%+`>oso~MS;YL7X+ z?V1z2iityfLa*Bc_Ye_}eGPZ^wo|=?H`jOUY%U#97YT?2{zn48H3fAR@wU4K00000 LNkvXXu0mjfvRBK! literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/meta.json b/Resources/Textures/Objects/Devices/flatpack.rsi/meta.json index 8e573c2ade..2d1ca37141 100644 --- a/Resources/Textures/Objects/Devices/flatpack.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/flatpack.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC0-1.0", - "copyright": "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", + "copyright": "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", "size": { "x": 32, "y": 32 @@ -21,6 +21,24 @@ }, { "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/Objects/Devices/flatpack.rsi/radiation-collector.png b/Resources/Textures/Objects/Devices/flatpack.rsi/radiation-collector.png new file mode 100644 index 0000000000000000000000000000000000000000..34411a4c745195f3dfafe343f6cea67b15d44280 GIT binary patch literal 487 zcmVF6XAut*OqaiTBA;3tC{RT$5|A|qDP0fXKm+{)c zLdal{<>KOEgp^^(zkKd9i<^hx`nBr}Z2_Mdl%%*ZEW7vYD?`-= zUItAqO@?n@zc8FSb(TTjK%e2o^XCK|j@JP&AAl_9;o)Lv+rx#!Kpvnx1K5%B^0Gwv z9A*%~C`dQF#?bawoMFwXO$2=t66VJMQeX9um!Mjr9e^I>hYufS`1tW7+yZ`neg<1x zTR0zE6yb9X!4N>#?7!wd1HYyPT=?Ve6AbT=96+?!p$bWM!1p)LfRTLyZV#AG0U+4{ z|3AH9_>N>Dh))S1*#W!D{26Rdg)?_uy{ExNVeGs6M2-cnF_9MviyUk!KODXwOS>eU7wkpda<{F?l|Dxv9D-0o9Oj= z{-0@@P*oN6dVP}r#HYUntbmh;3S754AqbOwx88NfAiTE`QlAPdfI88J+u5u6%P200 zoN(cwb<71TfL1H5VhW=+OkBl;Av{IfZi9P>2*rrB!3BTNLh0L01FZT01FZU(%pXi0004{NklMVo4fqy>3i|5Y?IvlS9Kt2E& z`0(Ll1|A+RhPFLiI1JT%ga&;jTgJ-l2Pnwy)!!XO&Nrv#Af0BcJ~qJ#l- zKBZ+BRC4KO4)6L; zp53|kT;BJbduI*=1Ox>9GYc|F@wKS%E6{#=o~p4VBfhe-Jb$yWbL^1|U&smi5D zXLKRDh^>51$gq{q3DHHQGrHK@-xcYM?)i2W{hG5Z%kReuIrfC9TnkGgz^|uB# z))Q0XS@HY~zkgy`7Rh81fWxC2O zHJ%mE4iswzT-P4O^{ZQ8(Dp&)pVhl=pJJ^5*vKMv1!_da$fi(~(AfIP>G7Dj8d1mg z9q0XL3=FwAyPUXZ?C1dWdoBQ-cE@uNfy6YF`I~*m%^r0_YSIP-1O$8l3^1D+e10F? P00000NkvXXu0mjfo*T+o diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/tesla-coil.png b/Resources/Textures/Objects/Devices/flatpack.rsi/tesla-coil.png new file mode 100644 index 0000000000000000000000000000000000000000..bc7672e7aa73cfd7893ca3f58297a553686570b6 GIT binary patch literal 443 zcmV;s0Yv_ZP)F6XAut*OqaiTBA;3tC{RT$5|A|qDP0fXKm+{)c zLdal{<>KOEgp^^(zkKd9i<^hx`nBr}Z2_Mdl%%*ZEW7vYD?`-= zUItAqO@?n@zc8FSb(TTjK%e2o^XCK|j@JP&AAl_9;o)Lv+rx#!Kpvnx1K5%B^0Gwv z9A*%~C`dQF#?bawoMFwXO(>Sz+S)Q4K71HOEF{d20i?d_AumCn!xS(PQi(0dL6&oI zaWQ~sbbw7gK063H0GsCW*RL49ef!1$qA3MrIiOQi3>*R=no>ZP14dQ|fbuvx00sZf zojbwNfDW*!rzjCFzGcSn<;yn|GeDMu0E~u7g4BW3lL82q10cgdC7g$s3%D@C1wfXA z)FA^)-%HSJ lLZLG%KNo+H002ovPDHLkV1ikkug?Gg literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/tesla-generator.png b/Resources/Textures/Objects/Devices/flatpack.rsi/tesla-generator.png new file mode 100644 index 0000000000000000000000000000000000000000..053a9c1e467b5c928798c9bd463135284d032d87 GIT binary patch literal 447 zcmV;w0YLtVP)F6XAut*OqaiTBA;3tC{RT$5|A|qDP0fXKm+{)c zLdal{<>KOEgp^^(zkKd9i<^hx`nBr}Z2_Mdl%%*ZEW7vYD?`-= zUItAqO@?n@zc8FSb(TTjK%e2o^XCK|j@JP&AAl_9;o)Lv+rx#!Kpvnx1K5%B^0Gwv z9A*%~C`dQF#?bawoMFwXO$2=t66VJMQeX9um!Mjh0wzK#u?0CuPhVdjR;{?y_oWumKnpBFW*q~!z@R41V|l7Jt=@-IRG*YRKj_9xqu5J zTmWP_NF6c&6~}}CK?i_}R!~t40#z