From 41ae35f8c69c30f67d940e43d5ac14f4da04b307 Mon Sep 17 00:00:00 2001 From: Southbridge <7013162+southbridge-fur@users.noreply.github.com> Date: Thu, 16 Jan 2025 03:27:52 -0500 Subject: [PATCH 01/10] Added astro asteroid sand --- Resources/Locale/en-US/tiles/tiles.ftl | 1 + .../Prototypes/Entities/Objects/Misc/tiles.yml | 17 +++++++++++++++++ .../Entities/Structures/Machines/lathe.yml | 1 + Resources/Prototypes/Recipes/Lathes/misc.yml | 5 +++++ .../Prototypes/Research/civilianservices.yml | 1 + .../Prototypes/Stacks/floor_tile_stacks.yml | 6 ++++++ Resources/Prototypes/Tiles/floors.yml | 11 +++++++++++ .../Tiles/tile.rsi/asteroid-inhand-left.png | Bin 0 -> 812 bytes .../Tiles/tile.rsi/asteroid-inhand-right.png | Bin 0 -> 815 bytes .../Objects/Tiles/tile.rsi/asteroid.png | Bin 0 -> 821 bytes .../Textures/Objects/Tiles/tile.rsi/meta.json | 11 +++++++++++ 11 files changed, 53 insertions(+) create mode 100644 Resources/Textures/Objects/Tiles/tile.rsi/asteroid-inhand-left.png create mode 100644 Resources/Textures/Objects/Tiles/tile.rsi/asteroid-inhand-right.png create mode 100644 Resources/Textures/Objects/Tiles/tile.rsi/asteroid.png diff --git a/Resources/Locale/en-US/tiles/tiles.ftl b/Resources/Locale/en-US/tiles/tiles.ftl index b52023561422..cac360739027 100644 --- a/Resources/Locale/en-US/tiles/tiles.ftl +++ b/Resources/Locale/en-US/tiles/tiles.ftl @@ -128,4 +128,5 @@ tiles-mowed-astro-grass = mowed astro-grass tiles-jungle-astro-grass = jungle astro-grass tiles-astro-ice = astro-ice tiles-astro-snow = astro-snow +tiles-astro-asteroid-sand = astro-asteroid-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 903226895890..7b4ceac392d3 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml @@ -1548,6 +1548,23 @@ - type: Stack stackType: FloorTileAstroSnow +- type: entity + id: FloorTileItemAstroAsteroidSand + parent: FloorTileItemBase + name: astro-asteroid-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 + - FloorAstroAsteroidSand + - type: Stack + stackType: FloorTileAstroAsteroidSand + - type: entity name: large wood floor parent: FloorTileItemBase diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 17f470253bb4..b878fa56872e 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -350,6 +350,7 @@ - FauxTileJungleAstroGrass - FauxTileAstroIce - FauxTileAstroSnow + - FauxTileAstroAsteroidSand - OreBagOfHolding - DeviceQuantumSpinInverter - type: EmagLatheRecipes diff --git a/Resources/Prototypes/Recipes/Lathes/misc.yml b/Resources/Prototypes/Recipes/Lathes/misc.yml index a9ae608674ef..f19c6405d691 100644 --- a/Resources/Prototypes/Recipes/Lathes/misc.yml +++ b/Resources/Prototypes/Recipes/Lathes/misc.yml @@ -176,6 +176,11 @@ id: FauxTileAstroSnow result: FloorTileItemAstroSnow +- type: latheRecipe + parent: BaseFauxTileRecipe + id: FauxTileAstroAsteroidSand + result: FloorTileItemAstroAsteroidSand + - type: latheRecipe id: FloorGreenCircuit result: FloorTileItemGCircuit4 diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml index 2bd8ee5fa239..cdb82255448e 100644 --- a/Resources/Prototypes/Research/civilianservices.yml +++ b/Resources/Prototypes/Research/civilianservices.yml @@ -114,6 +114,7 @@ - FauxTileJungleAstroGrass - FauxTileAstroIce - FauxTileAstroSnow + - FauxTileAstroAsteroidSand - type: technology id: BiochemicalStasis diff --git a/Resources/Prototypes/Stacks/floor_tile_stacks.yml b/Resources/Prototypes/Stacks/floor_tile_stacks.yml index 65fd672e1aa8..b7b5d442126e 100644 --- a/Resources/Prototypes/Stacks/floor_tile_stacks.yml +++ b/Resources/Prototypes/Stacks/floor_tile_stacks.yml @@ -623,6 +623,12 @@ spawn: FloorTileItemAstroSnow maxCount: 30 +- type: stack + id: FloorTileAstroAsteroidSand + name: asteroid sand floor tile + spawn: FloorTileItemAsteroidSand + maxCount: 30 + - type: stack id: FloorTileWoodLarge name: large wood floor diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml index 0a7d2c0af6e9..6c8714be2032 100644 --- a/Resources/Prototypes/Tiles/floors.yml +++ b/Resources/Prototypes/Tiles/floors.yml @@ -1915,6 +1915,17 @@ deconstructTools: [ Prying ] itemDrop: FloorTileItemAstroSnow +# Asteroid Sand +- type: tile + id: FloorAstroAsteroidSand + name: tiles-astro-asteroid-sand + parent: FloorAsteroidSand + 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/asteroid-inhand-left.png b/Resources/Textures/Objects/Tiles/tile.rsi/asteroid-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..c252a030f35ab24b14f85a7db0a13b8508785d22 GIT binary patch literal 812 zcmV+{1JnG8P)EX>4Tx04R}tkv&MmP!xqvQ>CI62Rn#5WT-A$5EXIMDionYs1;guFnQ^Z(4-+r zad8w}3l9D)RvlcNb#-tR1i>E=H#a9m7b)?+q|hS93y=44-aUu+?gNBciD_2b7@+C4 znM%aPOm;;Ky`l>P2w((|nPtpMQWC!Pbx)mCcQKyj-}h&At2v7S0g-ry8KzCVPCT_~ z8=UuvBdjQ^#OK7LCS8#Dk?V@bZ=4G*3p_Jorc-mo5n{2>!b%IXqNx#25=T`{r+gvf zvC4UivsS9G#y$B9!#RCL)<(8MxA${&EeN{v^HH z)S^c~&o*#z-PDvl;Bp7(dopBGcBLRKA)g1{&*+=7K<_Qkx$4cWagNgmAWgGM-T()O zz;J=G*L>dH(K@$(dm8im0XhV7khyvNRR911Vo5|nRCt{2+CNLfKo|z_$3KgMLpXa= z28V()OX=hna0q?_H$liGeu6GScEQof%?}`mLl>c6AX6v=Eaj$y^G2s|4kg7!OVUdr z^!Y6z!##QL&29GrL_|bHL_|bHv|IMt3Vt46IRH@FV*K=8`#Wh8yHExIfa~<7wL16P z2u+jNDQ%&&#c%*<{S>JEo8;~Zk`}izZ8#l%@%2C=P%Zt^sttK4$ z4h&_0=tyER2YMUkR3{+Ii^h#y$NLEoLZJ6O!^LU2an@vhfXBC)hpPVO{RCurf#IMJ zV+=wWKxx}3M`??Z1V-m45JDi!3(u7j5fKp)5fKp)5fKp)5p_tK#O}ZMby}Ga*`{iY z23T&s?nH|B>+x+9Lg4;p`PZv!`8qn^fXZ}H0;oSj(D?=!V=!Hmh@uEz07l2U*80vj qKxvD+%QFBaj4_QTQizCX7yST`KWvO{)fjRB0000}MGO literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/asteroid-inhand-right.png b/Resources/Textures/Objects/Tiles/tile.rsi/asteroid-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..90af3cb11a706752dbbccb73acfa00a0ef53ae5b GIT binary patch literal 815 zcmV+~1JL}5P)EX>4Tx04R}tkv&MmP!xqvQ>CI62Rn#5WT-A$5EXIMDionYs1;guFnQ^Z(4-+r zad8w}3l9D)RvlcNb#-tR1i>E=H#a9m7b)?+q|hS93y=44-aUu+?gNBciD_2b7@+C4 znM%aPOm;;Ky`l>P2w((|nPtpMQWC!Pbx)mCcQKyj-}h&At2v7S0g-ry8KzCVPCT_~ z8=UuvBdjQ^#OK7LCS8#Dk?V@bZ=4G*3p_Jorc-mo5n{2>!b%IXqNx#25=T`{r+gvf zvC4UivsS9G#y$B9!#RCL)<(8MxA${&EeN{v^HH z)S^c~&o*#z-PDvl;Bp7(dopBGcBLRKA)g1{&*+=7K<_Qkx$4cWagNgmAWgGM-T()O zz;J=G*L>dH(K@$(dm8im0XhV7khyvNRR911Wl2OqRCt{2+CNLfKo|z_N9(9V2nK|J z9Rej;g5RM-zJi+|bm~XwB6Ke}I=T4)3gXa3=qwb3QYcuvMrgI3Xkv}&% zuzhf}XdsFr_(yVUMOLY}aK(2M;||ERn<L*-cEIbK#?$j0<7HY^Jv&#b0jDPp-Va-dq6p(Px%?@2^KR9J=WmcNeUR20U4*LMC~+qq6`Pj(nZi)bh!O+kUS+$W%*pg>eS0xz%y z&p^M`idUdRTdvp@B}FQPm06wvx~eE!N$2iPD_+VM0|_ zq-lz->pVO>0N^PLA?g~}*VkNLUZU$dd2)*yx@`kEOu+TW%7 z^?CrLY08hkb$Rt>NmW%ChCx}DTwPt!NOuTE+XO7L4?<&yKmhmm_ZWtOl#(<}c^iAo z=W_spAi%b5gb-+&hUVb7S9fT0fW-|ch^Eq)GKicbg-sv7_H1vI+?RJZ0Sy-0E zdc6kV%TMb9P4UmKO>EoV8}t|)^Z-D?WjQh1)Xk88%>nDg%L4&ZbT0Q5T=BW3aQ$%r3*$?=p0 z)Glw%f;`Xn@$2;(&+`a^;3x@N2{d^1X32Cq<>z#aQVM|0WdUFeaWz|zDiegVD2!cm4{VM{|a)ImqQ^%^R z&@_z?KN$T<=r2wxY=ybG!0Fwx7l`mGb*JBlWf1QxfPEw;Zg5_ z=ALiR{9es_pm`_!{X4+(ufJ{0f5sVS{O9-sR_8Iv{Xj+g00000NkvXXu0mjfT;_wj literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json index 7562d0f9b11b..86c99204ff55 100644 --- a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json +++ b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json @@ -549,6 +549,17 @@ }, { "name": "wood-large" + }, + { + "name": "asteroid" + }, + { + "name": "asteroid-inhand-right", + "directions": 4 + }, + { + "name": "asteroid-inhand-left", + "directions": 4 } ] } From d03e30456bc023be5bbfd9e0e7973535408a7acb Mon Sep 17 00:00:00 2001 From: Southbridge <7013162+southbridge-fur@users.noreply.github.com> Date: Thu, 16 Jan 2025 04:03:27 -0500 Subject: [PATCH 02/10] fixed the stack name --- Resources/Prototypes/Stacks/floor_tile_stacks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Stacks/floor_tile_stacks.yml b/Resources/Prototypes/Stacks/floor_tile_stacks.yml index b7b5d442126e..3c653f22bcfb 100644 --- a/Resources/Prototypes/Stacks/floor_tile_stacks.yml +++ b/Resources/Prototypes/Stacks/floor_tile_stacks.yml @@ -626,7 +626,7 @@ - type: stack id: FloorTileAstroAsteroidSand name: asteroid sand floor tile - spawn: FloorTileItemAsteroidSand + spawn: FloorTileItemAstroAsteroidSand maxCount: 30 - type: stack From 4b0826300dca994a2a846a68ff9f942deaca719d Mon Sep 17 00:00:00 2001 From: Southbridge <7013162+southbridge-fur@users.noreply.github.com> Date: Thu, 16 Jan 2025 20:35:19 -0500 Subject: [PATCH 03/10] adjusted tile sprites for asteroid and ice --- .../Objects/Tiles/tile.rsi/asteroid.png | Bin 821 -> 779 bytes .../Objects/Tiles/tile.rsi/astroice.png | Bin 241 -> 363 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/asteroid.png b/Resources/Textures/Objects/Tiles/tile.rsi/asteroid.png index 4bd31df58fb32edd5c789a96a91390b4e0d3dd85..b4062b79f7dead894e9338abc50cfdc056c5a297 100644 GIT binary patch delta 742 zcmVp22MEPg#SB?u7Izee^Rfr8h~h90^q4$JN~;lz?WZt+kd(Ky#X(tJ+04`X5=_n zR-e~l%%ib$5EI5JlaazO41yp4U^bf(#wp8WYht3xp74@$G>s?@S=eGIXWUmBvv6lu}ex#b7W1AW0Iw|JCBCxN|$x2qLO4zc>p zyx;F*7zWqZ*8nUQ3)buPL9Xxn4=1pfa5|l`+wHJz8-Lrj$@3h5&mT_!+Tx#HDICXX z4SI|R?v3zNk1Wrb`aZ$UZ=~5By4H-;5CEkVpM5+ailQdo^QfwdD2g~gKR?O?_Y#P< zCDV^CxOo$j<~!nahm?KlGRAdXgb)ZJ@H`L4afqS_DJ4?MqZR1%K)6n*stR3$V_OK* zz;)e&9)Is;-gSF07C=kdjpDewk> zIBx#`a&rrSZ8xfvW!aJmf&fo>4Ynj_p4j@g8{b>}efs%Y!?=Yy3~%11Fqt!heq6 Y0g7fZy6KJ!o&W#<07*qoM6N<$g8#i?(EtDd delta 785 zcmV+s1Md8b2DJu|F@Nt#L_t(oh3%HVj^k7m#(&p#{#@I+PHazh7)6U{C?ZWkfwtTy zprD{YR6GJNum#URztxIYphH`(*cBy3Duk6;qS)iu<8d;v9SY;X2q}(8K|#LK_uO;7 zbH2~_UO3~7Gyd-oZ2_-ezSu>}1pux;CR#3V{V_=#p@uHea({tg7^tC35=Rt8v0wk} zo9|ll9}IZ?^2P4mySEH%n{Kzm`!M0j$bJ+PCK>L)LKfPA*IZs+qU$<&a*GNmW%ChCx}DTwPt!NOuTE+XO7L4?<&yKmhmm z_ZWtOl#(<}c^iAo=W_spAi%b5gb-+&hUVb7S9e;!n%w{tH=JPpm96#FYdEV(B zXf*VFpY3*wWm#C3#d^I4;LA_z0!{JHuT5;*-W&879P|J{zFy;d9>LA;WcdTtu3}*J z0WeLIFFxt9TCD(Z9EY+jS*=!FTwI)PLf0Qt6a_bnkZipr$+k$@VOJz5rOc=cwDJ7fDhRI}dRNjLksiDhkHp6iozJGe=19eA9Qm_Ada|?iF)l(^oVoxRr zf=4p_D+1ASf$RQL$EvE(G>s2G82w4;FH<&4Na@J*>-(1 zDy0aMY`?F$6^}9DQSX7~o^R0nUd?-;c_;k+JHYd=zirKb#u;b)=lBCw=P}9sKt=li P015yANkvXXu0mjf7>|E+ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/astroice.png b/Resources/Textures/Objects/Tiles/tile.rsi/astroice.png index e3c0948112e80d622009f7bbcf48f5ce991a5bdf..52f702398567266b3c663d00b396586871f100e6 100644 GIT binary patch delta 347 zcmV-h0i^!%0qX*g8Gi-<0047(dh`GQ00DDSM?wIu&K&6g00AXQL_t(oh3!_MZo@DT zeVwMFNU_GUkihW$M2boa(=Xd#=~#cFJR?&{64oYCP)G+7Z%*YqdvT|M`Vq^1)_Zqn z`((hw!{gquFm2c#s>|m`0RTwj2mnx&^<=JF>w^%lFV9AOc7Mb6P+ivX6W*F(zDt13 z5y-`KAH~0yCu0x~9J%b;Z}D94<~n}awVb>;09n>t3`U%}j<>-hN2YOvl}0=pv!%=> ze;yOyz*Yd5if7|UnP2lZFb0r|AK`tYFFVDnuVhvLMOh;ggD^mwQ@jm~6`;g-iJ324 z?|>|!`p#wMdsHPuig!K&ReVk#u)&}90p}y2#52L0tGrVHX&gEAft%a`mp)(vHh?|| to%%o@gvJ1F_8*Yzzx@w*czFCfz5s>-!g9I?4;BCb002ovPDHLkV1lKvoI(Hq delta 224 zcmaFO^pSCbWIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstUx|bfKP~P zz>OapUi<(8pnwt6oH&rWk|4j}|Ns9pIB2c>0_1ZRctjR6Fz_7#VaBQ2e9}O{I8PVH z5DWjO69Tyo7;rc*zW4v!=2;76`~I$v{K=_u-hun~g-nJrLtO?YjU!Xz+P5E`_~tNs z!fSSgqSW{2_ULzfs{6TN!JXyC`VTJhb5E?EYscXJ=Wvyq_+_>|FZmm8vPKtk`dYrV RnGLjx!PC{xWt~$(69D&URh|F< From 70a487a2be4795402ca6215493cfdc7096dd625a Mon Sep 17 00:00:00 2001 From: Southbridge <7013162+southbridge-fur@users.noreply.github.com> Date: Thu, 16 Jan 2025 20:49:13 -0500 Subject: [PATCH 04/10] Adjusted meta.json --- Resources/Textures/Objects/Tiles/tile.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json index 86c99204ff55..d25096dd536b 100644 --- a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json +++ b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, additional copyrights see tiles folder.", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, additional attributions available in the Resources/Textures/Tiles/attributions.yml file. Ice tile modification, Astreroid tile and in-hands created by Southbridge-fur (github)", "size": { "x": 32, "y": 32 From 7b95c254d0cf2b4439f75bed1d91193cb8e8bcea Mon Sep 17 00:00:00 2001 From: Southbridge <7013162+southbridge-fur@users.noreply.github.com> Date: Thu, 16 Jan 2025 20:56:39 -0500 Subject: [PATCH 05/10] Realized the other tile sprites all have solid lines on their perimeters --- .../Objects/Tiles/tile.rsi/asteroid.png | Bin 779 -> 720 bytes .../Objects/Tiles/tile.rsi/astroice.png | Bin 363 -> 259 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/asteroid.png b/Resources/Textures/Objects/Tiles/tile.rsi/asteroid.png index b4062b79f7dead894e9338abc50cfdc056c5a297..76d87d47233b9dfe7a3e894c0103d2ce902308be 100644 GIT binary patch delta 683 zcmV;c0#yBr2G9kNF@K6lL_t(oh3%HjZqq;%M$dShpRp%)6Q{IP5o}mR>VgI06}n}C zRKy$ffp~)o9-%wd6-X>uR4fot3RRrOc3s;^ZL&0Kj!!@;oO90yZ}{?*^dnd7Pg4#OZ=CUZ7Ni@+!n}9Hf*;DREsFtu;Xqpp-%> zwNi0d;RyU$M4smqC1|^eGz5<0+&JUwwqKj`;^N}&0NM?Mu4D6HtIN^H1kbUTV7_0? zf+R_*_c6gkfCmFv~Iw!>Gor*2_Pm<2d+XTqLbo_59%?mE-vMH-^x5}b R;feqN002ovPDHLkV1kPgO}PL7 delta 742 zcmVp22MEPg#SB?u7Izee^Rfr8h~h90^q4$JN~;lz?WZt+kd(Ky#X(tJ+04`X5=_n zR-e~l%%ib$5EI5JlaazO41yp4U^bf(#wp8WYht3xp74@$G>s?@S=eGIXWUmBvv6lu}ex#b7W1AW0Iw|JCBCxN|$x2qLO4zc>p zyx;F*7zWqZ*8nUQ3)buPL9Xxn4=1pfa5|l`+wHJz8-Lrj$@3h5&mT_!+Tx#HDICXX z4SI|R?v3zNk1Wrb`aZ$UZ=~5By4H-;5CEkVpM5+ailQdo^QfwdD2g~gKR?O?_Y#P< zCDV^CxOo$j<~!nahm?KlGRAdXgb)ZJ@H`L4afqS_DJ4?MqZR1%K)6n*stR3$V_OK* zz;)e&9)Is;-gSF07C=kdjpDewk> zIBx#`a&rrSZ8xfvW!aJmf&fo>4Ynj_p4j@g8{b>}efs%Y!?=Yy3~%11Fqt!heq6 Y0g7fZy6KJ!o&W#<07*qoM6N<$f=el3>i_@% diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/astroice.png b/Resources/Textures/Objects/Tiles/tile.rsi/astroice.png index 52f702398567266b3c663d00b396586871f100e6..c57497a6ec8fa2f9c19a26b7f2b4f9ce5a507e9d 100644 GIT binary patch delta 219 zcmV<103`qG0)qmOFn<8ONklc|U7jiqNDx36yyF9QpH$;PoLS12HSzT*S&@)S8>v>X^M2Zn4pKr9&W_P{6@1*2fV0RWWE VmE$6-V}}3$002ovPDHLkV1ln}TZ8}r delta 324 zcmV-K0lWT#0_y^hFn<9hNklD%45PhAdqDZmEvXH>={X~jN3)3&#VCh(Y zqC6v0NfOp3Qcy?-5^qlBJ9}}bf%*~4e%5<;XZvKp!^7j=u`q4e9;(adM*#px;|Ksy zl=Wn;TkC@muP@I=eRjk4P+ivX6W*F(zDt135y-`KAH~0yCx2rQ4;;Dd+Hdh(@a8&x z*|nU!IRIJKTnt8>xsJENBS)rjgq21-8?&X%C4U|h;J{V@n2KlPNSR;rHZTT|iyz^A zqc1zftFL5M07Y3N6N4~7n^U|Ej1{27cZr!VT%aXEczAgHJH7yh W0>W~-2M-ni0000 Date: Thu, 16 Jan 2025 21:36:30 -0500 Subject: [PATCH 06/10] Update Resources/Prototypes/Stacks/floor_tile_stacks.yml that works Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com> --- Resources/Prototypes/Stacks/floor_tile_stacks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Stacks/floor_tile_stacks.yml b/Resources/Prototypes/Stacks/floor_tile_stacks.yml index 3c653f22bcfb..b5d5fb7dc015 100644 --- a/Resources/Prototypes/Stacks/floor_tile_stacks.yml +++ b/Resources/Prototypes/Stacks/floor_tile_stacks.yml @@ -625,7 +625,7 @@ - type: stack id: FloorTileAstroAsteroidSand - name: asteroid sand floor tile + name: asteroid astro-sand floor spawn: FloorTileItemAstroAsteroidSand maxCount: 30 From 0e22619647038249a507f9b0c0f08e9a3fb167f0 Mon Sep 17 00:00:00 2001 From: Southbridge <7013162+southbridge-fur@users.noreply.github.com> Date: Thu, 16 Jan 2025 21:39:34 -0500 Subject: [PATCH 07/10] Update tiles.yml --- Resources/Prototypes/Entities/Objects/Misc/tiles.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml index 7b4ceac392d3..4af4c6ae73a0 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml @@ -1551,7 +1551,7 @@ - type: entity id: FloorTileItemAstroAsteroidSand parent: FloorTileItemBase - name: astro-asteroid-sand + name: asteroid astro-sand description: Fake sand. Luckily, it's not as coarse as the real thing. components: - type: Sprite From 80e67516cde0a08070de2ee546fc0436e6d03844 Mon Sep 17 00:00:00 2001 From: Southbridge <7013162+southbridge-fur@users.noreply.github.com> Date: Fri, 17 Jan 2025 23:46:39 -0500 Subject: [PATCH 08/10] Update Resources/Locale/en-US/tiles/tiles.ftl Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com> --- Resources/Locale/en-US/tiles/tiles.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/tiles/tiles.ftl b/Resources/Locale/en-US/tiles/tiles.ftl index cac360739027..0263c447a012 100644 --- a/Resources/Locale/en-US/tiles/tiles.ftl +++ b/Resources/Locale/en-US/tiles/tiles.ftl @@ -128,5 +128,5 @@ tiles-mowed-astro-grass = mowed astro-grass tiles-jungle-astro-grass = jungle astro-grass tiles-astro-ice = astro-ice tiles-astro-snow = astro-snow -tiles-astro-asteroid-sand = astro-asteroid-sand +tiles-astro-asteroid-sand = asteroid astro-sand tiles-wood-large = large wood From 3e97bec08f3f5b8b2ef5d279162baad026999ce0 Mon Sep 17 00:00:00 2001 From: Southbridge <7013162+southbridge-fur@users.noreply.github.com> Date: Sat, 18 Jan 2025 00:23:19 -0500 Subject: [PATCH 09/10] adjusted the snow sprite --- .../Textures/Objects/Tiles/tile.rsi/snow.png | Bin 376 -> 480 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/snow.png b/Resources/Textures/Objects/Tiles/tile.rsi/snow.png index 385e2d59ac24baf8588fb98f204cbb1330475e4d..1e27fec6762a0bc8c5836c8846577196bb343133 100644 GIT binary patch delta 465 zcmV;?0WSXd0^kFX8Gi-<0047(dh`GQ00DDSM?wIu&K&6g00EjwL_t(oh3!_$isUd1 ztQ}UMi!TOW`m_2&`W8e3^ms0w^?>)xYOMfZ$JjU3!ZR^Kz^cC_S zGl!fr03f9V=Nv)^Xstm+AR=I90DyDO&f|A46Hqwk>|ARF0E7_WoI|bEf`<@LYd!hD zM8G)*A_6m`)(R0h1qJ|SMoP(S;HlVK2xxXGC5Xr=v+*24fQW#I%wECInZqcp5^~N# zM9fD6GqWi)zJLE6mU^Jpij)$F2(2}=)&KxR1R}BqBqAd-mg8jtz*%CIS*Jm5^~*Ug zH{rAd08Vl;Gjh)G-hX+oy|Nk{SX4l>*Gcf+TN!|-651=;2jfn7iNHAXpPwsFKebzHwrs|=EJ`A_uvW07K&{nQEby!|Gn@1w z1f-PAXY7d?rV4oPEwgb405Dq#>YmW=R`75C4_vr#;cwsBy%uKoJ;>&1%~U%!5R@ZiDQw{L+;PG}V60x7PNAiv=MFu<_sjLvzW zC})93WHAE+-(e7DJf6QI1t@sdv);uq#KQmSq}xJ=6*ye37M%Y7zkt89bFSjtecSC6 z4jxuox*vU4GZ#a zr_~rT9O1ltVy{7t Date: Sat, 25 Jan 2025 06:44:17 -0500 Subject: [PATCH 10/10] Update meta.json --- Resources/Textures/Objects/Tiles/tile.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json index d25096dd536b..a39ba782facc 100644 --- a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json +++ b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, additional attributions available in the Resources/Textures/Tiles/attributions.yml file. Ice tile modification, Astreroid tile and in-hands created by Southbridge-fur (github)", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, additional attributions available in the Resources/Textures/Tiles/attributions.yml file. Ice tile and Snow tile modifications, Astreroid tile and in-hands created by Southbridge-fur (github)", "size": { "x": 32, "y": 32