]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Add astro-jungle/mowed grass and astro-snow (#26381)
authorIProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com>
Mon, 25 Mar 2024 01:14:04 +0000 (21:14 -0400)
committerGitHub <noreply@github.com>
Mon, 25 Mar 2024 01:14:04 +0000 (18:14 -0700)
Resources/Locale/en-US/tiles/tiles.ftl
Resources/Prototypes/Entities/Objects/Misc/tiles.yml
Resources/Prototypes/Entities/Structures/Machines/lathe.yml
Resources/Prototypes/Recipes/Lathes/misc.yml
Resources/Prototypes/Research/civilianservices.yml
Resources/Prototypes/Stacks/floor_tile_stacks.yml
Resources/Prototypes/Tiles/floors.yml

index 0a1b13a6e0db01ba1f3dea1b13d9c49ce1e5ace7..e5b6810fcab7e04dc459e3129d722bdf4784f8b0 100644 (file)
@@ -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
index 5b57d930b037a22b7c15bec98050d027d1ec7a41..6f351ee9db20dde544cee5a8fa1677286e3e0556 100644 (file)
   - 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
   - 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
index cba7f8659346342a5c7cfd9cdea10a91004c293a..56200324ecdc1c2874055aa9adfc0804fc4bfa27 100644 (file)
       - WelderExperimental
       - JawsOfLife
       - FauxTileAstroGrass
+      - FauxTileMowedAstroGrass
+      - FauxTileJungleAstroGrass
       - FauxTileAstroIce
+      - FauxTileAstroSnow
       - OreBagOfHolding
       - DeviceQuantumSpinInverter
   - type: EmagLatheRecipes
index 133478837603f52aa4c04b7704829748cbf353a0..ab13dc4573feeba66f217e57558802b5b6394e71 100644 (file)
   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
   materials:
     Plastic: 100
 
+- type: latheRecipe
+  id: FauxTileAstroSnow
+  result: FloorTileItemAstroSnow
+  completetime: 1
+  materials:
+    Plastic: 100
+
 - type: latheRecipe
   id: FloorGreenCircuit
   result: FloorTileItemGCircuit4
index c3f83e0fc59be20e291c3c56be8227705eec3475..61f95894ee69ef8db6a4b950223291b4bc40fbe8 100644 (file)
   cost: 5000
   recipeUnlocks:
   - FauxTileAstroGrass
+  - FauxTileMowedAstroGrass
+  - FauxTileJungleAstroGrass
   - FauxTileAstroIce
+  - FauxTileAstroSnow
 
 - type: technology
   id: BiochemicalStasis
index b469f55c59c044b48fa91665474e5cfc048b9c0a..c5e37013b870fb0b913a0ff13bad7192a9e02cd9 100644 (file)
   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
   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
index 9aba3f61ec7262db51322d4e33aacb8552b7de66..52efdc7d473babc2a0c4fa702398cf689c7b56de 100644 (file)
     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
   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