diff --git a/Resources/Locale/en-US/stack/stacks.ftl b/Resources/Locale/en-US/stack/stacks.ftl index 818ac954c5..acc7cdba64 100644 --- a/Resources/Locale/en-US/stack/stacks.ftl +++ b/Resources/Locale/en-US/stack/stacks.ftl @@ -224,6 +224,8 @@ stack-steel-maint-floor = steel maint floor stack-grating-maint-floor = grating maint floor stack-web-tile = web tile stack-astro-grass-floor = astro-grass floor +stack-dark-astro-grass-floor = dark astro-grass floor +stack-light-astro-grass-floor = light astro-grass floor stack-mowed-astro-grass-floor = mowed astro-grass floor stack-jungle-astro-grass-floor = jungle astro-grass floor stack-astro-ice-floor = astro-ice floor @@ -231,6 +233,7 @@ stack-astro-snow-floor = astro-snow floor stack-large-wood-floor = large wood floor stack-red-circuit-floor = red-circuit floor stack-asteroid-astro-sand-floor = asteroid astro-sand floor +stack-desert-astro-sand-floor = desert astro-sand floor stack-xeno-floor = xeno floor stack-xeno-steel = xeno steel tile stack-xeno-steel-corner = xeno steel corner tile diff --git a/Resources/Locale/en-US/tiles/tiles.ftl b/Resources/Locale/en-US/tiles/tiles.ftl index 6295712722..d9fe984c51 100644 --- a/Resources/Locale/en-US/tiles/tiles.ftl +++ b/Resources/Locale/en-US/tiles/tiles.ftl @@ -128,12 +128,15 @@ tiles-hull-reinforced = exterior reinforced hull plating tiles-web = web tile tiles-chromite = chromite tiles-astro-grass = astro-grass +tiles-dark-astro-grass = dark astro-grass +tiles-light-astro-grass = light 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-astro-asteroid-sand = asteroid astro-sand tiles-astro-asteroid-sand-borderless = borderless asteroid astro-sand +tiles-desert-astro-sand = desert astro-sand tiles-wood-large = large wood tiles-xeno-floor = xeno floor tiles-xeno-steel = xeno steel tile diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Decals/flora.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Decals/flora.yml index aacad99bdd..313a27ae95 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Decals/flora.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Decals/flora.yml @@ -11,6 +11,9 @@ - FloorAstroGrass - FloorMowedAstroGrass - FloorJungleAstroGrass + - FloorDarkAstroGrass + - FloorLightAstroGrass + - FloorDesertAstroSand - FloorAstroIce - FloorAstroSnow - FloorAstroAsteroidSand diff --git a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml index 6670114bdf..b92626e6a1 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml @@ -1533,6 +1533,40 @@ - type: Stack stackType: FloorTileAstroGrass +- type: entity + parent: FloorTileItemBase + id: FloorTileItemDarkAstroGrass + name: dark astro-grass + description: Fake grass that covers up wires and even comes with realistic NanoTrimmings! + components: + - type: Sprite + state: grassdark + - type: Item + heldPrefix: darkgrass + - type: FloorTile + outputs: + - Plating + - FloorDarkAstroGrass + - type: Stack + stackType: FloorTileDarkAstroGrass + +- type: entity + parent: FloorTileItemBase + id: FloorTileItemLightAstroGrass + name: light astro-grass + description: Fake grass that covers up wires and even comes with realistic NanoTrimmings! + components: + - type: Sprite + state: grasslight + - type: Item + heldPrefix: lightgrass + - type: FloorTile + outputs: + - Plating + - FloorLightAstroGrass + - type: Stack + stackType: FloorTileLightAstroGrass + - type: entity id: FloorTileItemAstroIce parent: FloorTileItemBase @@ -1601,6 +1635,23 @@ - type: Stack stackType: FloorTileAstroAsteroidSand +- type: entity + parent: FloorTileItemBase + id: FloorTileItemDesertAstroSand + name: desert astro-sand + description: Fake sand, designed to be fine. + components: + - type: Sprite + state: desertsand + - type: Item + heldPrefix: desertsand + - type: FloorTile + outputs: + - Plating + - FloorDesertAstroSand + - type: Stack + stackType: FloorTileDesertAstroSand + - type: entity name: large wood floor parent: FloorTileItemBase diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/science.yml b/Resources/Prototypes/Recipes/Lathes/Packs/science.yml index 164a85dc44..ae8dab762d 100644 --- a/Resources/Prototypes/Recipes/Lathes/Packs/science.yml +++ b/Resources/Prototypes/Recipes/Lathes/Packs/science.yml @@ -68,9 +68,12 @@ - FauxTileAstroGrass - FauxTileMowedAstroGrass - FauxTileJungleAstroGrass + - FauxTileDarkAstroGrass + - FauxTileLightAstroGrass - FauxTileAstroIce - FauxTileAstroSnow - FauxTileAstroAsteroidSand + - FauxTileDesertAstroSand # Only contains parts for making basic modular grenades, no actual explosives - type: latheRecipePack diff --git a/Resources/Prototypes/Recipes/Lathes/misc.yml b/Resources/Prototypes/Recipes/Lathes/misc.yml index 53b5f4a4e7..1633811124 100644 --- a/Resources/Prototypes/Recipes/Lathes/misc.yml +++ b/Resources/Prototypes/Recipes/Lathes/misc.yml @@ -200,6 +200,16 @@ id: FauxTileJungleAstroGrass result: FloorTileItemJungleAstroGrass +- type: latheRecipe + parent: BaseFauxTileRecipe + id: FauxTileDarkAstroGrass + result: FloorTileItemDarkAstroGrass + +- type: latheRecipe + parent: BaseFauxTileRecipe + id: FauxTileLightAstroGrass + result: FloorTileItemLightAstroGrass + - type: latheRecipe parent: BaseFauxTileRecipe id: FauxTileAstroIce @@ -220,6 +230,11 @@ id: FauxTileAstroAsteroidSandBorderless result: FloorTileItemAstroAsteroidSandBorderless +- type: latheRecipe + parent: BaseFauxTileRecipe + id: FauxTileDesertAstroSand + result: FloorTileItemDesertAstroSand + - type: latheRecipe id: FloorGreenCircuit result: FloorTileItemGCircuit4 diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml index c32169051c..50bfcc0f57 100644 --- a/Resources/Prototypes/Research/civilianservices.yml +++ b/Resources/Prototypes/Research/civilianservices.yml @@ -98,9 +98,12 @@ - FauxTileAstroGrass - FauxTileMowedAstroGrass - FauxTileJungleAstroGrass + - FauxTileDarkAstroGrass + - FauxTileLightAstroGrass - FauxTileAstroIce - FauxTileAstroSnow - FauxTileAstroAsteroidSand + - FauxTileDesertAstroSand - type: technology id: BiochemicalStasis diff --git a/Resources/Prototypes/Stacks/floor_tile_stacks.yml b/Resources/Prototypes/Stacks/floor_tile_stacks.yml index 6e1ccd45bc..a41282ff71 100644 --- a/Resources/Prototypes/Stacks/floor_tile_stacks.yml +++ b/Resources/Prototypes/Stacks/floor_tile_stacks.yml @@ -617,6 +617,18 @@ spawn: FloorTileItemJungleAstroGrass maxCount: 30 +- type: stack + id: FloorTileDarkAstroGrass + name: stack-dark-astro-grass-floor + spawn: FloorTileItemDarkAstroGrass + maxCount: 30 + +- type: stack + id: FloorTileLightAstroGrass + name: stack-light-astro-grass-floor + spawn: FloorTileItemLightAstroGrass + maxCount: 30 + - type: stack id: FloorTileAstroIce name: stack-astro-ice-floor @@ -635,6 +647,12 @@ spawn: FloorTileItemAstroAsteroidSand maxCount: 30 +- type: stack + id: FloorTileDesertAstroSand + name: stack-desert-astro-sand-floor + spawn: FloorTileItemDesertAstroSand + maxCount: 30 + - type: stack id: FloorTileWoodLarge name: stack-large-wood-floor diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml index 7c1f39aa54..d0d9f403b3 100644 --- a/Resources/Prototypes/Tiles/floors.yml +++ b/Resources/Prototypes/Tiles/floors.yml @@ -1999,6 +1999,24 @@ deconstructTools: [ Cutting ] itemDrop: FloorTileItemJungleAstroGrass +- type: tile + parent: FloorGrassDark + id: FloorDarkAstroGrass + name: tiles-dark-astro-grass + baseTurf: Plating + isSubfloor: false + deconstructTools: [ Cutting ] + itemDrop: FloorTileItemDarkAstroGrass + +- type: tile + parent: FloorGrassLight + id: FloorLightAstroGrass + name: tiles-light-astro-grass + baseTurf: Plating + isSubfloor: false + deconstructTools: [ Cutting ] + itemDrop: FloorTileItemLightAstroGrass + # Ice - type: tile id: FloorAstroIce @@ -2043,6 +2061,16 @@ itemDrop: FloorTileItemAstroAsteroidSand weather: false +- type: tile + parent: FloorDesert + id: FloorDesertAstroSand + name: tiles-desert-astro-sand + baseTurf: Plating + isSubfloor: false + deconstructTools: [ Prying ] + itemDrop: FloorTileItemDesertAstroSand + weather: false + - type: tile id: FloorWoodLarge name: tiles-wood-large diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/desertsand-inhand-left.png b/Resources/Textures/Objects/Tiles/tile.rsi/desertsand-inhand-left.png new file mode 100644 index 0000000000..1d96f69391 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/desertsand-inhand-left.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/desertsand-inhand-right.png b/Resources/Textures/Objects/Tiles/tile.rsi/desertsand-inhand-right.png new file mode 100644 index 0000000000..69031fbc18 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/desertsand-inhand-right.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/desertsand.png b/Resources/Textures/Objects/Tiles/tile.rsi/desertsand.png new file mode 100644 index 0000000000..37f98745dc Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/desertsand.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/grassdark-inhand-left.png b/Resources/Textures/Objects/Tiles/tile.rsi/grassdark-inhand-left.png new file mode 100644 index 0000000000..a11017f067 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/grassdark-inhand-left.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/grassdark-inhand-right.png b/Resources/Textures/Objects/Tiles/tile.rsi/grassdark-inhand-right.png new file mode 100644 index 0000000000..2aba5a40c3 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/grassdark-inhand-right.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/grassdark.png b/Resources/Textures/Objects/Tiles/tile.rsi/grassdark.png new file mode 100644 index 0000000000..8ffe2c575f Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/grassdark.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/grasslight-inhand-left.png b/Resources/Textures/Objects/Tiles/tile.rsi/grasslight-inhand-left.png new file mode 100644 index 0000000000..da71a5422c Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/grasslight-inhand-left.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/grasslight-inhand-right.png b/Resources/Textures/Objects/Tiles/tile.rsi/grasslight-inhand-right.png new file mode 100644 index 0000000000..83d901b2f6 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/grasslight-inhand-right.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/grasslight.png b/Resources/Textures/Objects/Tiles/tile.rsi/grasslight.png new file mode 100644 index 0000000000..6dc00a2197 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/grasslight.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json index 2b01db5ab5..b1fb0057d7 100644 --- a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json +++ b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json @@ -34,6 +34,9 @@ { "name": "dark-offset" }, + { + "name": "desertsand" + }, { "name": "dirty" }, @@ -130,6 +133,12 @@ { "name": "grass" }, + { + "name": "grassdark" + }, + { + "name": "grasslight" + }, { "name": "grassjungle" }, @@ -438,6 +447,14 @@ "name": "grass-inhand-right", "directions": 4 }, + { + "name": "grasslight-inhand-left", + "directions": 4 + }, + { + "name": "grasslight-inhand-right", + "directions": 4 + }, { "name": "snow-inhand-left", "directions": 4 @@ -446,6 +463,22 @@ "name": "snow-inhand-right", "directions": 4 }, + { + "name": "grassdark-inhand-left", + "directions": 4 + }, + { + "name": "grassdark-inhand-right", + "directions": 4 + }, + { + "name": "desertsand-inhand-left", + "directions": 4 + }, + { + "name": "desertsand-inhand-right", + "directions": 4 + }, { "name": "dirty-inhand-left", "directions": 4