Skip to content

Commit

Permalink
Mirror: add more astro-grasses (#380)
Browse files Browse the repository at this point in the history
## Mirror of PR #26381: [add more
astro-grasses](space-wizards/space-station-14#26381)
from <img src="https://avatars.githubusercontent.com/u/10567778?v=4"
alt="space-wizards" width="22"/>
[space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14)

###### `89235b9e1b91b32b3e55b364d46c79daabe199e9`

PR opened by <img
src="https://avatars.githubusercontent.com/u/107586145?v=4"
width="16"/><a href="https://github.com/IProduceWidgets">
IProduceWidgets</a> at 2024-03-24 06:01:14 UTC

---

PR changed 7 files with 130 additions and 1 deletions.

The PR had the following labels:
- No C#
- Status: Needs Review


---

<details open="true"><summary><h1>Original Body</h1></summary>

> <!-- Please read these guidelines before opening your PR:
https://docs.spacestation14.io/en/getting-started/pr-guideline -->
> <!-- The text between the arrows are comments - they will not be
visible on your PR. -->
> 
> ## About the PR
> <!-- What did you change in this PR? -->
> Ever fearful that their staff will manage to touch real grass,
NanoTrasen has put billions of spesos of work into developing the worlds
most life like astro-grasses. Yet still, with all the innovations made,
the glorious corporate overlords have deemed us worth of yet more
varieties of real fake grass. It almost feels like you're actually
outside!
>
![image](https://github.com/space-wizards/space-station-14/assets/107586145/368d6f07-deab-4e55-a02e-e0845e178fbe)
> 
> ## Why / Balance
> <!-- Why was it changed? Link any discussions or issues here. Please
discuss how this would affect game balance. -->
> To celebrate the server's remarkable uptime metrics. 
> 
> ## Technical details
> <!-- If this is a code change, summarize at high level how your new
code works. This makes it easier to review. -->
> 
> ## Media
> <!-- 
> PRs which make ingame changes (adding clothing, items, new features,
etc) are required to have media attached that showcase the changes.
> Small fixes/refactors are exempt.
> Any media may be used in SS14 progress reports, with clear credit
given.
> 
> If you're unsure whether your PR will require media, ask a maintainer.
> 
> Check the box below to confirm that you have in fact seen this (put an
X in the brackets, like [X]):
> -->
> 
> - [X] I have added screenshots/videos to this PR showcasing its
changes ingame, **or** this PR does not require an ingame showcase
> 
> ## Breaking changes
> <!--
> List any breaking changes, including namespace, public
class/method/field changes, prototype renames; and provide instructions
for fixing them. This will be pasted in #codebase-changes.
> -->
> 
> **Changelog**
> <!--
> Make players aware of new features and changes that could affect how
they play the game by adding a Changelog entry. Please read the
Changelog guidelines located at:
https://docs.spacestation14.io/en/getting-started/pr-guideline#changelog
> -->
> 
> <!--
> Make sure to take this Changelog template out of the comment block in
order for it to show up.
> 🆑
> - add: Added fun!
> - remove: Removed fun!
> - tweak: Changed fun!
> - fix: Fixed fun!
> -->
> 🆑
> - add: More varieties of astro-grass are now available.
> - tweak: Astro-grass must now be cut instead of pried.


</details>

Co-authored-by: SimpleStation14 <Unknown>
  • Loading branch information
SimpleStation14 authored May 12, 2024
1 parent be0115b commit b00b9e8
Show file tree
Hide file tree
Showing 7 changed files with 130 additions and 1 deletion.
3 changes: 3 additions & 0 deletions Resources/Locale/en-US/tiles/tiles.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -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
51 changes: 51 additions & 0 deletions Resources/Prototypes/Entities/Objects/Misc/tiles.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1056,6 +1056,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
Expand All @@ -1073,6 +1107,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
Expand Down
3 changes: 3 additions & 0 deletions Resources/Prototypes/Entities/Structures/Machines/lathe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,10 @@
- JawsOfLife
- CoreSilver # Nyanotrasen - Silver Golem core
- FauxTileAstroGrass
- FauxTileMowedAstroGrass
- FauxTileJungleAstroGrass
- FauxTileAstroIce
- FauxTileAstroSnow
- OreBagOfHolding
- DeviceQuantumSpinInverter
- type: EmagLatheRecipes
Expand Down
21 changes: 21 additions & 0 deletions Resources/Prototypes/Recipes/Lathes/misc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -150,13 +150,34 @@
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
completetime: 1
materials:
Plastic: 100

- type: latheRecipe
id: FauxTileAstroSnow
result: FloorTileItemAstroSnow
completetime: 1
materials:
Plastic: 100

- type: latheRecipe
id: FloorGreenCircuit
result: FloorTileItemGCircuit4
Expand Down
3 changes: 3 additions & 0 deletions Resources/Prototypes/Research/civilianservices.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,10 @@
cost: 5000
recipeUnlocks:
- FauxTileAstroGrass
- FauxTileMowedAstroGrass
- FauxTileJungleAstroGrass
- FauxTileAstroIce
- FauxTileAstroSnow

- type: technology
id: BiochemicalStasis
Expand Down
21 changes: 21 additions & 0 deletions Resources/Prototypes/Stacks/floor_tile_stacks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -475,13 +475,34 @@
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
spawn: FloorTileItemAstroIce
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
Expand Down
29 changes: 28 additions & 1 deletion Resources/Prototypes/Tiles/floors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1874,12 +1874,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
Expand All @@ -1895,6 +1913,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
Expand Down

0 comments on commit b00b9e8

Please sign in to comment.