From 9e9726f81b5496e696332bb64063a1a428af031b Mon Sep 17 00:00:00 2001 From: kosticia Date: Tue, 29 Apr 2025 15:58:39 +0300 Subject: [PATCH] Add borders to the asteroid sand (#35397) * tiles * Fix * borderless * Astrosand * Add tile * Fix --- Resources/Locale/en-US/tiles/tiles.ftl | 3 + .../Entities/Objects/Misc/tiles.yml | 19 ++- Resources/Prototypes/Recipes/Lathes/misc.yml | 5 + Resources/Prototypes/Tiles/floors.yml | 114 ++++++++++++++++-- .../Objects/Tiles/tile.rsi/astro-asteroid.png | Bin 0 -> 871 bytes .../Textures/Objects/Tiles/tile.rsi/meta.json | 5 +- .../Tiles/Asteroid/asteroid_double_edge.png | Bin 0 -> 982 bytes .../Tiles/Asteroid/asteroid_single_edge.png | Bin 0 -> 2028 bytes .../Tiles/Asteroid/iron_double_edge.png | Bin 0 -> 1049 bytes .../Tiles/Asteroid/iron_single_edge.png | Bin 0 -> 188 bytes 10 files changed, 134 insertions(+), 12 deletions(-) create mode 100644 Resources/Textures/Objects/Tiles/tile.rsi/astro-asteroid.png create mode 100644 Resources/Textures/Tiles/Asteroid/asteroid_double_edge.png create mode 100644 Resources/Textures/Tiles/Asteroid/asteroid_single_edge.png create mode 100644 Resources/Textures/Tiles/Asteroid/iron_double_edge.png create mode 100644 Resources/Textures/Tiles/Asteroid/iron_single_edge.png diff --git a/Resources/Locale/en-US/tiles/tiles.ftl b/Resources/Locale/en-US/tiles/tiles.ftl index 0263c447a0..c6aeeacf99 100644 --- a/Resources/Locale/en-US/tiles/tiles.ftl +++ b/Resources/Locale/en-US/tiles/tiles.ftl @@ -103,10 +103,12 @@ tiles-dark-grass-floor = dark grass floor tiles-light-grass-floor = light grass floor tiles-dirt-floor = dirt floor tiles-asteroid-sand = asteroid sand +tiles-asteroid-sand-borderless = borderless asteroid sand tiles-asteroid-sand-dug = dug asteroid sand tiles-asteroid-tile = asteroid tile tiles-asteroid-plating = asteroid plating tiles-asteroid-ironsand = asteroid ironsand +tiles-asteroid-ironsand-borderless = borderless asteroid ironsand tiles-cave = cave tiles-cave-drought = cave drought tiles-flesh-floor = flesh floor @@ -129,4 +131,5 @@ tiles-jungle-astro-grass = jungle astro-grass tiles-astro-ice = astro-ice tiles-astro-snow = astro-snow tiles-astro-asteroid-sand = asteroid astro-sand +tiles-astro-asteroid-sand-borderless = borderless asteroid astro-sand tiles-wood-large = large wood diff --git a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml index 37a77acff1..4593219d9b 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml @@ -1558,7 +1558,7 @@ description: Fake sand. Luckily, it's not as coarse as the real thing. components: - type: Sprite - state: asteroid + state: astro-asteroid - type: Item heldPrefix: asteroid - type: FloorTile @@ -1568,6 +1568,23 @@ - type: Stack stackType: FloorTileAstroAsteroidSand +- type: entity + id: FloorTileItemAstroAsteroidSandBorderless + parent: FloorTileItemBase + name: borderless asteroid astro-sand + description: Fake sand. Luckily, it's not as coarse as the real thing. + components: + - type: Sprite + state: asteroid + - type: Item + heldPrefix: asteroid + - type: FloorTile + outputs: + - Plating + - FloorAstroAsteroidSandBorderless + - type: Stack + stackType: FloorTileAstroAsteroidSand + - type: entity name: large wood floor parent: FloorTileItemBase diff --git a/Resources/Prototypes/Recipes/Lathes/misc.yml b/Resources/Prototypes/Recipes/Lathes/misc.yml index 7d4c80b795..5cf10fb570 100644 --- a/Resources/Prototypes/Recipes/Lathes/misc.yml +++ b/Resources/Prototypes/Recipes/Lathes/misc.yml @@ -196,6 +196,11 @@ id: FauxTileAstroAsteroidSand result: FloorTileItemAstroAsteroidSand +- type: latheRecipe + parent: BaseFauxTileRecipe + id: FauxTileAstroAsteroidSandBorderless + result: FloorTileItemAstroAsteroidSandBorderless + - type: latheRecipe id: FloorGreenCircuit result: FloorTileItemGCircuit4 diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml index 6c8714be20..55e4a9a8af 100644 --- a/Resources/Prototypes/Tiles/floors.yml +++ b/Resources/Prototypes/Tiles/floors.yml @@ -1519,8 +1519,8 @@ # Asteroid - type: tile - id: FloorAsteroidSand - name: tiles-asteroid-sand + id: FloorAsteroidSandBorderless + name: tiles-asteroid-sand-borderless sprite: /Textures/Tiles/Asteroid/asteroid.png variants: 13 placementVariants: @@ -1545,8 +1545,22 @@ weather: true - type: tile - id: FloorAsteroidSandDug + id: FloorAsteroidSand + parent: FloorAsteroidSandBorderless name: tiles-asteroid-sand + edgeSprites: + SouthEast: /Textures/Tiles/Asteroid/asteroid_single_edge.png + NorthEast: /Textures/Tiles/Asteroid/asteroid_single_edge.png + NorthWest: /Textures/Tiles/Asteroid/asteroid_single_edge.png + SouthWest: /Textures/Tiles/Asteroid/asteroid_single_edge.png + South: /Textures/Tiles/Asteroid/asteroid_double_edge.png + East: /Textures/Tiles/Asteroid/asteroid_double_edge.png + North: /Textures/Tiles/Asteroid/asteroid_double_edge.png + West: /Textures/Tiles/Asteroid/asteroid_double_edge.png + +- type: tile + id: FloorAsteroidSandDugBorderless + name: tiles-asteroid-sand-borderless sprite: /Textures/Tiles/Asteroid/asteroid_dug.png baseTurf: Space isSubfloor: true @@ -1556,8 +1570,22 @@ weather: true - type: tile - id: FloorAsteroidSandRed + id: FloorAsteroidSandDug + parent: FloorAsteroidSandDugBorderless name: tiles-asteroid-sand + edgeSprites: + SouthEast: /Textures/Tiles/Asteroid/asteroid_single_edge.png + NorthEast: /Textures/Tiles/Asteroid/asteroid_single_edge.png + NorthWest: /Textures/Tiles/Asteroid/asteroid_single_edge.png + SouthWest: /Textures/Tiles/Asteroid/asteroid_single_edge.png + South: /Textures/Tiles/Asteroid/asteroid_double_edge.png + East: /Textures/Tiles/Asteroid/asteroid_double_edge.png + North: /Textures/Tiles/Asteroid/asteroid_double_edge.png + West: /Textures/Tiles/Asteroid/asteroid_double_edge.png + +- type: tile + id: FloorAsteroidSandRedBorderless + name: tiles-asteroid-sand-borderless sprite: /Textures/Tiles/Asteroid/asteroid_red.png variants: 13 placementVariants: @@ -1581,6 +1609,20 @@ heatCapacity: 10000 weather: true +- type: tile + id: FloorAsteroidSandRed + parent: FloorAsteroidSandRedBorderless + name: tiles-asteroid-sand + edgeSprites: + SouthEast: /Textures/Tiles/Asteroid/asteroid_single_edge.png + NorthEast: /Textures/Tiles/Asteroid/asteroid_single_edge.png + NorthWest: /Textures/Tiles/Asteroid/asteroid_single_edge.png + SouthWest: /Textures/Tiles/Asteroid/asteroid_single_edge.png + South: /Textures/Tiles/Asteroid/asteroid_double_edge.png + East: /Textures/Tiles/Asteroid/asteroid_double_edge.png + North: /Textures/Tiles/Asteroid/asteroid_double_edge.png + West: /Textures/Tiles/Asteroid/asteroid_double_edge.png + - type: tile id: FloorAsteroidTile name: tiles-asteroid-tile @@ -1594,8 +1636,8 @@ weather: true - type: tile - id: FloorAsteroidIronsand - name: tiles-asteroid-ironsand + id: FloorAsteroidIronsandBorderless + name: tiles-asteroid-ironsand-borderless sprite: /Textures/Tiles/Asteroid/ironsand.png variants: 15 placementVariants: @@ -1622,8 +1664,22 @@ weather: true - type: tile - id: FloorAsteroidSandUnvariantized - name: tiles-asteroid-sand + id: FloorAsteroidIronsand + parent: FloorAsteroidIronsandBorderless + name: tiles-asteroid-ironsand + edgeSprites: + SouthEast: /Textures/Tiles/Asteroid/iron_single_edge.png + NorthEast: /Textures/Tiles/Asteroid/iron_single_edge.png + NorthWest: /Textures/Tiles/Asteroid/iron_single_edge.png + SouthWest: /Textures/Tiles/Asteroid/iron_single_edge.png + South: /Textures/Tiles/Asteroid/iron_double_edge.png + East: /Textures/Tiles/Asteroid/iron_double_edge.png + North: /Textures/Tiles/Asteroid/iron_double_edge.png + West: /Textures/Tiles/Asteroid/iron_double_edge.png + +- type: tile + id: FloorAsteroidSandUnvariantizedBorderless + name: tiles-asteroid-sand-borderless sprite: /Textures/Tiles/Asteroid/asteroid0.png baseTurf: Space isSubfloor: true @@ -1633,8 +1689,22 @@ weather: true - type: tile - id: FloorAsteroidIronsandUnvariantized - name: tiles-asteroid-ironsand + id: FloorAsteroidSandUnvariantized + parent: FloorAsteroidSandUnvariantizedBorderless + name: tiles-asteroid-sand + edgeSprites: + SouthEast: /Textures/Tiles/Asteroid/asteroid_single_edge.png + NorthEast: /Textures/Tiles/Asteroid/asteroid_single_edge.png + NorthWest: /Textures/Tiles/Asteroid/asteroid_single_edge.png + SouthWest: /Textures/Tiles/Asteroid/asteroid_single_edge.png + South: /Textures/Tiles/Asteroid/asteroid_double_edge.png + East: /Textures/Tiles/Asteroid/asteroid_double_edge.png + North: /Textures/Tiles/Asteroid/asteroid_double_edge.png + West: /Textures/Tiles/Asteroid/asteroid_double_edge.png + +- type: tile + id: FloorAsteroidIronsandUnvariantizedBorderless + name: tiles-asteroid-ironsand-borderless sprite: /Textures/Tiles/Asteroid/ironsand0.png baseTurf: Space isSubfloor: true @@ -1643,6 +1713,20 @@ heatCapacity: 10000 weather: true +- type: tile + id: FloorAsteroidIronsandUnvariantized + parent: FloorAsteroidIronsandUnvariantizedBorderless + name: tiles-asteroid-ironsand + edgeSprites: + SouthEast: /Textures/Tiles/Asteroid/iron_single_edge.png + NorthEast: /Textures/Tiles/Asteroid/iron_single_edge.png + NorthWest: /Textures/Tiles/Asteroid/iron_single_edge.png + SouthWest: /Textures/Tiles/Asteroid/iron_single_edge.png + South: /Textures/Tiles/Asteroid/iron_double_edge.png + East: /Textures/Tiles/Asteroid/iron_double_edge.png + North: /Textures/Tiles/Asteroid/iron_double_edge.png + West: /Textures/Tiles/Asteroid/iron_double_edge.png + # Caves - type: tile id: FloorCave @@ -1926,6 +2010,16 @@ itemDrop: FloorTileItemAstroAsteroidSand weather: false +- type: tile + id: FloorAstroAsteroidSandBorderless + name: tiles-astro-asteroid-sand-borderless + parent: FloorAsteroidSandBorderless + baseTurf: Plating + isSubfloor: false + deconstructTools: [ Prying ] + itemDrop: FloorTileItemAstroAsteroidSand + weather: false + - type: tile id: FloorWoodLarge name: tiles-wood-large diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/astro-asteroid.png b/Resources/Textures/Objects/Tiles/tile.rsi/astro-asteroid.png new file mode 100644 index 0000000000000000000000000000000000000000..5f2e387e357ae8b7d65a2c50d37b241198b205ec GIT binary patch literal 871 zcmV-t1DO1YP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0{lrtK~z{r?Ul=J z(@+qGe>;hjIF}|QZADwyz=ldJSOBlUmK}&U;DLAp1dq@i3szhtR;Y`@B5KsoHW%ks zr%CMKf0|KK5j*aVMLx+oXO55k&zXyjHEY(y;q9vzGhTC3ShSbjkBc!ML*a{`JuJ)o z>#q*peLOI@_Gmka!_%p(FWy(UZ$6DAa?_%?LJ^7=3I+80eOcq2(AK#+D@Fw7eEbKB z-zz21cDk5MJs75m)6PInt0El7GZVAfRrI^vF6#BV%pYu7H_{ZwQV$nT-W#}ZC!WlG z&qqFOpj0ZsbzNANCF@GLT*mqNInwDgYPA|RHZ~+pQIQCZfI=Y(i@2SJZQJlXPecgA z{^{7l`!7xSzK>)wDff4Fb|gYfS5zdHIzW$^!$z}*oSi|zwnUuAxVX3wrx}(ntD+w!=kQZjNSrJn4{r!DO%ZG1mG@DI% zzSU~o7{iDxLal>NyB#=@2^>g@ol2!(7zU1xj>M)Dj^oH&sZ=T={<~w|z6KV>Nwr$V zWHLc6my>HW8p-%?*A|rcP zY`oZhgjG*_Fc@HSb5qtx)Hflr2KXSw8)q#HM-w!iA>8p4y{^_R0HOHjpMP#&14L7hNtq}YbGW}< z#=)VBN-!rZFg+dHQel12IsGE8B32O+erVWkKl)n|0djeHiQ#Z4sUYkOMuF>ldwVjj zVr2^2K?^bkZ=P52q;Mve)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D18Ye{K~z{rm6pwF zR6!7h`_5l7e+zf6d>0pjK7tDuf}AOW93AqyWu!G*6O_ybWiDk=;bCYdDTeC?de znVP;chSU1c~wO z?7Q7=-V+N4U~`^;ztidD{5;7&nM_g(Cx%|Hm!A}(FiB2MPBPJx!ojcNz=f8I1L96k zPcsKDdvas}7+7?IfTQEzIf%W)VPj7RtyT`Jg(33z*WVm3z{f8ePvVHjhiK5^2dY?* z-hTX&o;-V5Nd!T%efaz%bHsiB>3jP6^G{Bw7%hI|hl}v@^Yfe!-`?|AHMc_j-u+v( z^rtW0RMY7+7dUu$C)-JuoeS(gxLtFx6HjsqA(qbQ5<3%obnoW;#`SA?itmoTrTxR# z6}fd6>Ocqtu>=Sj_cm*x}7L(AWY~%5`<~zJ8VK5jhcT1E= zBwkaw09*qCh6F!gsZ?4otkTpdC_YbOl!JVJXKG+@BP1V>3P+GoaqtxbUrQJchs&Lv zJ@7825NJG*RVa@5Dkx1W*YKhax`{!Xij&7daxS-^qfkRNKPL6x(YF$~z_zzX@f44j zkp{`tMk${~2V{cu-Pc+2nZ>5F<`b+xDovmW@rdOwprG7qP=^X~5a1ULVDl-+FNoI& z5^x86w7?T9iSCLQQ5QTtMo;<45sx7w7WN55s4&MC;~Xj!bBso#&pafTJcHO?FU=j@>ytn7xD|L_)nY8j1~gbAU!x zAc6wp*+qeR|NXdPQAg7RRzNbkfQ$eiHG3t&=K@`X?B20#nviqWj*}vEvQ065*4l+K zxX316EmX<8n-ZG*#Ij0fPYm{LxmQ4-Iw%GDh&8oM(*PQ`=PQcR_?6HTOO!69ItM;- z`IQU!p28Bo1{_WX@v`W5>{^1NT_{Z3scf0a*JW0g@}&|BnNlEz7&m1#Fsz&O3h0{?|z9A125Ezj3H3RR91007*qoM6N<$ Eg8ojrw*UYD literal 0 HcmV?d00001 diff --git a/Resources/Textures/Tiles/Asteroid/asteroid_single_edge.png b/Resources/Textures/Tiles/Asteroid/asteroid_single_edge.png new file mode 100644 index 0000000000000000000000000000000000000000..1450554089afc51f5741e7272564fb0d6529ee5f GIT binary patch literal 2028 zcmcIleQXnD7{3K!W4LJq#{kjGO~^p5_t9(bdRf7(-ACOz3ac>YFkJ86>yEX(a(7$H zoP0z0nt{Lqe-J)`Ku}b`5R7c{5inpNfS_Rt<0HZ{q9B5q3J%}v+6f8&8Jo1d_wDcZ zd!Og`Jnz#LzRJ?9%#oQ0f@FEh+*9EdYIEmmAEpU34weVQsOA%GzH zXIs~L^W9TkIWd3G+LD}|8LJNFPTRTU!w}O4s`#t zdfNSpHDfkt5n`ovV!B^G={de^iR)O+&Lu4`*@urV|6)3~X@BU{3l+n; z9dYlz)|u4&JG|o@}U5C~TTV3?~x~}#Et}{8!;ik^6ZC&q=F1(pnd#U*GZ)pz> zulj1n#bXc8?adBuC_Zy(+5N1#c_+I+xKrLr59nsvHlJk2Y`Zt|wmhW$@1OPN^ugV; zA7wW7Y|YE-&_Ue1Z5$K zaM+AGf!2-UMo3P^@=UbupBn|lRG_O3nh1&;LBz;Q(Iv5;8*R`+i7X_M03i^DFdd#o z^&eI0@%sAFX4XL^98EBw!~G~jk^lAPsd&s^65*!~hqQjZr;w>UO&~ObcdKH98IQ;9 z#LPo^Nfi}|PdsuCt036{h1*$~#u99H|%1S2@(}1SK-ZI4~(n50>YC6xu;Gu;ecNQrl8KrmFzuc{#@W=4UUoK&~Me(m$WOwl1~ZsI1OiC5x2RDn59Y$dxpq@anO zx4)Uz)K7Jr4Ob&qb4E+tc)x$I3tPz&RAIq=YV9#X^xZt$J!_W z0x7<(%0^7kKw%JO2a|y9kw^l~Px>}4g^bk!(-ackPKw59tDmy-49#0%S&0894fG~&4lQk+Jo>k61+!I5o zZ{Q`^aN@xg@bZ;W)Z!Au=oda@*tQPmg%<-1-~$Ud!0pHigVAIhvn4aQm!bs~7bz7IZFH bn1-x>IlH?!^8);jKoC!HrTf#OS&RMw`>4Cr literal 0 HcmV?d00001 diff --git a/Resources/Textures/Tiles/Asteroid/iron_double_edge.png b/Resources/Textures/Tiles/Asteroid/iron_double_edge.png new file mode 100644 index 0000000000000000000000000000000000000000..22a376ba68fea12069a09fb2096b17a32d75dc89 GIT binary patch literal 1049 zcmV+!1m^pRP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!T4MWt&c?6+f9wYQb0b`Fvgm2uQRD0VE*~e-?)r5R-xdXY7FD2!UsF zbF-ds0h^v;pwroG)(3w+`dxdw0^0CH%#$+sc8H5Yu-UDJVte-beQ|yH`KOyOu19xoEGue- z7jHjKP>Yx+_ivRQvU0BQ_}0_8phL+31bGEH0rpwYJq3-E6CZo{_V)G$HR>=htUy=UF(i&I zW3_>NIr)T;qYy-8BPqOq!32wEM-WSr0@zywjES_76rjJq0*Zp{nu6K|#YoNqqO~0y z92AEj7ZEm;!mF@dCXsue#H4?Je}B+fi;PV%0AEeam%?D4**!rO7(lS`IW>_!a+wCJ zMLz`+EMhXw{JOQM1@W7cQ_yd5SBu^TDTPcF1W4@tjlC-h=9&A<6=T;h2mmIw!N9@@ z$*$nAV_>dtxx%<^F_=mwvo}Gz1ro;KgE$2vuq{p;dshz&r-1zUDMHeAVuBcmvjJd! ziviczxE(Vqi+V*o>DW4d4oJ|&VM zhNbW}4%i5O|I91aW{Am`vOvPvbqMd11!0n6OIRq;+G=W$NT?#oS~0|o5z8^S+ZE^% z(eOGcrvu8CBeWxeAj3B{k^Fy-u@jrb3Xu!lvI6;>1s;*b3=DjSK$uZf!>a)(80hKZ7!u*0Jm*dBpZSa&^J;z_yHNSVO1Z<= z{{V~9jT<)(%xPpuV82uSnemLIKtSH=pYj|F_5>PmxgFGyU|pOb($fUzG~8=wWMtqv W&bM0fBy$?ja0X9TKbLh*2~7Z`(>aj< literal 0 HcmV?d00001 -- 2.51.2