From a8c297a374366b129a9b8c2859ffcae03a38693f Mon Sep 17 00:00:00 2001 From: Boaz1111 <149967078+Boaz1111@users.noreply.github.com> Date: Sun, 28 Apr 2024 07:49:03 +0200 Subject: [PATCH] Hyperconvection Circuit Imprinter (#27283) * not done yet * i may be stupid * Update electronics.yml --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> --- .../Circuitboards/Machine/production.yml | 22 ++++++++ .../Entities/Structures/Machines/lathe.yml | 16 ++++++ .../Prototypes/Recipes/Lathes/electronics.yml | 15 ++++- Resources/Prototypes/Research/industrial.yml | 1 + .../building.png | Bin 0 -> 3419 bytes .../circuit_imprinter_hypercon.rsi/icon.png | Bin 0 -> 797 bytes .../circuit_imprinter_hypercon.rsi/meta.json | 52 ++++++++++++++++++ .../circuit_imprinter_hypercon.rsi/panel.png | Bin 0 -> 244 bytes .../circuit_imprinter_hypercon.rsi/unlit.png | Bin 0 -> 4771 bytes 9 files changed, 104 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/Structures/Machines/circuit_imprinter_hypercon.rsi/building.png create mode 100644 Resources/Textures/Structures/Machines/circuit_imprinter_hypercon.rsi/icon.png create mode 100644 Resources/Textures/Structures/Machines/circuit_imprinter_hypercon.rsi/meta.json create mode 100644 Resources/Textures/Structures/Machines/circuit_imprinter_hypercon.rsi/panel.png create mode 100644 Resources/Textures/Structures/Machines/circuit_imprinter_hypercon.rsi/unlit.png diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml index 63c7908432..b3fc840aaf 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml @@ -152,6 +152,28 @@ DefaultPrototype: Beaker ExamineName: Glass Beaker +- type: entity + parent: BaseMachineCircuitboard + id: CircuitImprinterHyperConvectionMachineCircuitboard + name: hyper convection circuit imprinter machine board + description: A machine printed circuit board for a hyper convection circuit imprinter. + components: + - type: Sprite + state: science + - type: MachineBoard + prototype: CircuitImprinterHyperConvection + requirements: + MatterBin: 2 + tagRequirements: + GlassBeaker: + Amount: 2 + DefaultPrototype: Beaker + ExamineName: Glass Beaker + Igniter: + Amount: 1 + DefaultPrototype: Igniter + ExamineName: Igniter + - type: entity id: ExosuitFabricatorMachineCircuitboard parent: BaseMachineCircuitboard diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 2a080a85db..b58544b02b 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -416,6 +416,7 @@ - PowerComputerCircuitboard - AutolatheHyperConvectionMachineCircuitboard - ProtolatheHyperConvectionMachineCircuitboard + - CircuitImprinterHyperConvectionMachineCircuitboard - FatExtractorMachineCircuitboard - FlatpackerMachineCircuitboard - SheetifierMachineCircuitboard @@ -467,6 +468,21 @@ - RawMaterial - Ingot +- type: entity + id: CircuitImprinterHyperConvection + parent: CircuitImprinter + name: hyper convection circuit imprinter + description: A highly-experimental circuit imprinter that harnesses the power of extreme heat to slowly create objects more cost-effectively. + components: + - type: Sprite + sprite: Structures/Machines/circuit_imprinter_hypercon.rsi + - type: Lathe + materialUseMultiplier: 0.5 + timeMultiplier: 1.5 + - type: LatheHeatProducing + - type: Machine + board: CircuitImprinterHyperConvectionMachineCircuitboard + - type: entity id: ExosuitFabricator parent: BaseLathe diff --git a/Resources/Prototypes/Recipes/Lathes/electronics.yml b/Resources/Prototypes/Recipes/Lathes/electronics.yml index 03022b627e..b78703942e 100644 --- a/Resources/Prototypes/Recipes/Lathes/electronics.yml +++ b/Resources/Prototypes/Recipes/Lathes/electronics.yml @@ -277,8 +277,19 @@ category: Circuitry completetime: 4 materials: - Steel: 100 - Glass: 500 + Steel: 100 + Glass: 500 + +- type: latheRecipe + id: CircuitImprinterHyperConvectionMachineCircuitboard + result: CircuitImprinterHyperConvectionMachineCircuitboard + category: Circuitry + completetime: 4 + materials: + Steel: 100 + Glass: 900 + Gold: 100 + - type: latheRecipe id: ExosuitFabricatorMachineCircuitboard diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml index ccc6e9c0f4..4dc60314c4 100644 --- a/Resources/Prototypes/Research/industrial.yml +++ b/Resources/Prototypes/Research/industrial.yml @@ -53,6 +53,7 @@ recipeUnlocks: - AutolatheHyperConvectionMachineCircuitboard - ProtolatheHyperConvectionMachineCircuitboard + - CircuitImprinterHyperConvectionMachineCircuitboard - SheetifierMachineCircuitboard - type: technology diff --git a/Resources/Textures/Structures/Machines/circuit_imprinter_hypercon.rsi/building.png b/Resources/Textures/Structures/Machines/circuit_imprinter_hypercon.rsi/building.png new file mode 100644 index 0000000000000000000000000000000000000000..7987532f3933df65625e3ea668b7bff4f0b32a22 GIT binary patch literal 3419 zcma)8cUV(d7QacPC{0C05eUc#4qYiCC5coWP+W=>MOaagCLl-|;!8$BV3a0RzyzfU zN>K!quBbS4rKzYf5D7(Ef{?&VvM)3H?f$X*?YHmy?tSmxbMNn+bMN_`bCOORx0Tu? zzX<>!b@YgpBl0d3HgQp;ztQifjm(Q5wL0t^eP-^CSCGOh#ZGnIxB>Aon3UOOd)tEzjI`OeBU+Jt-M+wPXS+^SGMyf@MRv|K}lMoB=Xqn2}l z+`h^{g*|6W#vS(j67=(9V^zy3%ge(d-=FpL_09Lqf9{$8Ok90s;uq4U&tCu3^Zm|3 z#&$_D8|BU|Zs|To_x7VD0s87`TL30aU~w_BxAN$g8qu$m7R#*r6vf@RbK0)w_O$JP zP1_{y4Bvfj>-Ma9=h>RN%Z8>A91&kx3&z1d&MA?_-XxMJD9Fn@hjB1tND>%wB)Ag8 z`K(PVw}@uQwOx`{X5BF7dw_`*hf>p%9#{QE8(W56eK8GB`5ZZGvogOdsj7S{+nZs# zK+6k;Ey3$K>Maw8byE{@ym##7>@QlJ1IO5S9z$z(jOV7q zr9uZfssg<_=fBhs#B?KkPJ%oG(KL!?KRMqhIAz1?%Ow1xQ2{Fe@I6?aHdF~A zSkQ9JpJ4UUgfZ?Vq#uMe$m$L{bBF3fXwMX?>ONC+I!rjshLVFt~gKa`xW1W7LBG?x(MV zoCKVNnt1D@rBiCe^Ef7r`Na=QGOpw~=`q#~5&zZC$Qn-y1Eo*xC!Nx<=BRT@L)#p- zO;q2Bukwlt|5loBbX{ll{p!ibO#X@&l%cma6~b{`qGNHs3D|jhcLgVEDR#-Jb-)&T z$0uhJm&mgV5?bZ4c_fn9;#h74m1~PI*PJqdRV#j?nu;15(-g}QWX?=y?-=|{ z(O@9oQLeTK)Z|`XDs}l^qY)5Ct=yI3)Y}*d#%s>S^RSFCa(KN`5?CrFEKUqS? z+9|QkQ0v)sZV)EdnWT*fxD(7l)YN0X3bKRU-Cu^DYDAQK(a%hv>TV*q{zw(k>*_CS zq~Diy=Y@u03cE+oH+7|UMW$nOf=%&1H)X?Qs&#uBL(IANNHb~|FLck~kj(w=$SiEu z+#bBnSR~{asm)bre*zJPrOE=yqVmHA+ z78bckFP1Eitai~@-fB10u8Jr9?m60;(rX^7687MNs$kTXr$sZ z80nC4vqR0Kdr6Rgyyas1iAX5@f~|nexHGWO?gHc6bU{zHnZP~RC~&Z92DKQXIN$|unBohnvJp2!xDDu?;mpp#7H~ygaKwDd z{Qq>uai=3h2!f*3>e6;;Dcp+-qRs!2u4NRV-;e^KSP)B~!4Wg$dxE#?qd##xPPww3 z{++e6qzPVd#NWU@L1#v^1aH0NiYXc#FUUJrGJmRqDb;qMOOz7*CP=gxou-&1Eo*!F zB>uDl*h6}?@pYBS&V};YI}UR<1Fs23BUirL7gzLI@wNQGZ-g`iOs{ zzxaF3I}GACPr%1F4w%A9q7zaa`0&X7e(hS2F{-dnCO1;_$?g6eO0IkE8FD>);^S8h ze1()dn=TfIt0-;D`a5a9V<##S?dBuv%K;oW563NHY`~GW>)5xg*tcB` z;{l%wC%Akh>@1g!#DD)8Xq|J1{kQ#(QKlg{#tW^#F3(M-t3N?|%i{~AKswDBvUmXU zIP@TNB0Rpnu@aNZNT`)U0?-^{?FsfKve4R-I=ZD4g<8(^&}M|8Vh_a+{mlc74DSKt zya^D2#V${n>FSp?;ObF^A5ljd(V`RAU@`?Sgwt))EAoqPkQ!Z2l?5;QtT<+-tEN@^|7Ml zU%TS4i@z&r|Dm00thmcq`UV3zPdz`p5=lne7Vq_iD|AZas-w5x%1f4(HQ(J5Y}B)zuwCA-ncd&gC{lmnEf1t3>kpVWu1u8I)`lPe0l?td;KLsZLLG0O z6BjPi%=)Ed7Dt-!d5081$aB>CxK)*f_tk#@ Dl6j~p literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/circuit_imprinter_hypercon.rsi/icon.png b/Resources/Textures/Structures/Machines/circuit_imprinter_hypercon.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..e56878a7adcd3b8f7998efc6e973a3ba711a8566 GIT binary patch literal 797 zcmV+&1LFLNP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0EE%S%hL89sdY0u@030RbL{?w+Y|M=*g!X#~z+ zxQ>G7&RYzXK>(UM00bNzOyL+CV1d#o0AKu(3P90t>GDkmJzaGMBO?>2C<0(O0AKtO z0-*Q>0Z<$xgMa`2L0OmpYY2eAmTkMCEaE{-R3MZE0gQ~0G;W};38v4TJA)AwI2`~2 zE0!&UvIqlv2UjQy0sjC04^Dje0NerC;$28soIz4j3d$o5NJxk?czfDHc@O~N^YQaT zc@O}00Lb#xlz6bf>^TTui-?GTF*#uQiY-tUCV2k*8I*+-0s(;mVA|U|kb#Sn1I&K& z<_!ZYD;tgvHmfe^+9u3x`~l|}~e5ZJJO z1DFOy0Vtl*k|V+VZ{L4_X?y_YbM*KX5D>shfB5hLOoIS8pSXKPqa;9IUr2P23pQ`w z08YH1sK7>pLgM7Htzf&sgrc&+e^@qxDWU`rG6SyzK$5Vaq7?u|0n7ndD8=b8gz^fK+%DY zkpVmxfE)p&{)>rALj(u_PhxacUS=o6SWMmZ?xOwous z815dv&!Cs2&+zNvUxw*rz6?jNzk|!e#9=hD882TwXL$Pf8r{ty^J bfPn!3_rFb(m7|jU00000NkvXXu0mjf@}x*> literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/circuit_imprinter_hypercon.rsi/meta.json b/Resources/Textures/Structures/Machines/circuit_imprinter_hypercon.rsi/meta.json new file mode 100644 index 0000000000..faa9a362b4 --- /dev/null +++ b/Resources/Textures/Structures/Machines/circuit_imprinter_hypercon.rsi/meta.json @@ -0,0 +1,52 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Piksqu for ss14, based on the circuit imprinter sprite taken from tgstation at https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "panel" + }, + { + "name": "unlit" + }, + { + "name": "building", + "delays": [ + [ + 0.16, + 0.16, + 0.16, + 0.16, + 0.16, + 0.16, + 0.16, + 0.16, + 0.16, + 0.16, + 0.16, + 0.16, + 0.16, + 0.16, + 0.16, + 0.16, + 0.16, + 0.16, + 0.16, + 0.16, + 0.16, + 0.16, + 0.16, + 0.16, + 0.18 + ] + ] + } + ] +} diff --git a/Resources/Textures/Structures/Machines/circuit_imprinter_hypercon.rsi/panel.png b/Resources/Textures/Structures/Machines/circuit_imprinter_hypercon.rsi/panel.png new file mode 100644 index 0000000000000000000000000000000000000000..e9c369c734fec49931f352c25324996cff93b6f4 GIT binary patch literal 244 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJg`O^sArbD$DG~_>EDn4#?y*Wp zX*)3G%EfzKd3@TfUpw!OY)FhJjsTxnV=Ij3rCLKK9PbHiC=X88?T XfNTyR27yb#lR=cHtDnm{r-UW|*AG^P literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/circuit_imprinter_hypercon.rsi/unlit.png b/Resources/Textures/Structures/Machines/circuit_imprinter_hypercon.rsi/unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..9a9e240fbc1d85b37332327522d4669f57d00e57 GIT binary patch literal 4771 zcmeHKX;c$g77ijHsE7*cV2dFxBWfj;jVuz`!V)9_0TmeqE0xMZ$U;((fN0}NBkhV} z3%KCe(kO0>Ev}%lIl?F^(6$P#f-It<4l3=zVO|0%p6NfHGyRVwmAty|-tXS~z58zE zrH6_FM%y{t5eS6QfapPbxHAXu`JBO>uI#6Z;QG*U$zM#Ph}7!fln zqy&QT-t*nUGtIL`ZD=bzn3XzxeYviO+SYBK{QIgaqNg(`%)t5s$qxEa{B0SvHkI~O zrF}IoEhh$SaV-~au?TBJnwY87oXMaKHjtI zWKrTjp4R`~VW9Cfvnt27`UaA8+p8^>vTO=26zSL-M7D3HTb&Ck@$mMFuIO0pWMu3< z+JWWU%zo#5=}ej|D*XicwPQ;PCFY)GhjRA3?ihd3>iV8r(cL@kUb(&R+^6q(ps$=8 zdwoPg$;^bD>&NqA${dvPF}2mVv~#A%<*#jtte>&~DR-G1mhUraS?0LWM;IME_n3bw-u*k=fZ1%%cU$TiG-63pujt&b&zBT&wVEY3t&` z^G4m9XRR+Pl#fV8dF($cHti0Jt@y#|x>Mir_E2T>Oo%xeVkw(~j!vo0&p*yHbT%zG zu`X?tho`@bd&d1w^-JV?6ey}p9 z?y1}mdosImx|}D%sg|&Py4QmV!{*APYYv77UAzWKPr->BXt{M2akV7twH?F;0V{D$ z$ia*UQ{zWwxtx8~wPWPS#+;TC{YpPoA^MX>+(usJy?Je8+S{@@E0?D=7Sno7mHLJFBl&dA7Wt zp>u1Qy>2^du}Hpcxo6MR-WLtCgGEL`-tgKFkJ(epyl#?f3+LTA3c9n$9ADgd3%Sphm)q%fF^YE)!Iq7h?c zqe=@p9)aNDY1AU962pmNOr}utNL?37NkoN&M_R%Z!a}VtCRYR|>#*=-Q3RT-L^%?Y z=X^U4BNqUuFdQKoRdH%P*T^H8ak*e@5>rS-vkI={ks^hmL|=^#BQnSgG7R|{6^S&` zd^@6tP9o)o@%;xNz#Wey$8jx}LNOQ&WCNY7(a9)O4u?a5X%rd_0veD$NsS{$NUfh{ zg6PNKV|rAl(BcY>nrOmA#F_-0MY+@TA}b0yjnlN0^oyUM6?tt8K$UIl))By z+%FM;3+ZDeOF<_bmVq;J^B|VP@xAJNv4V) zsQGX#zW=U&3&bhRQ$(VVAnr|$`Q2;1N(cRpgzhKf3R3mHl2>R z)1(laMP)(^CXAUz?hqgzx!>ll<4FJ1-8E7w{TTwo> zs{zhTH2#UNfwlM(Jpkw-Ctt)R9*i!y6iq5crZ2i z7i0j(nIpu-G2kd)(KJDVtko#&^t6~2MzIhE`5CncA{&AlbYyS%k8WyAg literal 0 HcmV?d00001 -- 2.52.0