From ba06b17bf9546d746701546256cf0fb19cf2f11b Mon Sep 17 00:00:00 2001 From: bryanhubbard Date: Thu, 31 Oct 2024 10:57:18 -0400 Subject: [PATCH 1/7] tire changes Moved to 64x64. Added 4 directions and more variety. --- .../Decoration/tires.rsi/groundtires.png | Bin 627 -> 0 bytes .../Structures/Decoration/tires.rsi/meta.json | 22 ++++++++++++++---- .../Decoration/tires.rsi/n14junktire1.png | Bin 0 -> 895 bytes .../Decoration/tires.rsi/n14junktire2.png | Bin 0 -> 972 bytes .../Decoration/tires.rsi/n14junktire3.png | Bin 0 -> 729 bytes .../Decoration/tires.rsi/n14junktire4.png | Bin 0 -> 653 bytes .../Decoration/tires.rsi/n14junktire5.png | Bin 0 -> 1119 bytes .../Decoration/tires.rsi/stackedtires.png | Bin 496 -> 0 bytes 8 files changed, 18 insertions(+), 4 deletions(-) delete mode 100644 Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/groundtires.png create mode 100644 Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/n14junktire1.png create mode 100644 Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/n14junktire2.png create mode 100644 Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/n14junktire3.png create mode 100644 Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/n14junktire4.png create mode 100644 Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/n14junktire5.png delete mode 100644 Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/stackedtires.png diff --git a/Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/groundtires.png b/Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/groundtires.png deleted file mode 100644 index 2ba781f193c143bded269251508a73d9eb05bb9f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 627 zcmV-(0*w8MP)Px%ElET{R9HvFRxxhEKoC3%5_d)c1O+Mi|D!?y0wOFLClo~EWSsGO?`(o2uClH3 z&Ft>X-j2e9*XY6c;ok@>7K^JF+-|pPU=B`zz)$0G_`F=A2_})j2*e^zl^7%jAz;A~ zJy$9V*fTf*3tkjOBMEt)*YDVSHvupD{oxSJ{Cqa6wQ)BAfLpOK;<7AT!DU%iIfGe9 z66j+iB|st|;DIwGudCJdWjYPp?KZdsJYXKK(L%wN06-u*>venwFiDU=ON6ngDJ&eW z&nXfrMiqpDHwbirGddntr~Fie`MfDCfW+4O@z@q&A8_?`%W4jZR0Cor_xr=Q4P$lp z>;xO>V$HMX?3z!0J>GT66{jMUALVGIKdRWeysR0a=x~+-TS5Tk0(hkXOMn|dAm(Lc z0d;0QJ=NnJONgLKvL;|v`?lG%8VRjLk#!O1Dnp%tsyj{c%3^9Y?*Ik2zVCY@YR0N4 zS%wq=wHCS<7sb>Uoc}fE0juEUa@otrUEqC&lDf{C1>3p!u1y5rK)|z}mq~9fXbdDa z3s#i&fLQeW&)Qh$04-lb>9kF(p?E&l+AFxVFs@=YG2RC_&mBmte{J*75?KPV{!xkj zheRiVKK|t%?@IQ12>0te5Y50}2&6irW{D1il?NqYFDQLquh-#xKG&bPx&IY~r8RCt{2S;3CtFbp-TO~nOOYKqzebL9U&YB*30MM7Mv;m|oO?s{Cuq;1$i zT0aR1wXtJ6uASro7!3b4R?kxWw%hfex7+A>(=_UwRaN!;S>_zP9}Z8kHMvsB0SP=1 zbLEyInKJ4?=G^dH$^ryBqd6bal`0TPlxWUhE|+g(^E?MWmO3Vle`XMVFI6Dn<8%tX z%bW{l1$7ib1F|j4<;F2Ajvy~~XmHncBi-xux(E211v~?$$fEqx;`nQcFa=#b$pL)6 zEla5Ddi1WYYuJ{hDl5&k6v0p6ZMPE(lNRyJImq)Ix~_}TCw&SyPMU|;gA{g;9)=WX z3h^_bDIGGj@E(rGqxi0_YdE*9_)gN#ZJ25|01H5@60VHafy_B5ybsEp+ZO0p0D!r& zbpAPZ1CRhrRl=3=AZXw#$TLWjL;Z7|=XR@YP-T+4lj1&GDVJNK&;IGe-^1}nw6RXT0btl4;C!M+@0D~Icke$ zvxHy(Bt;l)tx)|Gh)q4u%DXRO5QYHoA`~hvIMJik|CczoEfn4lneeDE(pob_N~!}C zbk%7er|G)%NIOTK%FrFAwm|s(1F!%9OzXvuoYxLMvG)NX9n#!$Y#+`7RN=X8haXoU zfg4XVDRXYt-kr;F9if0pHgjL7ufbK|6Y^CEtv<@}mPAi+T!-WgzZbwZ7P=467D1Ey z)&;0RbMEt~^FkNt(Fy51K+ge^{Kx6kZ_6_JlZdrnY=cW~S^~~P*L5p&;+gUQ)9g=j zA3)PhGca`4j~zpGr@9kJb|r=>ETta(KD8=ccn_bq+c1`|B<@wTWAjub3ji9FIX5au z`~4oS*Xw93moK~@diiFv0bsi~T=kTju%y@GXkciS(Qw|2X&;Z3f2nJ6fUy%2v@30` z1xq?!E&u>OvlTWNmciKJ)C!Fq24jbZ=f(~TFm@P>9X56tVeBx2vBSm=8$0|^j>~cw zI~;(q!vPpOjDL(BHg?$9VPl7l9X572JTMl<4jVgc?69%J#tsKy?C>4N4jT+FgD+_r VmqnHZ*HZuh002ovPDHLkV1ggxj!ysp literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/n14junktire2.png b/Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/n14junktire2.png new file mode 100644 index 0000000000000000000000000000000000000000..a8b346516b2946aab60d47e81b73c0400cff580c GIT binary patch literal 972 zcmV;-12g=IP)Px&hDk(0RCt{2Sj(#8Fbq|Ppb{_b%)ELQmrPR!M zf6XV5-ZjRMb8d8yui>`kB0B?+;#%v8QBt2kKQP9u?hB9snSOm+YiEJV-F>1!0G`k1 z3AMMRq3nT_O{-1;=iIERNkHnqUav)G^e5nbCAY`KYzhY8e!q`dAk{WE0)~`G`4o&X zGo3Nph^CFwN3aQ^u3`#^exe(Ta83q&@@`5m(SO@xjabZpuImO2Hyr-%=G5O>z^Pc!0X(X8!83K2Fcz@0B{LP1p)U2{*L5uiQXVN2wmJ> zZc_~YrKl(?oTG3leBGtw0$;@n1Dnv|M`MLy6H!@O{A*a@Pib+yyND2x>Mq0zW7_hE zCdjCf2_LI_gBbCJ zTWcqu6xL?LZnQYZ-mLKEw0H?tn0M_`*o+nr3Eqx literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/n14junktire3.png b/Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/n14junktire3.png new file mode 100644 index 0000000000000000000000000000000000000000..016cf497da852a65e376b7a20d56ebfa2e056f1a GIT binary patch literal 729 zcmV;~0w(>5P)Px%lSxEDRCt{2nZc^uFbqX+OBaC%jN{zV?0@if}@VP6RWm)P6Kz&Xt zuF+#!rk0^)%X8u|t(OOP4zRo|3UAwHj<>`Z%^YwwciXlnCs=YtFRv5a4v+<`tbb*& z<~R=IoS!oGukR1Q4uKxIBfAd_T!Sg4$23jV0e3Mg8C_%50`F>oo;A+%L@C966}nFV z@H^gOjHZzqE8ed{Am?n3kF3#)%UiPhfbYoZ69e=WLb9WtHAFAZDHzTHJy%YfC-hOi zDujT~V?EDvo!^$gcY1jlx&=xpU8S!TyOIQ3WGsZxRSUF~QmSqqhH^l=`<_JD9)J0s zQhHd9xpRn?JyHY#gSPDY* z^&0;q33`uPO6lqM-EQk6zwf(SH!s7ba8Dtm(ee83T|nfvj=Phq-v~XpLjZWa*F9Xt z>PT+U=&k1K1d;urcC literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/n14junktire4.png b/Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/n14junktire4.png new file mode 100644 index 0000000000000000000000000000000000000000..09ad4bbcd4126c792df3dad622b50895a65fb806 GIT binary patch literal 653 zcmV;80&@L{P)Px%M@d9MRCt{2m@$vTAPj}yoo=X9Q6VvA?En8s89PRbs48Xa4JYRu$0U&IZt44` zlw$J?m=FVm5JCtcgb?zEd>l3Gy6)L(bGzND#`{a(mP1Be*F8_C)BJmyCIEnLlXhv7 zK6^qXcx~tTwc}0GbZ8PjTMfL`u>w7$&(`YN;A{NtY1^Y|#$@I73dplZN@?+X7>4=T zu9g^}6!AcQ5g1zMIPgoX_WZ zHEp1pzV8>SB!QMLLbk6C)FKljX8^Fw{hA9=)oajmBm-*tzF&y5D_#m-x7ohhj~!!6 zOYLp2`XVF__qLc7taEu!n4JW@8?0ZC+7B*G)5lP061K!`-T$}7u(o^S9SI(I;d8jv zrd8N~)&vN7V^|YBV#J!Dfi=MbtO>Fv$eJK)f~*O$CU_jy1i_jhYl5r^vL@*J^Px(8A(JzRCt{2S<7ndFbq9Yx(Jv+z{@QA|DV*QmxjPF;9a}uRYq3iN77DgxH&L% zrmZg@gSn?e2$2EwY#hf(N%}sHBb;*^CzRlvi{x-{HukcN@ny{L79fBGX~G=VHk>agLeq3KkvY^2vHQ2j-M%L;WkZE(wQYp(**B*F^oA% zy0gRCmvip6rT}kg95uOUtu3~`+KxeEC<;ocSSyc%r{mg&v@VbfDVYWuuY2pU>gPZ|xAZIzTS22_XSg1os|q zdEd@CpmY+=$)~~yJU1}4c~KFRLioVX&(Ewu8f3^GDXLmGsF6cyn`@t&HYf)GP*XuV zgDa>N!Bp?f-3Q1sK9|kc;IgG-c;V!suOV^(KMc_X`fH4VwKnoBe@2H80)?KIpQQ^9 zibCF&Q~4}mt;Mn|NrUCu$x5s#mQudvIltx6>Hy`x9QW6{0C5p6-k+76Qc{AaiS{Na z*O9qjYIUWkD%}Vjz7{UV3MghK6QDPiyKyjuQ+3l{)%%nqNy3uW*F#%9d5-81Ijs|6+7I583x#W zKx=lm1v3nE$_}5!3yQMpd)s;1v3nE!Vb4$hJjAl;a1Er&=EV_f*A%nVuxEW l!$7C(@Wl*YxNzYtd;^i^d*(9Nh(7=T002ovPDHLkV1jzd`@R4G literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/stackedtires.png b/Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/stackedtires.png deleted file mode 100644 index c5b84846d1ba663583a80555dc746c36b6b4a950..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 496 zcmVPx$s!2paR9HvtR>7)+Fc7pLf(P*s5d8m-69f;UAc)X1@+RzC5@R%_6q<{gL}zw( zcg!RE@OXR}Kl>5*DexT%7-OEYTZ*FCAJ=vL*F?iGL%WhKQE{!Ko(t`l*Imc@>0eqZk&?I#3W%VZ|fZXbW@_7Md=3d+r@Kc!Aifc6WyW!`x&jfo0iP5+!ur@$q@{NRxZVU0C#nE>2R`?=42 ze9_-hz-Pa%e*lTm0oj7L2}mh@(Q9x#OApZ9ak>Vi{T_i!@5jgG*)jHX6n%>I5z{AU m?z?m#2}z%FJ(&VmNxc9!k-0F>!FH$s0000 Date: Thu, 31 Oct 2024 14:23:34 -0400 Subject: [PATCH 2/7] updates to PR changed png name and updated yml and meta data --- .../tires.rsi/{n14junktire1.png => junktire1.png} | Bin .../tires.rsi/{n14junktire2.png => junktire2.png} | Bin .../tires.rsi/{n14junktire3.png => junktire3.png} | Bin .../tires.rsi/{n14junktire4.png => junktire4.png} | Bin .../tires.rsi/{n14junktire5.png => junktire5.png} | Bin .../Structures/Decoration/tires.rsi/meta.json | 10 +++++----- 6 files changed, 5 insertions(+), 5 deletions(-) rename Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/{n14junktire1.png => junktire1.png} (100%) rename Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/{n14junktire2.png => junktire2.png} (100%) rename Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/{n14junktire3.png => junktire3.png} (100%) rename Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/{n14junktire4.png => junktire4.png} (100%) rename Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/{n14junktire5.png => junktire5.png} (100%) diff --git a/Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/n14junktire1.png b/Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/junktire1.png similarity index 100% rename from Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/n14junktire1.png rename to Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/junktire1.png diff --git a/Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/n14junktire2.png b/Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/junktire2.png similarity index 100% rename from Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/n14junktire2.png rename to Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/junktire2.png diff --git a/Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/n14junktire3.png b/Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/junktire3.png similarity index 100% rename from Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/n14junktire3.png rename to Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/junktire3.png diff --git a/Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/n14junktire4.png b/Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/junktire4.png similarity index 100% rename from Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/n14junktire4.png rename to Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/junktire4.png diff --git a/Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/n14junktire5.png b/Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/junktire5.png similarity index 100% rename from Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/n14junktire5.png rename to Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/junktire5.png diff --git a/Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/meta.json b/Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/meta.json index a4e003b7724..bbf862ab69b 100644 --- a/Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/meta.json +++ b/Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/meta.json @@ -8,23 +8,23 @@ }, "states": [ { - "name": "n14junktire1", + "name": "junktire1", "directions": 4 }, { - "name": "n14junktire2", + "name": "junktire2", "directions": 4 }, { - "name": "n14junktire3", + "name": "junktire3", "directions": 4 }, { - "name": "n14junktire4", + "name": "junktire4", "directions": 4 }, { - "name": "n14junktire5", + "name": "junktire5", "directions": 4 } ] From 3c4076153f535b84649124c98daea7c10bb422a2 Mon Sep 17 00:00:00 2001 From: bryanhubbard Date: Thu, 31 Oct 2024 14:26:01 -0400 Subject: [PATCH 3/7] yml update yml update --- .../Entities/Structures/Furniture/junk.yml | 38 +++++++++++++++++-- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/_Nuclear14/Entities/Structures/Furniture/junk.yml b/Resources/Prototypes/_Nuclear14/Entities/Structures/Furniture/junk.yml index e2265672492..10b6c30092d 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Structures/Furniture/junk.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Structures/Furniture/junk.yml @@ -298,20 +298,50 @@ #Tires - type: entity parent: N14JunkMetalBase #for the moment - id: N14JunkStackedTires + id: N14JunkTire1 name: stack of tires description: A stack of old, unusable tires. components: - type: Sprite sprite: _Nuclear14/Structures/Decoration/tires.rsi - state: stackedtires + state: junktire1 - type: entity parent: N14JunkMetalBase #for the moment - id: N14JunkGroundTires + id: N14JunkTire2 name: a pile of tires description: A pile of old, unusable tires spread on the ground. components: - type: Sprite sprite: _Nuclear14/Structures/Decoration/tires.rsi - state: groundtires \ No newline at end of file + state: junktire2 + +- type: entity + parent: N14JunkMetalBase #for the moment + id: N14JunkTire3 + name: a pile of tires + description: A pile of old, unusable tires spread on the ground. + components: + - type: Sprite + sprite: _Nuclear14/Structures/Decoration/tires.rsi + state: junktire3 + +- type: entity + parent: N14JunkMetalBase #for the moment + id: N14JunkTire4 + name: a pile of tires + description: A pile of old, unusable tires spread on the ground. + components: + - type: Sprite + sprite: _Nuclear14/Structures/Decoration/tires.rsi + state: junktire4 + +- type: entity + parent: N14JunkMetalBase #for the moment + id: N14JunkTire5 + name: a pile of tires + description: A pile of old, unusable tires spread on the ground. + components: + - type: Sprite + sprite: _Nuclear14/Structures/Decoration/tires.rsi + state: junktire5 \ No newline at end of file From a921b1ea4123be2eada5b6fc055001007ef6db05 Mon Sep 17 00:00:00 2001 From: bryanhubbard Date: Fri, 1 Nov 2024 09:06:49 -0400 Subject: [PATCH 4/7] Update junktire3.png --- .../Decoration/tires.rsi/junktire3.png | Bin 729 -> 834 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/junktire3.png b/Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/junktire3.png index 016cf497da852a65e376b7a20d56ebfa2e056f1a..cb9e52edf37669c090bd7b92303b2724eb711032 100644 GIT binary patch delta 798 zcmV+(1L6GH1;Pf9F@O9?L_t(|ob8#xYUD5shSg;cfeDlxAvMkj;Uv2M-+l{%S!!Vq_ z8^=*?v##rLEgk3fVvK70ecw-?ODU$kR&F(dvwYyzpfwN(IDZX$*1$D*Fc644LHK+1 z0H2vCL{^V!wF;6eyQL|>kdF;WPDwrx|t*X$t(!!S@Og;GjS?jwAz*}2R|7{`Bf zNc1`DaQ5+dsCK4lIt?=Cd~yyB&+|;%wsqMf`dkg%Kkjoa2!Cn;0K+gGgY6wW2eYp& zb-6-npfB{T`F|#L$)YI$oKngW=@0_V^GrmavjV1RI{t|0c#b>H;rF;rZiCy#a|jss ztA|SskZ6&G!&ut#z9hz|YJk-?=X?r+W*2_-2Ehz~wI8DcP4%q-bCBaaFF&rIM0yIe z*sTp5;;4OBT>)~o=Xs`_^KpOMwrb8o(K(oT?i7M;DSv-U9}qkUDIY^EI87-aXB+tz zV^jyp(FSFuz`CyL{X2b(!)2n6Tub%1ekf`e+Z#T z2-N^+X8Dsd0C^udXZ5IUodwJlV2K=Zt%sD->2vKQ$d~-G zEM5Ir`Crq9+ecxfK&xQ!rF``+0J}19HM{%1-+vN8^>}E#1_QaT_n?U&`XuW6QG|oE zk$zsi7Mt(MnhwYx8}4GA%U@;N^8LHE9mn~3cwyvjLobYw7e1F=^ld{ax5O@T4JuooiiDgN)WCa0)5JCtc|0&EgX?pr^ zo@aAT&bfYX71#1&jOP6FJfD7-QZD87GBin))rMagZ6S^jrGG`cR;^M6a8IANM5lv0pVdU&1SazJam?7ArX@$q5KTb2bm z=jsH@xSaEgb9&{S=Q-?z@4XKSUgI@lpmo&S6LN>FC2NZ=Z7%A;?SN8Bjkyp4)^!E& zxhtAwS?UKseSc0XuF+#!rk0^)%X8u|t(OOP4zRo|3UAwHj<>`Z%^YwwciXlnCs=Yt zFRv5a4v+<`tbb*&<~R=IoS!oGukR1Q4uKxIBfAd_T!Sg4$23jV0e3Mg8C_%50`F>o zo;A+%L@C966}nFV@H^gOjHZzqE8ed{Am?n3kF3#)%YR$4`+)Dr=@SF=6+*J3o;5@- z&nXzr0XF>Pj=6J)mOWAg0fV;y;CpeoN_aX4^wb7DYj|&gp(HpGZ;}W@ z2(@5plYij4t~idvodES3|0D@|k6TLV>G$1k>m$GKyIVIe!=-RfA*9jq`tDsoT*c~0Zqewl@r1x|68s8R3jR&mgb-rE#>nVIHb%h4NF8HigpCn4 zM%Wku*cf4Bq=k(UurUIFjgbl)BVc2MjS-p4#w`fg7G2(=ckvFmlA%qY@ aNW)K#HV&?_A#x!A0000 Date: Fri, 1 Nov 2024 11:21:44 -0400 Subject: [PATCH 5/7] Update meta.json --- .../_Nuclear14/Structures/Decoration/tires.rsi/meta.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/meta.json b/Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/meta.json index bbf862ab69b..c83808286bd 100644 --- a/Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/meta.json +++ b/Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/meta.json @@ -3,8 +3,8 @@ "license": "CC-BY-NC-SA-3.0", "copyright": "Created by ladyayla and MaxxOrion for N14", "size": { - "x": 64, - "y": 64 + "x": 32, + "y": 32 }, "states": [ { From 6382db0000df4dd22bd69afbb4b251ec65b88df9 Mon Sep 17 00:00:00 2001 From: bryanhubbard Date: Fri, 1 Nov 2024 18:03:36 -0400 Subject: [PATCH 6/7] tile additions Added road tiles and new swampland --- .../Prototypes/_Nuclear14/Tiles/floors.yml | 56 ++++++++++++++++++ .../_Nuclear14/Tiles/attributions.yml | 5 ++ .../Tiles/roadinnermiddlewithtop.png | Bin 0 -> 972 bytes .../_Nuclear14/Tiles/roadouterturnstop.png | Bin 0 -> 1066 bytes .../_Nuclear14/Tiles/roadouterturnwtop.png | Bin 0 -> 1100 bytes .../Textures/_Nuclear14/Tiles/swampland.png | Bin 0 -> 1904 bytes 6 files changed, 61 insertions(+) create mode 100644 Resources/Textures/_Nuclear14/Tiles/roadinnermiddlewithtop.png create mode 100644 Resources/Textures/_Nuclear14/Tiles/roadouterturnstop.png create mode 100644 Resources/Textures/_Nuclear14/Tiles/roadouterturnwtop.png create mode 100644 Resources/Textures/_Nuclear14/Tiles/swampland.png diff --git a/Resources/Prototypes/_Nuclear14/Tiles/floors.yml b/Resources/Prototypes/_Nuclear14/Tiles/floors.yml index 917c4999aaa..77e33f208c6 100644 --- a/Resources/Prototypes/_Nuclear14/Tiles/floors.yml +++ b/Resources/Prototypes/_Nuclear14/Tiles/floors.yml @@ -1701,6 +1701,45 @@ heatCapacity: 10000 weather: true +- type: tile + id: N14FloorRoadInnerMiddleWithTop + name: road inner middle with top + sprite: /Textures/_Nuclear14/Tiles/roadinnermiddlewithtop.png + baseTurf: FloorWasteland + isSubfloor: true + footstepSounds: + collection: FootstepFloor + friction: 0.30 + thermalConductivity: 0.04 + heatCapacity: 10000 + weather: true + +- type: tile + id: N14FloorRoadOuterTurnSouthTop + name: road outer turn south top + sprite: /Textures/_Nuclear14/Tiles/roadouterturnstop.png + baseTurf: FloorWasteland + isSubfloor: true + footstepSounds: + collection: FootstepFloor + friction: 0.30 + thermalConductivity: 0.04 + heatCapacity: 10000 + weather: true + +- type: tile + id: N14FloorRoadOuterTurnWestTop + name: road outer turn west top + sprite: /Textures/_Nuclear14/Tiles/roadouterturnwtop.png + baseTurf: FloorWasteland + isSubfloor: true + footstepSounds: + collection: FootstepFloor + friction: 0.30 + thermalConductivity: 0.04 + heatCapacity: 10000 + weather: true + # Wasteland - type: tile id: FloorWasteland @@ -1865,4 +1904,21 @@ thermalConductivity: 0.4 heatCapacity: 700000 weather: true + indestructible: true + + # Swampland +- type: tile + id: FloorSwampland + name: wasteland + sprite: /Textures/_Nuclear14/Tiles/swampland.png + variants: 4 + placementVariants: [0, 1, 2, 3] + baseTurf: space + isSubfloor: true + footstepSounds: + collection: N14FootstepWater + friction: 0.30 + thermalConductivity: 0.04 + heatCapacity: 10000 + weather: true indestructible: true \ No newline at end of file diff --git a/Resources/Textures/_Nuclear14/Tiles/attributions.yml b/Resources/Textures/_Nuclear14/Tiles/attributions.yml index 9dabf79c982..68558b3e7a6 100644 --- a/Resources/Textures/_Nuclear14/Tiles/attributions.yml +++ b/Resources/Textures/_Nuclear14/Tiles/attributions.yml @@ -36,3 +36,8 @@ license: "CC-BY-NC-SA-3.0" copyright: "Taken from goonstation at commit https://github.com/goonstation/goonstation/commit/ddd7f6a0b7a1b2758c0f9dfff09974854e3ef7ed" source: "https://github.com/goonstation/goonstation" + +- files: ["swampland.png", "roadinnermiddlewithtop", "roadouterturnstop", "roadouterturnwtop"] + license: "CC-BY-NC-SA-3.0" + copyright: "Taken from wasteland at commit 6d346b9a8a1821fbe0a8bb3ac8d358ebcb266e53, swampland, roadinnermiddlewithtop, roadouterturnstop, roadouterturnwtop by maxxorion" + source: "https://github.com/Vault-Overseers/nuclear-14" \ No newline at end of file diff --git a/Resources/Textures/_Nuclear14/Tiles/roadinnermiddlewithtop.png b/Resources/Textures/_Nuclear14/Tiles/roadinnermiddlewithtop.png new file mode 100644 index 0000000000000000000000000000000000000000..d2c497d50804366ef5ef0da47e21335fbdd6d7e5 GIT binary patch literal 972 zcmV;-12g=IP)Px&hDk(0R9J<@mqAnOFbss(irthM${*#2bB6}l2mK`bKlq3 zmoAsfpWjQ;^?KF$eBSMsG(XGd^I4@7wbu5?a@OnXt0F=vCAHRcI-S&e*BC>~vS^GU z&P!5jO(`X9+a^hh2)(?#XpD!>Q%ZV!dz&^(DGClm#B?4JiU@7nre#?spw`;X7;8jm zjG@+=YOUI~ZSLbd_H)i!mSqCXr4&VkdhZiJN@*GfDNn6+2N35eC9Uf^nc!?hDCayK z0t}lWX?}sBl#<36>b+~*Hf`Ic-up}wEBkm`Yx9f;!!yR1fCwP7srN2V2lOw?qWk^6 z0~ZmhweEm={`tO?vI{OE)LNTC<(w5z0+pU4#0QknqlZ@SJDj9gUMrziPSf{ z(m@Y^iT-Cl`_^@xB6P}^Wtlpo0pTx$hzM|qIH4LAh?A%Q~}WfD5W&%#0Jjp_xmhYXP~vF zWm!~8`PD%0eYR4f@4e5%fWU!^>ZlLsMP#r>7v&s(2W0_mQ~}Ysm|@t(>rW81 zE0xD{O8bQouXXRFu)#SrMu|ELV~hs?pJ3>~`}VOcoi!IFK)p->Bx%kH*H6@1cbhsp)H6_ipwf4*C@jl?a`Z)h@x7(x^W{&GIl`cw8H_U~%SSa^l%3%mm&mYnl+LS>K^Mm1~@soU|Zo7X=9@Oef9po2o3 zy6|x1VsnrLL+Sb*z$*Y7wN?eq2FIQ^*9QL+y{CvLXubW{3(GtF2YV?3(BbK}(@ zY1fE63MvBzYpwHI=EC(GmJ6IUyaavN_$B~3NT@}`r_<@byP&6OUO;{XZ8Ib$Js<~! zUp6TZ5fREn$3@|GyD1`c uyWM8z^ZC#30@ny)11t>-C*CcOUGg7bH<8wP`XHbH0000Px&pC-yG3tK5D}?aFX76346lIK`1G!$Wy5H}*UatqJC8@QhQp$9KLjvJCP7yK^!k3k=c)WJ^FHgb61$aJFsRY*$C1wWgHPoR%3V z86;%yiboJQa8jN50lbh5)KF3G@pGgtfQ{Nwnkg8+v%#=`9C{Dh%L6$HdfIeJb+Vy= z-h$p8&Tf}mKEMpQNyN)L#!#lE92$qzOXL0RHKz;6&dFSBok;k+nWXjU1yfmGQ{)#! zyw_bxL4$h)NQ*iOV~j@tKEdFD>-M=V9W^H*!-8~#3Qt$ibUeh;`-pXdL&t`pk%qB-s7Qo0s+xj`vOExQ1>Cl6GS}z4L&^>s-Z|J|@Gvd$0jfxKh69iTM;LYD0jZOXAi3|V z>TduiI6>7~6%iX8d)=HH{LVwg%ZA+goQHTQZ3tn0Ljs*K#-j_)uUQUBItY>XF`WT| zlNWyal~X9*FyzUEo84Ae@A>nwJYb0FCn? z@-pEZM41g4!z@VR--NuTPRw(boZ;`x{IhKHV9hx{#xb8UhSqge?_KM<{*f1m5kw** kf2yzRdT2pcOM>Cvf4-W`ND>B!aR2}S07*qoM6N<$f}?2z9smFU literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Nuclear14/Tiles/roadouterturnwtop.png b/Resources/Textures/_Nuclear14/Tiles/roadouterturnwtop.png new file mode 100644 index 0000000000000000000000000000000000000000..97c178fa3d56a2882073da43e23319233edcb443 GIT binary patch literal 1100 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 Date: Fri, 1 Nov 2024 18:09:38 -0400 Subject: [PATCH 7/7] Update floors.yml --- Resources/Prototypes/_Nuclear14/Tiles/floors.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Nuclear14/Tiles/floors.yml b/Resources/Prototypes/_Nuclear14/Tiles/floors.yml index 77e33f208c6..052a5d7903c 100644 --- a/Resources/Prototypes/_Nuclear14/Tiles/floors.yml +++ b/Resources/Prototypes/_Nuclear14/Tiles/floors.yml @@ -1909,7 +1909,7 @@ # Swampland - type: tile id: FloorSwampland - name: wasteland + name: swampland sprite: /Textures/_Nuclear14/Tiles/swampland.png variants: 4 placementVariants: [0, 1, 2, 3]