diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 75a27c9754..90a8e98af1 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -280,7 +280,7 @@ - type: Extractable grindableSolutionName: food - type: DamageOnInteract - damage: + damage: types: Heat: 4 Caustic: 4 @@ -307,7 +307,7 @@ volume: -5 - !type:DoActsBehavior acts: [ "Destruction" ] - - type: DamageOnHit + - type: DamageOnHit damage: types: Blunt: 5 # The nettle will "wilt" after 5 hits. @@ -1312,6 +1312,7 @@ - type: Tag tags: - Vegetable + - Mushroom # Slices @@ -1623,6 +1624,9 @@ entries: Taco: Lingzhi Burger: Lingzhi + - type: Tag + tags: + - Mushroom - type: entity name: ambrosia vulgaris @@ -1844,6 +1848,9 @@ entries: Taco: FlyAmanita Burger: FlyAmanita + - type: Tag + tags: + - Mushroom - type: entity name: gatfruit diff --git a/Resources/Prototypes/Entities/Objects/Misc/spaceshroom.yml b/Resources/Prototypes/Entities/Objects/Misc/spaceshroom.yml index 29e5e54d04..e73d13e2cb 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/spaceshroom.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/spaceshroom.yml @@ -93,6 +93,9 @@ thickness: 0.02 area: 0.02 conductivity: 0.43 + - type: Tag + tags: + - Mushroom - type: weightedRandomFillSolution id: RandomFillSpaceshroom diff --git a/Resources/Prototypes/Entities/Structures/soil.yml b/Resources/Prototypes/Entities/Structures/soil.yml index c5c8f2e61f..53a8944856 100644 --- a/Resources/Prototypes/Entities/Structures/soil.yml +++ b/Resources/Prototypes/Entities/Structures/soil.yml @@ -55,3 +55,19 @@ solution: soil - type: Appearance - type: PlantHolderVisuals + +- type: entity + name: fungal soil + parent: hydroponicsSoil + id: FungalSoil + components: + - type: Construction + graph: Soil + node: fungalSoil + - type: Sprite + sprite: Structures/Hydroponics/misc.rsi + state: fungal_soil + noRot: true + - type: PlantHolder + waterLevel: 0 + nutritionLevel: 0 diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/soil.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/soil.yml new file mode 100644 index 0000000000..923469a8b1 --- /dev/null +++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/soil.yml @@ -0,0 +1,23 @@ +- type: constructionGraph + id: Soil + start: start + graph: + - node: start + actions: + - !type:DeleteEntity {} + edges: + - to: fungalSoil + completed: + - !type:SnapToGrid + southRotation: true + steps: + - material: WoodPlank + amount: 10 + doAfter: 10 + - tag: Mushroom + name: any Mushroom + icon: + sprite: Objects/Misc/spaceshroom.rsi + state: object + - node: fungalSoil + entity: FungalSoil diff --git a/Resources/Prototypes/Recipes/Construction/structures.yml b/Resources/Prototypes/Recipes/Construction/structures.yml index 2ea7641bd8..7f3e0b6212 100644 --- a/Resources/Prototypes/Recipes/Construction/structures.yml +++ b/Resources/Prototypes/Recipes/Construction/structures.yml @@ -1253,3 +1253,20 @@ canBuildInImpassable: false conditions: - !type:TileNotBlocked + +- type: construction + name: fungal soil + id: FungalSoil + graph: Soil + startNode: start + targetNode: fungalSoil + category: construction-category-structures + description: A mix of organic matter and fungal root creating a soil to grow your plant in space. Seems to be dry. + icon: + sprite: Structures/Hydroponics/misc.rsi + state: fungal_soil + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 04e3be9827..50220afe6b 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -964,6 +964,9 @@ - type: Tag id: Multitool +- type: Tag + id: Mushroom + - type: Tag id: NoBlockAnchoring diff --git a/Resources/Textures/Structures/Hydroponics/misc.rsi/fungal_soil.png b/Resources/Textures/Structures/Hydroponics/misc.rsi/fungal_soil.png new file mode 100644 index 0000000000..cf6bfc0e65 Binary files /dev/null and b/Resources/Textures/Structures/Hydroponics/misc.rsi/fungal_soil.png differ diff --git a/Resources/Textures/Structures/Hydroponics/misc.rsi/meta.json b/Resources/Textures/Structures/Hydroponics/misc.rsi/meta.json index 35b9d13cfa..f4f0e3fb49 100644 --- a/Resources/Textures/Structures/Hydroponics/misc.rsi/meta.json +++ b/Resources/Textures/Structures/Hydroponics/misc.rsi/meta.json @@ -7,6 +7,9 @@ "y": 32 }, "states": [ + { + "name": "fungal_soil" + }, { "name": "moldcreep0" },