diff --git a/Resources/Prototypes/Entities/Tiles/lava.yml b/Resources/Prototypes/Entities/Tiles/lava.yml index b1d94c7a9c..a523e5240f 100644 --- a/Resources/Prototypes/Entities/Tiles/lava.yml +++ b/Resources/Prototypes/Entities/Tiles/lava.yml @@ -1,6 +1,7 @@ - type: entity id: FloorLavaEntity - name: lava floor + name: lava + description: Don't jump in. It's not worth it, no matter how funny it is. placement: mode: SnapgridCenter snap: diff --git a/Resources/Prototypes/Entities/Tiles/liquid_plasma.yml b/Resources/Prototypes/Entities/Tiles/liquid_plasma.yml new file mode 100644 index 0000000000..584f6dbc2a --- /dev/null +++ b/Resources/Prototypes/Entities/Tiles/liquid_plasma.yml @@ -0,0 +1,49 @@ +- type: entity + id: FloorLiquidPlasmaEntity + name: liquid plasma + description: Sweet, expensive nectar. Don't consume. + placement: + mode: SnapgridCenter + snap: + - Wall + components: + - type: StepTrigger + requiredTriggeredSpeed: 0 + intersectRatio: 0.1 + blacklist: + tags: + - Catwalk + - type: Lava + - type: Transform + anchored: true + - type: SyncSprite + - type: Clickable + - type: Sprite + sprite: Tiles/Planet/liquid_plasma.rsi + drawdepth: BelowFloor + layers: + - state: plasma + shader: unshaded + - type: Icon + sprite: Tiles/Planet/liquid_plasma.rsi + state: full + - type: IconSmooth + key: floor + base: plasma + - type: Physics + bodyType: Static + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.5,-0.5,0.5,0.5" + layer: + - SlipLayer + mask: + - ItemMask + density: 1000 + hard: false + - type: Tag + tags: + - HideContextMenu diff --git a/Resources/Prototypes/Entities/Tiles/water.yml b/Resources/Prototypes/Entities/Tiles/water.yml index 59e03da991..bb93e1a43d 100644 --- a/Resources/Prototypes/Entities/Tiles/water.yml +++ b/Resources/Prototypes/Entities/Tiles/water.yml @@ -1,6 +1,7 @@ - type: entity id: FloorWaterEntity name: water + description: A real thirst quencher. placement: mode: SnapgridCenter snap: diff --git a/Resources/Prototypes/Procedural/biome_templates.yml b/Resources/Prototypes/Procedural/biome_templates.yml index 1dd0a0aaa4..0a2b98cee2 100644 --- a/Resources/Prototypes/Procedural/biome_templates.yml +++ b/Resources/Prototypes/Procedural/biome_templates.yml @@ -439,6 +439,20 @@ seed: 0 frequency: 0.02 fractalType: None + # Liquid plasma rivers. Ice moon baby + - !type:BiomeEntityLayer + allowedTiles: + - FloorSnow + threshold: 0.95 + noise: + seed: 3 + noiseType: OpenSimplex2 + frequency: 0.003 + lacunarity: 1.50 + fractalType: Ridged + octaves: 1 + entities: + - FloorLiquidPlasmaEntity # Caves - type: biomeTemplate diff --git a/Resources/Textures/Tiles/Planet/liquid_plasma.rsi/full.png b/Resources/Textures/Tiles/Planet/liquid_plasma.rsi/full.png new file mode 100644 index 0000000000..7d6d7e0db3 Binary files /dev/null and b/Resources/Textures/Tiles/Planet/liquid_plasma.rsi/full.png differ diff --git a/Resources/Textures/Tiles/Planet/liquid_plasma.rsi/meta.json b/Resources/Textures/Tiles/Planet/liquid_plasma.rsi/meta.json new file mode 100644 index 0000000000..d16c7ccf14 --- /dev/null +++ b/Resources/Textures/Tiles/Planet/liquid_plasma.rsi/meta.json @@ -0,0 +1,265 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/tree/f116442e34fe3e941a1df474bb57bb410dd177a3/icons/turf lava sprites, hueshifted and modified by mirrorcult", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "full" + }, + { + "name": "plasma0", + "directions": 4, + "delays": [ + [ + 2, + 2, + 2, + 2 + ], + [ + 2, + 2, + 2, + 2 + ], + [ + 2, + 2, + 2, + 2 + ], + [ + 2, + 2, + 2, + 2 + ] + ] + }, + { + "name": "plasma1", + "directions": 4, + "delays": [ + [ + 2, + 2, + 2, + 2 + ], + [ + 2, + 2, + 2, + 2 + ], + [ + 2, + 2, + 2, + 2 + ], + [ + 2, + 2, + 2, + 2 + ] + ] + }, + { + "name": "plasma2", + "directions": 4, + "delays": [ + [ + 2, + 2, + 2, + 2 + ], + [ + 2, + 2, + 2, + 2 + ], + [ + 2, + 2, + 2, + 2 + ], + [ + 2, + 2, + 2, + 2 + ] + ] + }, + { + "name": "plasma3", + "directions": 4, + "delays": [ + [ + 2, + 2, + 2, + 2 + ], + [ + 2, + 2, + 2, + 2 + ], + [ + 2, + 2, + 2, + 2 + ], + [ + 2, + 2, + 2, + 2 + ] + ] + }, + { + "name": "plasma4", + "directions": 4, + "delays": [ + [ + 2, + 2, + 2, + 2 + ], + [ + 2, + 2, + 2, + 2 + ], + [ + 2, + 2, + 2, + 2 + ], + [ + 2, + 2, + 2, + 2 + ] + ] + }, + { + "name": "plasma5", + "directions": 4, + "delays": [ + [ + 2, + 2, + 2, + 2 + ], + [ + 2, + 2, + 2, + 2 + ], + [ + 2, + 2, + 2, + 2 + ], + [ + 2, + 2, + 2, + 2 + ] + ] + }, + { + "name": "plasma6", + "directions": 4, + "delays": [ + [ + 2, + 2, + 2, + 2 + ], + [ + 2, + 2, + 2, + 2 + ], + [ + 2, + 2, + 2, + 2 + ], + [ + 2, + 2, + 2, + 2 + ] + ] + }, + { + "name": "plasma7", + "directions": 4, + "delays": [ + [ + 2, + 2, + 2, + 2 + ], + [ + 2, + 2, + 2, + 2 + ], + [ + 2, + 2, + 2, + 2 + ], + [ + 2, + 2, + 2, + 2 + ] + ] + }, + { + "name": "plasma", + "delays": [ + [ + 2, + 2, + 2, + 2 + ] + ] + } + ] +} diff --git a/Resources/Textures/Tiles/Planet/liquid_plasma.rsi/plasma.png b/Resources/Textures/Tiles/Planet/liquid_plasma.rsi/plasma.png new file mode 100644 index 0000000000..8666be9446 Binary files /dev/null and b/Resources/Textures/Tiles/Planet/liquid_plasma.rsi/plasma.png differ diff --git a/Resources/Textures/Tiles/Planet/liquid_plasma.rsi/plasma0.png b/Resources/Textures/Tiles/Planet/liquid_plasma.rsi/plasma0.png new file mode 100644 index 0000000000..5cac8e39e1 Binary files /dev/null and b/Resources/Textures/Tiles/Planet/liquid_plasma.rsi/plasma0.png differ diff --git a/Resources/Textures/Tiles/Planet/liquid_plasma.rsi/plasma1.png b/Resources/Textures/Tiles/Planet/liquid_plasma.rsi/plasma1.png new file mode 100644 index 0000000000..678d4acfd8 Binary files /dev/null and b/Resources/Textures/Tiles/Planet/liquid_plasma.rsi/plasma1.png differ diff --git a/Resources/Textures/Tiles/Planet/liquid_plasma.rsi/plasma2.png b/Resources/Textures/Tiles/Planet/liquid_plasma.rsi/plasma2.png new file mode 100644 index 0000000000..2e8390f50b Binary files /dev/null and b/Resources/Textures/Tiles/Planet/liquid_plasma.rsi/plasma2.png differ diff --git a/Resources/Textures/Tiles/Planet/liquid_plasma.rsi/plasma3.png b/Resources/Textures/Tiles/Planet/liquid_plasma.rsi/plasma3.png new file mode 100644 index 0000000000..1daf974b83 Binary files /dev/null and b/Resources/Textures/Tiles/Planet/liquid_plasma.rsi/plasma3.png differ diff --git a/Resources/Textures/Tiles/Planet/liquid_plasma.rsi/plasma4.png b/Resources/Textures/Tiles/Planet/liquid_plasma.rsi/plasma4.png new file mode 100644 index 0000000000..babc79a3e8 Binary files /dev/null and b/Resources/Textures/Tiles/Planet/liquid_plasma.rsi/plasma4.png differ diff --git a/Resources/Textures/Tiles/Planet/liquid_plasma.rsi/plasma5.png b/Resources/Textures/Tiles/Planet/liquid_plasma.rsi/plasma5.png new file mode 100644 index 0000000000..4603fab8f1 Binary files /dev/null and b/Resources/Textures/Tiles/Planet/liquid_plasma.rsi/plasma5.png differ diff --git a/Resources/Textures/Tiles/Planet/liquid_plasma.rsi/plasma6.png b/Resources/Textures/Tiles/Planet/liquid_plasma.rsi/plasma6.png new file mode 100644 index 0000000000..55bab4b181 Binary files /dev/null and b/Resources/Textures/Tiles/Planet/liquid_plasma.rsi/plasma6.png differ diff --git a/Resources/Textures/Tiles/Planet/liquid_plasma.rsi/plasma7.png b/Resources/Textures/Tiles/Planet/liquid_plasma.rsi/plasma7.png new file mode 100644 index 0000000000..a090bed1d1 Binary files /dev/null and b/Resources/Textures/Tiles/Planet/liquid_plasma.rsi/plasma7.png differ