From 8399d0a9ebb4473ace316eab91dc65e2d0ad62b2 Mon Sep 17 00:00:00 2001 From: Kara Date: Sat, 16 Dec 2023 01:20:57 -0700 Subject: [PATCH] Faux astro-tiles for science & mappers (#22586) * Faux astro-tiles for science * didnt mean to commit dode --- .../Locale/en-US/research/technologies.ftl | 1 + Resources/Locale/en-US/tiles/tiles.ftl | 6 ++- .../Entities/Objects/Misc/tiles.yml | 36 ++++++++++++++ .../Entities/Structures/Machines/lathe.yml | 2 + Resources/Prototypes/Recipes/Lathes/misc.yml | 14 ++++++ .../Prototypes/Research/civilianservices.yml | 13 +++++ .../Prototypes/Stacks/floor_tile_stacks.yml | 15 ++++++ Resources/Prototypes/Tiles/floors.yml | 46 ++++++++++++++++++ .../Objects/Tiles/tile.rsi/astrograss.png | Bin 0 -> 1931 bytes .../Objects/Tiles/tile.rsi/astroice.png | Bin 0 -> 234 bytes .../Textures/Objects/Tiles/tile.rsi/meta.json | 6 +++ 11 files changed, 137 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/Objects/Tiles/tile.rsi/astrograss.png create mode 100644 Resources/Textures/Objects/Tiles/tile.rsi/astroice.png diff --git a/Resources/Locale/en-US/research/technologies.ftl b/Resources/Locale/en-US/research/technologies.ftl index 5c8aaa82b3..6a6a0e5ff2 100644 --- a/Resources/Locale/en-US/research/technologies.ftl +++ b/Resources/Locale/en-US/research/technologies.ftl @@ -63,6 +63,7 @@ research-technology-critter-mechs = Critter Mechs research-technology-food-service = Food Service research-technology-advanced-entertainment = Advanced Entertainment research-technology-audio-visual-communication = A/V Communication +research-technology-faux-astro-tiles = Faux Astro-Tiles research-technology-robotic-cleanliness = Robotic Cleanliness research-technology-advanced-cleaning = Advanced Cleaning research-technology-meat-manipulation = Meat Manipulation diff --git a/Resources/Locale/en-US/tiles/tiles.ftl b/Resources/Locale/en-US/tiles/tiles.ftl index 6aa2ebc906..293b6cd7fa 100644 --- a/Resources/Locale/en-US/tiles/tiles.ftl +++ b/Resources/Locale/en-US/tiles/tiles.ftl @@ -48,7 +48,7 @@ tiles-mining-tile = mining tile tiles-mining-dark-tile = dark mining tile tiles-mining-light-tile = light mining tile tiles-freezer = freezer -tiles-showroom-floor = showroom +tiles-showroom-floor = showroom tiles-lime-floor = lime floor tiles-hydro-floor = hydro floor tiles-bar-floor = bar floor @@ -114,4 +114,6 @@ tiles-wood3 = wood broken floor tiles-hull = exterior hull plating tiles-hull-reinforced = exterior reinforced hull plating tiles-web = web tile -tiles-chromite = chromite \ No newline at end of file +tiles-chromite = chromite +tiles-astro-grass = astro-grass +tiles-astro-ice = astro-ice diff --git a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml index 02033a137a..8d8102ef39 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml @@ -943,3 +943,39 @@ - type: Construction graph: WebObjects node: tile + +# Faux science tiles + +- type: entity + id: FloorTileItemAstroGrass + parent: FloorTileItemBase + name: astro-grass + description: Fake grass that covers up wires and even comes with realistic NanoTrimmings! + components: + - type: Sprite + state: astrograss + - type: Item + heldPrefix: grass + - type: FloorTile + outputs: + - Plating + - FloorAstroGrass + - type: Stack + stackType: FloorTileAstroGrass + +- type: entity + id: FloorTileItemAstroIce + parent: FloorTileItemBase + name: astro-ice + description: Fake ice that's as slippery as the real thing, while being easily removable! + components: + - type: Sprite + state: astroice + - type: Item + heldPrefix: snow + - type: FloorTile + outputs: + - Plating + - FloorAstroIce + - type: Stack + stackType: FloorTileAstroIce diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 9bdf3834c4..d2bb9efde3 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -276,6 +276,8 @@ - WelderExperimental - JawsOfLife - ClothingEyesGlassesChemical + - FauxTileAstroGrass + - FauxTileAstroIce - type: EmagLatheRecipes emagDynamicRecipes: - ExplosivePayload diff --git a/Resources/Prototypes/Recipes/Lathes/misc.yml b/Resources/Prototypes/Recipes/Lathes/misc.yml index f8b1c6a3e0..b8c0fcd95f 100644 --- a/Resources/Prototypes/Recipes/Lathes/misc.yml +++ b/Resources/Prototypes/Recipes/Lathes/misc.yml @@ -117,3 +117,17 @@ materials: Steel: 750 Plastic: 100 + +- type: latheRecipe + id: FauxTileAstroGrass + result: FloorTileItemAstroGrass + completetime: 1 + materials: + Plastic: 100 + +- type: latheRecipe + id: FauxTileAstroIce + result: FloorTileItemAstroIce + completetime: 1 + materials: + Plastic: 100 diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml index c03969e1e5..1151d9c76f 100644 --- a/Resources/Prototypes/Research/civilianservices.yml +++ b/Resources/Prototypes/Research/civilianservices.yml @@ -116,6 +116,19 @@ # Tier 2 +- type: technology + id: FauxAstroTiles + name: research-technology-faux-astro-tiles + icon: + sprite: Objects/Tiles/tile.rsi + state: astroice + discipline: CivilianServices + tier: 2 + cost: 5000 + recipeUnlocks: + - FauxTileAstroGrass + - FauxTileAstroIce + - type: technology id: RoboticCleanliness name: research-technology-robotic-cleanliness diff --git a/Resources/Prototypes/Stacks/floor_tile_stacks.yml b/Resources/Prototypes/Stacks/floor_tile_stacks.yml index eb423b0aa5..5a46982374 100644 --- a/Resources/Prototypes/Stacks/floor_tile_stacks.yml +++ b/Resources/Prototypes/Stacks/floor_tile_stacks.yml @@ -424,3 +424,18 @@ spawn: FloorTileItemWeb maxCount: 30 itemSize: 5 + +# Faux science tiles +- type: stack + id: FloorTileAstroGrass + name: astro-grass floor + spawn: FloorTileItemAstroGrass + maxCount: 30 + itemSize: 5 + +- type: stack + id: FloorTileAstroIce + name: astro-ice floor + spawn: FloorTileItemAstroIce + maxCount: 30 + itemSize: 5 diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml index 0e150f5bc3..9d6f197e36 100644 --- a/Resources/Prototypes/Tiles/floors.yml +++ b/Resources/Prototypes/Tiles/floors.yml @@ -1770,3 +1770,49 @@ footstepSounds: collection: FootstepHull itemDrop: FloorTileItemReinforced #same case as FloorHull + +# Faux sci tiles + +# Grass +- type: tile + id: FloorAstroGrass + name: tiles-astro-grass + sprite: /Textures/Tiles/Planet/Grass/grass.png + variants: 4 + placementVariants: + - 1.0 + - 1.0 + - 1.0 + - 1.0 + edgeSpritePriority: 1 + edgeSprites: + SouthEast: /Textures/Tiles/Planet/Grass/single_edge.png + NorthEast: /Textures/Tiles/Planet/Grass/single_edge.png + NorthWest: /Textures/Tiles/Planet/Grass/single_edge.png + SouthWest: /Textures/Tiles/Planet/Grass/single_edge.png + South: /Textures/Tiles/Planet/Grass/double_edge.png + East: /Textures/Tiles/Planet/Grass/double_edge.png + North: /Textures/Tiles/Planet/Grass/double_edge.png + West: /Textures/Tiles/Planet/Grass/double_edge.png + baseTurf: Plating + isSubfloor: false + canCrowbar: true + footstepSounds: + collection: FootstepGrass + itemDrop: FloorTileItemAstroGrass + heatCapacity: 10000 + +# Ice +- type: tile + id: FloorAstroIce + name: tiles-astro-ice + sprite: /Textures/Tiles/Planet/Snow/ice.png + baseTurf: Plating + isSubfloor: false + canCrowbar: true + friction: 0.05 + heatCapacity: 10000 + mobFriction: 0.5 + mobFrictionNoInput: 0.05 + mobAcceleration: 2 + itemDrop: FloorTileItemAstroIce diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/astrograss.png b/Resources/Textures/Objects/Tiles/tile.rsi/astrograss.png new file mode 100644 index 0000000000000000000000000000000000000000..14d2f9ef8496b5981f055b6f721d5255489fdb9b GIT binary patch literal 1931 zcmZux2~ZPf6b>G(prVfUuwLs@m0~xWU2^S~h?)e*NH9W%f=BCScN12U-MG7u0L3aE zqadA1we><;wN%<#DxNJKgVF=f(XmCXwmRC*K)tGV)S;ICn}gzvnIyaazu))$?|u8; zTjj_~9~}2eoJyq{Y|F4@gDa%`2J{90mhF|_t5h)+oZ0NKnaz+x6x^JbRjCrstXpGG zw9Fd)-Mi0KYnwFIreGCijcv;|Z%;h6dSlDcGU24-{+5nI8@#Wt+u3w?*I#?T-sLW& zzF2#2R@0s)Sby&R5#fC1g0*w@cl~*}EbHNxflHQd=DsO9H2-4%N&2xr)imTIk1|*0 zc8-L0Y~mLsP5JQS&PNA6P1|WOB~^7-*FV@=IK6seiuaG&in|qeuPzwh7)&>M)g9cm zoNIi#I`N%Gd0Q)5xqHg$<=Cw{d5M6jxoV+>g*c3-^>EHdQglY2vmckIF0}WB9-tm6-0O`AuJM+v9J;?a(-bUF|`Ku`IM+bXi2sf19BvmXQCx%iJwKYSxG1o zY1UfI@^V6y&d@zvf05`7Wx>!W>t%faCV|tio}N#xCbS3?*F}c zDjwxYDE#Q*fYzh;6f&Bp0t9A|7J)8O;;~swuyQEL2sFo#pMckOe#{iYkgQdoW<9ISb z)2v$`<a@H3!+mHye3$Q0#Z29 zY6bNg_CJG@0IDR^2~g-0>W3V5VXv)7b$dA|RFfn{hmVq|VwQm;n{)xidsxu4pkBf- z?iufda8U%M(PD^}&>9h~UQZw{ELnp99~tn~Cu?*dfiPbZ+;V^t*=Zh-9Y_L{M<@v> zG2+{6QDmTiRZP)bufhX$|D6;nzDCpDd@9o2;+J+b9hjM*kDqC z72rjOkFx3+U@Q*|5W#p7D{pK9qiv1NGRf)-a z=YBS<#JbP7_ZgPp>_{(fn*(8am;O#Fne@-`WwY*$$(Xo)>yzd0|GR$sw>5^NO*a?R z##|T?>zI%_Aj!y|UOca^&s1|>owz91{Nu~(pIdmn=8Zlrw>NT23xjEGqo|8wd;W~W qeNXQ7G>=)rs!l!L{cGp&B?Nk@G4``@-S}8#@Y<|dmanGIulNt?^Rx>9 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/astroice.png b/Resources/Textures/Objects/Tiles/tile.rsi/astroice.png new file mode 100644 index 0000000000000000000000000000000000000000..e17ee0500b9b5f4badb2e5b7ef0ab1101d7d57f5 GIT binary patch literal 234 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCikh0(?STH@x@}aN`FM00rK%vDtvsl?3?(|NsA=!9i=~7a*Urz$3Dlfr0M` z2s2LA=92~rhI_g=hFJK&oe;=%K!L}3_P2lKafSRnM%$Qo{9%bp5?O3l5~a8#WJ|#Z z9S_Gk>l<9zdK=;|TAaLnaG$`*pAQqFJ-!uw(8>9E_|OB{#|iaM{`2QsEea@Q+-1r+ U(JWD8CC~~6Pgg&ebxsLQ02LNdW&i*H 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 963c748c6d..05aeba33fd 100644 --- a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json +++ b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json @@ -219,6 +219,12 @@ { "name": "woodpatternfloor" }, + { + "name": "astrograss" + }, + { + "name": "astroice" + }, { "name": "bcircuit-inhand-left", "directions": 4 -- 2.51.2