Flora: rock fix (#7333)

This commit is contained in:
Delete69 2022-04-05 01:22:18 -06:00 committed by GitHub
parent 7f2ceeb8e2
commit 722a408c41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 67 additions and 30 deletions

View File

@ -712,27 +712,6 @@
sprite: Decals/Flora/flora_rocks.rsi
state: rock07
- type: decal
id: Rock08
tags: ["flora"]
sprite:
sprite: Decals/Flora/flora_rocks.rsi
state: rock08
- type: decal
id: Rock09
tags: ["flora"]
sprite:
sprite: Decals/Flora/flora_rocks.rsi
state: rock09
- type: decal
id: Rock10
tags: ["flora"]
sprite:
sprite: Decals/Flora/flora_rocks.rsi
state: rock10
- type: decal
id: Flowersbr1
tags: ["flora"]

View File

@ -1,5 +1,28 @@
- type: entity
id: BaseRock
description: Heavy as a really heavy thing.
abstract: true
components:
- type: Clickable
- type: Sprite
sprite: Objects/Decoration/Flora/flora_rockssolid.rsi
netsync: false
- type: Physics
bodyType: Static
- type: Fixtures
fixtures:
- shape:
!type:PhysShapeCircle
radius: 0.4
mass: 500
layer:
- Opaque
- VaultImpassable
- type: Climbable
- type: entity
id: BaseTree
description: Yep, it's a tree.
abstract: true
components:
- type: Clickable
@ -70,6 +93,30 @@
- Opaque
- Impassable
- type: entity
parent: BaseRock
id: FloraRockSolid01
name: rock
components:
- type: Sprite
state: rocksolid01
- type: entity
parent: BaseRock
id: FloraRockSolid02
name: rock
components:
- type: Sprite
state: rocksolid02
- type: entity
parent: BaseRock
id: FloraRockSolid03
name: rock
components:
- type: Sprite
state: rocksolid03
- type: entity
parent: BaseTree
id: FloraTree01

View File

@ -27,15 +27,6 @@
},
{
"name": "rock07"
},
{
"name": "rock08"
},
{
"name": "rock09"
},
{
"name": "rock10"
}
]
}

View File

@ -0,0 +1,20 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/74bda160b97739cb9159dd19fe0800a5526735c0",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "rocksolid01"
},
{
"name": "rocksolid02"
},
{
"name": "rocksolid03"
}
]
}