From 89235b9e1b91b32b3e55b364d46c79daabe199e9 Mon Sep 17 00:00:00 2001 From: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com> Date: Sun, 24 Mar 2024 21:14:04 -0400 Subject: [PATCH] Add astro-jungle/mowed grass and astro-snow (#26381) --- Resources/Locale/en-US/tiles/tiles.ftl | 3 ++ .../Entities/Objects/Misc/tiles.yml | 51 +++++++++++++++++++ .../Entities/Structures/Machines/lathe.yml | 3 ++ Resources/Prototypes/Recipes/Lathes/misc.yml | 21 ++++++++ .../Prototypes/Research/civilianservices.yml | 3 ++ .../Prototypes/Stacks/floor_tile_stacks.yml | 21 ++++++++ Resources/Prototypes/Tiles/floors.yml | 29 ++++++++++- 7 files changed, 130 insertions(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/tiles/tiles.ftl b/Resources/Locale/en-US/tiles/tiles.ftl index 0a1b13a6e0..e5b6810fca 100644 --- a/Resources/Locale/en-US/tiles/tiles.ftl +++ b/Resources/Locale/en-US/tiles/tiles.ftl @@ -122,5 +122,8 @@ tiles-hull-reinforced = exterior reinforced hull plating tiles-web = web tile tiles-chromite = chromite tiles-astro-grass = astro-grass +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-wood-large = large wood \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml index 5b57d930b0..6f351ee9db 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml @@ -1051,6 +1051,40 @@ - type: Stack stackType: FloorTileAstroGrass +- type: entity + id: FloorTileItemMowedAstroGrass + parent: FloorTileItemBase + name: mowed astro-grass + description: Fake grass that covers up wires and even comes with realistic NanoTrimmings! + components: + - type: Sprite + state: grass + - type: Item + heldPrefix: grass + - type: FloorTile + outputs: + - Plating + - FloorMowedAstroGrass + - type: Stack + stackType: FloorTileAstroGrass + +- type: entity + id: FloorTileItemJungleAstroGrass + parent: FloorTileItemBase + name: jungle astro-grass + description: Fake grass that covers up wires and even comes with realistic NanoTrimmings! + components: + - type: Sprite + state: grassjungle + - type: Item + heldPrefix: grass + - type: FloorTile + outputs: + - Plating + - FloorJungleAstroGrass + - type: Stack + stackType: FloorTileAstroGrass + - type: entity id: FloorTileItemAstroIce parent: FloorTileItemBase @@ -1068,6 +1102,23 @@ - type: Stack stackType: FloorTileAstroIce +- type: entity + id: FloorTileItemAstroSnow + parent: FloorTileItemBase + name: astro-snow + description: Fake snow that's as fluffy as the real thing, while being easily removable! + components: + - type: Sprite + state: snow + - type: Item + heldPrefix: snow + - type: FloorTile + outputs: + - Plating + - FloorAstroSnow + - type: Stack + stackType: FloorTileAstroSnow + - 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 cba7f86593..56200324ec 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -318,7 +318,10 @@ - WelderExperimental - JawsOfLife - FauxTileAstroGrass + - FauxTileMowedAstroGrass + - FauxTileJungleAstroGrass - FauxTileAstroIce + - FauxTileAstroSnow - OreBagOfHolding - DeviceQuantumSpinInverter - type: EmagLatheRecipes diff --git a/Resources/Prototypes/Recipes/Lathes/misc.yml b/Resources/Prototypes/Recipes/Lathes/misc.yml index 1334788376..ab13dc4573 100644 --- a/Resources/Prototypes/Recipes/Lathes/misc.yml +++ b/Resources/Prototypes/Recipes/Lathes/misc.yml @@ -150,6 +150,20 @@ materials: Plastic: 100 +- type: latheRecipe + id: FauxTileMowedAstroGrass + result: FloorTileItemMowedAstroGrass + completetime: 1 + materials: + Plastic: 100 + +- type: latheRecipe + id: FauxTileJungleAstroGrass + result: FloorTileItemJungleAstroGrass + completetime: 1 + materials: + Plastic: 100 + - type: latheRecipe id: FauxTileAstroIce result: FloorTileItemAstroIce @@ -157,6 +171,13 @@ materials: Plastic: 100 +- type: latheRecipe + id: FauxTileAstroSnow + result: FloorTileItemAstroSnow + completetime: 1 + materials: + Plastic: 100 + - type: latheRecipe id: FloorGreenCircuit result: FloorTileItemGCircuit4 diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml index c3f83e0fc5..61f95894ee 100644 --- a/Resources/Prototypes/Research/civilianservices.yml +++ b/Resources/Prototypes/Research/civilianservices.yml @@ -110,7 +110,10 @@ cost: 5000 recipeUnlocks: - FauxTileAstroGrass + - FauxTileMowedAstroGrass + - FauxTileJungleAstroGrass - FauxTileAstroIce + - FauxTileAstroSnow - type: technology id: BiochemicalStasis diff --git a/Resources/Prototypes/Stacks/floor_tile_stacks.yml b/Resources/Prototypes/Stacks/floor_tile_stacks.yml index b469f55c59..c5e37013b8 100644 --- a/Resources/Prototypes/Stacks/floor_tile_stacks.yml +++ b/Resources/Prototypes/Stacks/floor_tile_stacks.yml @@ -475,6 +475,20 @@ maxCount: 30 itemSize: 5 +- type: stack + id: FloorTileMowedAstroGrass + name: mowed astro-grass floor + spawn: FloorTileItemMowedAstroGrass + maxCount: 30 + itemSize: 5 + +- type: stack + id: FloorTileJungleAstroGrass + name: jungle astro-grass floor + spawn: FloorTileItemJungleAstroGrass + maxCount: 30 + itemSize: 5 + - type: stack id: FloorTileAstroIce name: astro-ice floor @@ -482,6 +496,13 @@ maxCount: 30 itemSize: 5 +- type: stack + id: FloorTileAstroSnow + name: astro-snow floor + spawn: FloorTileItemAstroSnow + maxCount: 30 + itemSize: 5 + - type: stack id: FloorTileWoodLarge name: large wood floor diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml index 9aba3f61ec..52efdc7d47 100644 --- a/Resources/Prototypes/Tiles/floors.yml +++ b/Resources/Prototypes/Tiles/floors.yml @@ -1866,12 +1866,30 @@ West: /Textures/Tiles/Planet/Grass/double_edge.png baseTurf: Plating isSubfloor: false - deconstructTools: [ Prying ] + deconstructTools: [ Cutting ] footstepSounds: collection: FootstepGrass itemDrop: FloorTileItemAstroGrass heatCapacity: 10000 +- type: tile + id: FloorMowedAstroGrass + name: tiles-mowed-astro-grass + parent: FloorGrass + baseTurf: Plating + isSubfloor: false + deconstructTools: [ Cutting ] + itemDrop: FloorTileItemMowedAstroGrass + +- type: tile + id: FloorJungleAstroGrass + name: tiles-jungle-astro-grass + parent: FloorGrassJungle + baseTurf: Plating + isSubfloor: false + deconstructTools: [ Cutting ] + itemDrop: FloorTileItemJungleAstroGrass + # Ice - type: tile id: FloorAstroIce @@ -1887,6 +1905,15 @@ mobAcceleration: 2 itemDrop: FloorTileItemAstroIce +- type: tile + id: FloorAstroSnow + name: tiles-astro-snow + parent: FloorSnow + baseTurf: Plating + isSubfloor: false + deconstructTools: [ Prying ] + itemDrop: FloorTileItemAstroSnow + - type: tile id: FloorWoodLarge name: tiles-wood-large -- 2.51.2