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 5c8aaa82b3dbcfbbc11e244ded2f0c20ff1510b6..6a6a0e5ff29ffcea119fc50dd348fcb23d9e1895 100644 (file)
--- 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 6aa2ebc9067e99260f1c4ab5888e0d2b1a306e42..293b6cd7fa4735b45c01d864ae691719f0aed1f8 100644 (file)
--- 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 02033a137a062160069138f5597d994ed024bdd6..8d8102ef39c362437d837f3998716e355c4629b1 100644 (file)
--- 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 9bdf3834c426bce2fa93afc2c2f5e14014831a39..d2bb9efde38b34f8327763e920e1a101e114a5c4 100644 (file)
--- 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 f8b1c6a3e0e2d695ad8a45e98bd4bee4492b9cf2..b8c0fcd95f617753a53bf495b55b7dba14d5809a 100644 (file)
--- 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 c03969e1e5e6abc57a75ee244446616d757a6228..1151d9c76f0bd6192c6b37b27fee91e87d649dc9 100644 (file)
--- 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 eb423b0aa54870745c4a6d5eece41d15e3702d1d..5a46982374975e316f9c55c6bb276ef3c01b85a4 100644 (file)
--- 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 0e150f5bc3f63162a3b515e56e3b4c150627841d..9d6f197e36263184629a210831d91ef77bfa7aa7 100644 (file)
--- 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 (file)
index 0000000..14d2f9e
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 (file)
index 0000000..e17ee05
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 963c748c6dcdda010379b9811409a63b8193747f..05aeba33fd52b559fda29bf4da27df416fbbcef6 100644 (file)
--- 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