From 1af53b1e8d67bf35f6f354d0f17bcd7d8027bd64 Mon Sep 17 00:00:00 2001 From: Southbridge <7013162+southbridge-fur@users.noreply.github.com> Date: Wed, 29 Jan 2025 23:41:58 -0500 Subject: [PATCH] Astro Asteroid Sand (#34463) * Added astro asteroid sand * fixed the stack name * adjusted tile sprites for asteroid and ice * Adjusted meta.json * Realized the other tile sprites all have solid lines on their perimeters * Update Resources/Prototypes/Stacks/floor_tile_stacks.yml that works Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com> * Update tiles.yml * Update Resources/Locale/en-US/tiles/tiles.ftl Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com> * adjusted the snow sprite * Update meta.json --------- Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com> --- 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 -> 720 bytes .../Objects/Tiles/tile.rsi/astroice.png | Bin 241 -> 259 bytes .../Textures/Objects/Tiles/tile.rsi/meta.json | 13 ++++++++++++- .../Textures/Objects/Tiles/tile.rsi/snow.png | Bin 376 -> 480 bytes 13 files changed, 54 insertions(+), 1 deletion(-) 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 b520235614..0263c447a0 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 = 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 c730c96546..37a77acff1 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml @@ -1551,6 +1551,23 @@ - type: Stack stackType: FloorTileAstroSnow +- type: entity + id: FloorTileItemAstroAsteroidSand + parent: FloorTileItemBase + name: 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 + - 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 7fe2914341..a3cb8c014c 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -349,6 +349,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 19b02993b2..b1e8cee32d 100644 --- a/Resources/Prototypes/Recipes/Lathes/misc.yml +++ b/Resources/Prototypes/Recipes/Lathes/misc.yml @@ -190,6 +190,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 2bd8ee5fa2..cdb8225544 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 65fd672e1a..b5d5fb7dc0 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 astro-sand floor + spawn: FloorTileItemAstroAsteroidSand + 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 0a7d2c0af6..6c8714be20 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(0x$iEP)Px%ib+I4R9J=Wmd$R{KomyLc$}ZHCw3F3v{VsnSViiB1>zODWr0-08}xyAg9;v@ zJJuCQELl`65K#(MoW^!t+evM+2sNsZa6~JCM82hc=iW1SK3@;4wbokyyF^{U!Tw(P zr^#QvIjYV7+kk`pz4B4tprbX-W`nPO$W~Y1i1EXiUdKWR!DuuBU@#cqhcTbd=Cu$; z9ieG9nMMg;{g5Irh@uE7CG+_l0MD@zVp(H%cbDz$ZKRYW;dx!^)c}$tp~wr0yg*wm zEXyL#b6Twy08te2_Dhq);|WDkV45a*p0l&Fvl4(=7hqd$5C$az0bE{QVwxsODWWLi z{mf%L9s@8MjnG;ngupOr_Xe!c0c~4YsztkL(ridNoeoMV%CfAA4~IiGHa2+uZpvgb z0l@eDy8!?=pH8t4Gp`pj3nMD#URdq?AZ0aa|X!H9-)dltL-BQgK+}2>e+@p63)L zXuF9t1dij}IOFTKUz_vd;^OWA+6{xQWAk9E%hAUK&#{+azF*CPBuT3HG)?h5ubPUt z2DsMY@r2=U$cN}2j^hB3Wf^fCBc%jD2!T?HEXx=S1}o*Q^}uvG#dTd?KJ5c%0EFT4 z-RINgxV7zNSFWzEDwt&l?ArtMdc9ws6-9wz7(Be+{Q>mTl-E*D7t;FAvEGDXTuJqaWUg3%W0000zc|U7jiq zNDx36yyF9QpW~9JiUT|ZAOJXIWk%kUKn#K}|a0A#~gC?I^k;{);X6ggnD s92hMJhHN=NEEw?iz$h36qhP=R0F=#@<07kLhX4Qo07*qoM6N<$f=Do7x&QzG delta 224 zcmZo>`p7szvYwfNfx%@-*D)Z)SRCZ;#IWw1%u67LCEd~2k%3`jKlh(RRv@1zz$e5t z;Kq*)FMa?4P{4?3P8>*GNswRg|Ns9P9JE$`0rEKuJR*x382FBWFymBhK53v}oTrOp zh=u>t34vS(3^<$@-}`@V^Q?ukeSg_gERW<+s diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json index 7562d0f9b1..a39ba782fa 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 and Snow tile modifications, Astreroid tile and in-hands created by Southbridge-fur (github)", "size": { "x": 32, "y": 32 @@ -549,6 +549,17 @@ }, { "name": "wood-large" + }, + { + "name": "asteroid" + }, + { + "name": "asteroid-inhand-right", + "directions": 4 + }, + { + "name": "asteroid-inhand-left", + "directions": 4 } ] } 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