diff --git a/Content.Client/Mining/AsteroidRockVisualizer.cs b/Content.Client/Mining/AsteroidRockVisualizer.cs deleted file mode 100644 index 64bdb5f7b9..0000000000 --- a/Content.Client/Mining/AsteroidRockVisualizer.cs +++ /dev/null @@ -1,39 +0,0 @@ -using Content.Shared.Mining; -using JetBrains.Annotations; -using Robust.Client.GameObjects; -using Robust.Shared.GameObjects; -using Robust.Shared.IoC; -using Robust.Shared.Serialization.Manager.Attributes; - -namespace Content.Client.Mining -{ - [UsedImplicitly] - public sealed class AsteroidRockVisualizer : AppearanceVisualizer - { - [DataField("layer")] - private int Layer { get; } = 0; - - public override void InitializeEntity(EntityUid entity) - { - base.InitializeEntity(entity); - - IoCManager.Resolve().GetComponentOrNull(entity)?.LayerMapReserveBlank(Layer); - } - - public override void OnChangeData(AppearanceComponent component) - { - base.OnChangeData(component); - - if (!IoCManager.Resolve().TryGetComponent(component.Owner, out SpriteComponent? sprite)) - { - return; - } - - if (component.TryGetData(AsteroidRockVisuals.State, out string state)) - { - sprite.LayerMapReserveBlank(Layer); - sprite.LayerSetState(0, state); - } - } - } -} diff --git a/Content.Shared/Mining/AsteroidRockVisuals.cs b/Content.Shared/Mining/AsteroidRockVisuals.cs deleted file mode 100644 index d5dc741911..0000000000 --- a/Content.Shared/Mining/AsteroidRockVisuals.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; -using Robust.Shared.Serialization; - -namespace Content.Shared.Mining -{ - [Serializable, NetSerializable] - public enum AsteroidRockVisuals - { - State - } -} diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 1f36518e10..ee6dd68e20 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -76,9 +76,6 @@ - type: MovementSpeedModifier baseWalkSpeed : 7 baseSprintSpeed : 7 - - type: RandomAppearance - # relic - key: enum.AsteroidRockVisuals.State - type: Sprite drawdepth: Mobs layers: @@ -414,7 +411,6 @@ normal: crab crit: dead dead: dead - - type: AsteroidRockVisualizer - type: Butcherable spawned: - id: FoodMeatCrab diff --git a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml index f72d7756a5..6600db1d8a 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml @@ -4,8 +4,6 @@ name: asteroid rock description: An asteroid. components: - - type: RandomAppearance - key: enum.AsteroidRockVisuals.State - type: Mineable ores: - id: SteelOre1 @@ -28,7 +26,7 @@ orGroup: Asteroid - type: Sprite sprite: Structures/Walls/asteroid_rock.rsi - state: 0 + state: full - type: Damageable damageContainer: Inorganic - type: Destructible @@ -43,9 +41,6 @@ sizeX: 32 sizeY: 32 - type: Airtight - - type: Appearance - visuals: - - type: AsteroidRockVisualizer - type: Fixtures fixtures: - shape: @@ -59,3 +54,6 @@ - Impassable - VaultImpassable - SmallImpassable + - type: IconSmooth + key: rock + base: rock_ diff --git a/Resources/Textures/Structures/Walls/asteroid_rock.rsi/0.png b/Resources/Textures/Structures/Walls/asteroid_rock.rsi/0.png deleted file mode 100644 index b46e5f2f6f..0000000000 Binary files a/Resources/Textures/Structures/Walls/asteroid_rock.rsi/0.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/asteroid_rock.rsi/1.png b/Resources/Textures/Structures/Walls/asteroid_rock.rsi/1.png deleted file mode 100644 index 26d84da342..0000000000 Binary files a/Resources/Textures/Structures/Walls/asteroid_rock.rsi/1.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/asteroid_rock.rsi/2.png b/Resources/Textures/Structures/Walls/asteroid_rock.rsi/2.png deleted file mode 100644 index db394bac61..0000000000 Binary files a/Resources/Textures/Structures/Walls/asteroid_rock.rsi/2.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/asteroid_rock.rsi/3.png b/Resources/Textures/Structures/Walls/asteroid_rock.rsi/3.png deleted file mode 100644 index 575f5eceed..0000000000 Binary files a/Resources/Textures/Structures/Walls/asteroid_rock.rsi/3.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/asteroid_rock.rsi/4.png b/Resources/Textures/Structures/Walls/asteroid_rock.rsi/4.png deleted file mode 100644 index 530719f4d1..0000000000 Binary files a/Resources/Textures/Structures/Walls/asteroid_rock.rsi/4.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/asteroid_rock.rsi/full.png b/Resources/Textures/Structures/Walls/asteroid_rock.rsi/full.png new file mode 100644 index 0000000000..26034ae376 Binary files /dev/null and b/Resources/Textures/Structures/Walls/asteroid_rock.rsi/full.png differ diff --git a/Resources/Textures/Structures/Walls/asteroid_rock.rsi/meta.json b/Resources/Textures/Structures/Walls/asteroid_rock.rsi/meta.json index 30a91f76dc..c9407ed74f 100644 --- a/Resources/Textures/Structures/Walls/asteroid_rock.rsi/meta.json +++ b/Resources/Textures/Structures/Walls/asteroid_rock.rsi/meta.json @@ -1 +1 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "0", "delays": [[1.0]]}, {"name": "1", "delays": [[1.0]]}, {"name": "2", "delays": [[1.0]]}, {"name": "3", "delays": [[1.0]]}, {"name": "4", "delays": [[1.0]]}]} \ No newline at end of file +{"version": 1, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/commit/a0c067f688288aeb167157203e2170b14cfa9d7f", "size": {"x": 32, "y": 32}, "states": [{"name": "rock_0", "directions": 4}, {"name": "rock_1", "directions": 4}, {"name": "rock_2", "directions": 4}, {"name": "rock_3", "directions": 4}, {"name": "rock_4", "directions": 4}, {"name": "rock_5", "directions": 4}, {"name": "rock_6", "directions": 4}, {"name": "rock_7", "directions": 4}, {"name": "full"}]} \ No newline at end of file diff --git a/Resources/Textures/Structures/Walls/asteroid_rock.rsi/rock_0.png b/Resources/Textures/Structures/Walls/asteroid_rock.rsi/rock_0.png new file mode 100644 index 0000000000..ba1045c22b Binary files /dev/null and b/Resources/Textures/Structures/Walls/asteroid_rock.rsi/rock_0.png differ diff --git a/Resources/Textures/Structures/Walls/asteroid_rock.rsi/rock_1.png b/Resources/Textures/Structures/Walls/asteroid_rock.rsi/rock_1.png new file mode 100644 index 0000000000..2a2baa735d Binary files /dev/null and b/Resources/Textures/Structures/Walls/asteroid_rock.rsi/rock_1.png differ diff --git a/Resources/Textures/Structures/Walls/asteroid_rock.rsi/rock_2.png b/Resources/Textures/Structures/Walls/asteroid_rock.rsi/rock_2.png new file mode 100644 index 0000000000..ba1045c22b Binary files /dev/null and b/Resources/Textures/Structures/Walls/asteroid_rock.rsi/rock_2.png differ diff --git a/Resources/Textures/Structures/Walls/asteroid_rock.rsi/rock_3.png b/Resources/Textures/Structures/Walls/asteroid_rock.rsi/rock_3.png new file mode 100644 index 0000000000..2a2baa735d Binary files /dev/null and b/Resources/Textures/Structures/Walls/asteroid_rock.rsi/rock_3.png differ diff --git a/Resources/Textures/Structures/Walls/asteroid_rock.rsi/rock_4.png b/Resources/Textures/Structures/Walls/asteroid_rock.rsi/rock_4.png new file mode 100644 index 0000000000..1d5d4320fa Binary files /dev/null and b/Resources/Textures/Structures/Walls/asteroid_rock.rsi/rock_4.png differ diff --git a/Resources/Textures/Structures/Walls/asteroid_rock.rsi/rock_5.png b/Resources/Textures/Structures/Walls/asteroid_rock.rsi/rock_5.png new file mode 100644 index 0000000000..6524c4facf Binary files /dev/null and b/Resources/Textures/Structures/Walls/asteroid_rock.rsi/rock_5.png differ diff --git a/Resources/Textures/Structures/Walls/asteroid_rock.rsi/rock_6.png b/Resources/Textures/Structures/Walls/asteroid_rock.rsi/rock_6.png new file mode 100644 index 0000000000..1d5d4320fa Binary files /dev/null and b/Resources/Textures/Structures/Walls/asteroid_rock.rsi/rock_6.png differ diff --git a/Resources/Textures/Structures/Walls/asteroid_rock.rsi/rock_7.png b/Resources/Textures/Structures/Walls/asteroid_rock.rsi/rock_7.png new file mode 100644 index 0000000000..753c8293f2 Binary files /dev/null and b/Resources/Textures/Structures/Walls/asteroid_rock.rsi/rock_7.png differ