From: Kara Date: Sat, 16 Dec 2023 08:20:57 +0000 (-0700) Subject: Faux astro-tiles for science & mappers (#22586) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=8399d0a9ebb4473ace316eab91dc65e2d0ad62b2;p=space-station-14.git Faux astro-tiles for science & mappers (#22586) * Faux astro-tiles for science * didnt mean to commit dode --- 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 0000000000..14d2f9ef84 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/astrograss.png differ 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 0000000000..e17ee0500b Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/astroice.png differ 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