diff --git a/Content.Server/Anomaly/Effects/TileAnomalySystem.cs b/Content.Server/Anomaly/Effects/TileAnomalySystem.cs index 16f32f6f4b..08ec3a1c93 100644 --- a/Content.Server/Anomaly/Effects/TileAnomalySystem.cs +++ b/Content.Server/Anomaly/Effects/TileAnomalySystem.cs @@ -1,13 +1,8 @@ -using System.Linq; using System.Numerics; -using Content.Server.Maps; using Content.Shared.Anomaly.Components; using Content.Shared.Anomaly.Effects.Components; using Content.Shared.Maps; -using Content.Shared.Physics; using Robust.Shared.Map; -using Robust.Shared.Physics; -using Robust.Shared.Physics.Components; using Robust.Shared.Random; namespace Content.Server.Anomaly.Effects; diff --git a/Content.Server/Spawners/Components/ConditionalSpawnerComponent.cs b/Content.Server/Spawners/Components/ConditionalSpawnerComponent.cs index 1910431eee..5b98989bb3 100644 --- a/Content.Server/Spawners/Components/ConditionalSpawnerComponent.cs +++ b/Content.Server/Spawners/Components/ConditionalSpawnerComponent.cs @@ -1,5 +1,4 @@ using Robust.Shared.Prototypes; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List; namespace Content.Server.Spawners.Components { @@ -8,15 +7,15 @@ namespace Content.Server.Spawners.Components public partial class ConditionalSpawnerComponent : Component { [ViewVariables(VVAccess.ReadWrite)] - [DataField("prototypes", customTypeSerializer: typeof(PrototypeIdListSerializer))] - public List Prototypes { get; set; } = new(); + [DataField] + public List Prototypes { get; set; } = new(); [ViewVariables(VVAccess.ReadWrite)] - [DataField("gameRules", customTypeSerializer: typeof(PrototypeIdListSerializer))] - public List GameRules = new(); + [DataField] + public List GameRules = new(); [ViewVariables(VVAccess.ReadWrite)] - [DataField("chance")] + [DataField] public float Chance { get; set; } = 1.0f; } } diff --git a/Content.Server/Spawners/Components/RandomSpawnerComponent.cs b/Content.Server/Spawners/Components/RandomSpawnerComponent.cs index ece17de974..9bf4d6d253 100644 --- a/Content.Server/Spawners/Components/RandomSpawnerComponent.cs +++ b/Content.Server/Spawners/Components/RandomSpawnerComponent.cs @@ -1,5 +1,4 @@ using Robust.Shared.Prototypes; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List; namespace Content.Server.Spawners.Components { @@ -7,15 +6,18 @@ namespace Content.Server.Spawners.Components public sealed partial class RandomSpawnerComponent : ConditionalSpawnerComponent { [ViewVariables(VVAccess.ReadWrite)] - [DataField("rarePrototypes", customTypeSerializer:typeof(PrototypeIdListSerializer))] - public List RarePrototypes { get; set; } = new(); + [DataField] + public List RarePrototypes { get; set; } = new(); [ViewVariables(VVAccess.ReadWrite)] - [DataField("rareChance")] + [DataField] public float RareChance { get; set; } = 0.05f; [ViewVariables(VVAccess.ReadWrite)] - [DataField("offset")] + [DataField] public float Offset { get; set; } = 0.2f; + + [DataField] + public bool DeleteSpawnerAfterSpawn = true; } } diff --git a/Content.Server/Spawners/EntitySystems/ConditionalSpawnerSystem.cs b/Content.Server/Spawners/EntitySystems/ConditionalSpawnerSystem.cs index 5248d512b8..6616746506 100644 --- a/Content.Server/Spawners/EntitySystems/ConditionalSpawnerSystem.cs +++ b/Content.Server/Spawners/EntitySystems/ConditionalSpawnerSystem.cs @@ -30,7 +30,8 @@ namespace Content.Server.Spawners.EntitySystems private void OnRandSpawnMapInit(EntityUid uid, RandomSpawnerComponent component, MapInitEvent args) { Spawn(uid, component); - QueueDel(uid); + if (component.DeleteSpawnerAfterSpawn) + QueueDel(uid); } private void OnRuleStarted(ref GameRuleStartedEvent args) diff --git a/Content.Server/Spreader/KudzuComponent.cs b/Content.Server/Spreader/KudzuComponent.cs index 36b1796b83..ed89a51a26 100644 --- a/Content.Server/Spreader/KudzuComponent.cs +++ b/Content.Server/Spreader/KudzuComponent.cs @@ -17,28 +17,33 @@ public sealed partial class KudzuComponent : Component /// /// Chance to spread whenever an edge spread is possible. /// - [DataField("spreadChance")] + [DataField] public float SpreadChance = 1f; /// /// How much damage is required to reduce growth level /// - [DataField("growthHealth")] + [DataField] public float GrowthHealth = 10.0f; /// /// How much damage is required to prevent growth /// - [DataField("growthBlock")] + [DataField] public float GrowthBlock = 20.0f; /// /// How much the kudzu heals each tick /// - [DataField("damageRecovery")] + [DataField] public DamageSpecifier? DamageRecovery = null; - [DataField("growthTickChance")] + [DataField] public float GrowthTickChance = 1f; + /// + /// number of sprite variations for kudzu + /// + [DataField] + public int SpriteVariants = 3; } diff --git a/Content.Server/Spreader/KudzuSystem.cs b/Content.Server/Spreader/KudzuSystem.cs index b59569b4e1..d15a2c667f 100644 --- a/Content.Server/Spreader/KudzuSystem.cs +++ b/Content.Server/Spreader/KudzuSystem.cs @@ -92,7 +92,7 @@ public sealed class KudzuSystem : EntitySystem return; } - _appearance.SetData(uid, KudzuVisuals.Variant, _robustRandom.Next(1, 3), appearance); + _appearance.SetData(uid, KudzuVisuals.Variant, _robustRandom.Next(1, component.SpriteVariants), appearance); _appearance.SetData(uid, KudzuVisuals.GrowthLevel, 1, appearance); } diff --git a/Content.Shared/Anomaly/Effects/Components/TileSpawnAnomaly.cs b/Content.Shared/Anomaly/Effects/Components/TileSpawnAnomaly.cs index 69209680bb..7e3125ba20 100644 --- a/Content.Shared/Anomaly/Effects/Components/TileSpawnAnomaly.cs +++ b/Content.Shared/Anomaly/Effects/Components/TileSpawnAnomaly.cs @@ -1,7 +1,5 @@ using Content.Shared.Maps; using Robust.Shared.Prototypes; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List; namespace Content.Shared.Anomaly.Effects.Components; @@ -11,7 +9,7 @@ public sealed partial class TileSpawnAnomalyComponent : Component /// /// The maximum radius of tiles scales with stability /// - [DataField("spawnRange"), ViewVariables(VVAccess.ReadWrite)] + [DataField, ViewVariables(VVAccess.ReadWrite)] public float SpawnRange = 5f; /// @@ -23,6 +21,6 @@ public sealed partial class TileSpawnAnomalyComponent : Component /// /// The tile that is spawned by the anomaly's effect /// - [DataField("floorTileId", customTypeSerializer: typeof(PrototypeIdSerializer)), ViewVariables(VVAccess.ReadWrite)] - public string FloorTileId = "FloorFlesh"; + [DataField, ViewVariables(VVAccess.ReadWrite)] + public ProtoId FloorTileId = "FloorFlesh"; } diff --git a/Resources/Prototypes/Entities/Effects/mobspawn.yml b/Resources/Prototypes/Entities/Effects/mobspawn.yml index c82adc7ba0..20a205feb0 100644 --- a/Resources/Prototypes/Entities/Effects/mobspawn.yml +++ b/Resources/Prototypes/Entities/Effects/mobspawn.yml @@ -57,4 +57,48 @@ sprite: /Textures/Effects/mobspawn.rsi state: crab_uranium - type: SpawnOnDespawn - prototype: MobUraniumCrab \ No newline at end of file + prototype: MobUraniumCrab + +- type: entity + id: EffectAnomalyFloraBulb + noSpawn: true + components: + - type: TimedDespawn + lifetime: 0.4 + - type: Sprite + drawdepth: Effects + noRot: true + layers: + - shader: unshaded + map: ["enum.EffectLayers.Unshaded"] + sprite: Effects/emp.rsi + state: emp_disable + - type: EffectVisuals + - type: Tag + tags: + - HideContextMenu + - type: AnimationPlayer + - type: RandomSpawner + deleteSpawnerAfterSpawn: false + rareChance: 0.2 + offset: 0.5 + chance: 1 + prototypes: + - FoodAmbrosiaVulgaris + - FoodAmbrosiaDeus + - FoodBlueTomato + - FoodAloe + - FoodCabbage + - FoodCarrot + - FoodGalaxythistle + - FoodGatfruit + - FoodLemon + - FoodLemoon + - FoodLime + - FoodPeaPod + - FoodPineapple + - FoodOnionRed + - FoodWatermelon + rarePrototypes: + - MobLuminousEntity + - MobLuminousObject \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml index 3b5d33ee06..6d2149965f 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml @@ -18,5 +18,6 @@ - AnomalyIce - AnomalyRock - AnomalyLiquid + - AnomalyFlora chance: 1 offset: 0.15 # not to put it higher. The anomaly sychnronizer looks for anomalies within this radius, and if the radius is higher, the anomaly can be attracted from a neighboring tile. diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/living_light.yml b/Resources/Prototypes/Entities/Mobs/NPCs/living_light.yml index 52a0a1c589..e7ed489cb0 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/living_light.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/living_light.yml @@ -33,7 +33,7 @@ - type: MobThresholds thresholds: 0: Alive - 100: Dead + 50: Dead - type: DamageStateVisuals states: Alive: @@ -70,15 +70,15 @@ types: Heat: -0.2 - type: NoSlip + - type: Pullable - type: ZombieImmune - type: NameIdentifier group: GenericNumber - type: GhostTakeoverAvailable - type: PointLight - color: "#e4de6c" - radius: 8 - softness: 2 - energy: 5 + radius: 3.0 + energy: 4.5 + color: "#6270bb" - type: FootstepModifier footstepSoundCollection: collection: FootstepBells @@ -105,7 +105,7 @@ - type: MeleeWeapon damage: types: - Heat: 16 + Heat: 10 animation: WeaponArcFist - type: StaminaDamageOnHit damage: 16 @@ -127,7 +127,7 @@ - type: MobThresholds thresholds: 0: Alive - 50: Dead + 30: Dead - type: DamageStateVisuals states: Alive: @@ -139,7 +139,7 @@ - type: MeleeWeapon damage: types: - Heat: 8 + Heat: 6 - type: Destructible thresholds: - trigger: @@ -167,7 +167,7 @@ - type: MobThresholds thresholds: 0: Alive - 60: Dead + 40: Dead - type: DamageStateVisuals states: Alive: @@ -181,7 +181,7 @@ types: Heat: 5 - type: HitscanBatteryAmmoProvider - proto: Pulse + proto: RedLaser fireCost: 140 - type: Battery maxCharge: 1000 diff --git a/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml b/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml index 5f3f8bb5cb..2c643bc57d 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml @@ -103,6 +103,59 @@ - type: Kudzu spreadChance: 0.3 +- type: entity + id: KudzuFlowerFriendly + name: floral carpet + suffix: Friendly, Floral Anomaly + description: A colorful carpet of flowers sprawling in every direction. You're not sure whether to take it down or leave it up. + parent: Kudzu + components: + - type: Sprite + drawdepth: FloorObjects + sprite: Objects/Misc/kudzuflower.rsi + state: kudzu_11 + - type: Kudzu + spriteVariants: 5 + spreadChance: 0.01 + - type: SlowContacts + walkSpeedModifier: 0.8 + sprintSpeedModifier: 0.8 + ignoreWhitelist: + components: + - IgnoreKudzu + - type: RandomSpawner + deleteSpawnerAfterSpawn: false + rareChance: 0.3 + offset: 0.2 + chance: 0.1 + prototypes: + - FloraTree01 + - FloraTree02 + - FloraTree03 + - FloraTree04 + - FloraTree05 + - FloraTree06 + - FloraTreeLarge01 + - FloraTreeLarge02 + - FloraTreeLarge03 + - CrystalCyan + rarePrototypes: + - AnomalyFloraBulb + +- type: entity + id: KudzuFlowerAngry + suffix: Angry, Floral Anomaly + parent: KudzuFlowerFriendly + components: + - type: Kudzu + spreadChance: 0.4 + - type: RandomSpawner + chance: 0.2 + rarePrototypes: + - AnomalyFloraBulb + - MobLuminousEntity + - MobLuminousObject + - type: entity id: FleshKudzu name: tendons diff --git a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml index fdda7ea0a4..dabfd81034 100644 --- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml +++ b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml @@ -208,7 +208,6 @@ types: Radiation: 10 - - type: entity id: AnomalyIce parent: BaseAnomaly @@ -290,6 +289,86 @@ - WallSpawnAsteroid - SpawnMobOreCrab +- type: entity + id: AnomalyFlora + parent: BaseAnomaly + suffix: Flora + components: + - type: Sprite + drawdepth: Mobs + sprite: Structures/Specific/Anomalies/flora_anom.rsi + layers: + - state: anom + map: ["enum.AnomalyVisualLayers.Base"] + - state: pulse + map: ["enum.AnomalyVisualLayers.Animated"] + visible: false + - type: PointLight + radius: 8.0 + energy: 8.5 + color: "#6270bb" + - type: Anomaly + animationTime: 6 + offset: 0.05, 0 + corePrototype: AnomalyCoreFlora + coreInertPrototype: AnomalyCoreFloraInert + anomalyContactDamage: + types: + Slash: 0 + - type: TileSpawnAnomaly + floorTileId: FloorAstroGrass + spawnRange: 10 + - type: EntitySpawnAnomaly + maxSpawnAmount: 30 + spawnRange: 10 + superCriticalSpawns: + - KudzuFlowerAngry + spawns: + - KudzuFlowerFriendly + +- type: entity + id: AnomalyFloraBulb + name: strange glowing berry + parent: BaseStructure + description: It's a beautiful strange glowing berry. It seems to have something growing inside it... + suffix: Flora Anomaly + components: + - type: Transform + anchored: true + - type: Physics + bodyType: Static + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeCircle + radius: 0.2 + - type: InteractionOutline + - type: Damageable + damageContainer: Biological + damageModifierSet: Diona + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 1 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:SpawnEntitiesBehavior + spawn: + EffectAnomalyFloraBulb: + min: 1 + max: 1 + - type: PointLight + radius: 2.0 + energy: 4.5 + color: "#6270bb" + - type: Sprite + noRot: true + sprite: Structures/Specific/Anomalies/flora_anom.rsi + state: bulb + - type: entity id: AnomalyLiquid parent: BaseAnomaly diff --git a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml index 6679b2d533..928516f21b 100644 --- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml +++ b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml @@ -135,6 +135,19 @@ castShadows: false - type: Electrified +- type: entity + parent: BaseAnomalyCore + id: AnomalyCoreFlora + suffix: Flora + components: + - type: Sprite + sprite: Structures/Specific/Anomalies/Cores/flora_core.rsi + - type: PointLight + radius: 1.5 + energy: 2.0 + color: "#6270bb" + castShadows: false + # Inert cores - type: entity @@ -255,3 +268,16 @@ energy: 2.0 color: "#ffffaa" castShadows: false + +- type: entity + parent: BaseAnomalyInertCore + id: AnomalyCoreFloraInert + suffix: Flora, Inert + components: + - type: Sprite + sprite: Structures/Specific/Anomalies/Cores/flora_core.rsi + - type: PointLight + radius: 1.5 + energy: 2.0 + color: "#6270bb" + castShadows: false diff --git a/Resources/Textures/Objects/Misc/kudzuflower.rsi/kudzu_11.png b/Resources/Textures/Objects/Misc/kudzuflower.rsi/kudzu_11.png new file mode 100644 index 0000000000..10b9c0e59a Binary files /dev/null and b/Resources/Textures/Objects/Misc/kudzuflower.rsi/kudzu_11.png differ diff --git a/Resources/Textures/Objects/Misc/kudzuflower.rsi/kudzu_12.png b/Resources/Textures/Objects/Misc/kudzuflower.rsi/kudzu_12.png new file mode 100644 index 0000000000..ded8782850 Binary files /dev/null and b/Resources/Textures/Objects/Misc/kudzuflower.rsi/kudzu_12.png differ diff --git a/Resources/Textures/Objects/Misc/kudzuflower.rsi/kudzu_13.png b/Resources/Textures/Objects/Misc/kudzuflower.rsi/kudzu_13.png new file mode 100644 index 0000000000..9c73d8487a Binary files /dev/null and b/Resources/Textures/Objects/Misc/kudzuflower.rsi/kudzu_13.png differ diff --git a/Resources/Textures/Objects/Misc/kudzuflower.rsi/kudzu_14.png b/Resources/Textures/Objects/Misc/kudzuflower.rsi/kudzu_14.png new file mode 100644 index 0000000000..68446ce656 Binary files /dev/null and b/Resources/Textures/Objects/Misc/kudzuflower.rsi/kudzu_14.png differ diff --git a/Resources/Textures/Objects/Misc/kudzuflower.rsi/kudzu_15.png b/Resources/Textures/Objects/Misc/kudzuflower.rsi/kudzu_15.png new file mode 100644 index 0000000000..ded8782850 Binary files /dev/null and b/Resources/Textures/Objects/Misc/kudzuflower.rsi/kudzu_15.png differ diff --git a/Resources/Textures/Objects/Misc/kudzuflower.rsi/kudzu_21.png b/Resources/Textures/Objects/Misc/kudzuflower.rsi/kudzu_21.png new file mode 100644 index 0000000000..d89c1ab913 Binary files /dev/null and b/Resources/Textures/Objects/Misc/kudzuflower.rsi/kudzu_21.png differ diff --git a/Resources/Textures/Objects/Misc/kudzuflower.rsi/kudzu_22.png b/Resources/Textures/Objects/Misc/kudzuflower.rsi/kudzu_22.png new file mode 100644 index 0000000000..dc862b11eb Binary files /dev/null and b/Resources/Textures/Objects/Misc/kudzuflower.rsi/kudzu_22.png differ diff --git a/Resources/Textures/Objects/Misc/kudzuflower.rsi/kudzu_23.png b/Resources/Textures/Objects/Misc/kudzuflower.rsi/kudzu_23.png new file mode 100644 index 0000000000..387f61e345 Binary files /dev/null and b/Resources/Textures/Objects/Misc/kudzuflower.rsi/kudzu_23.png differ diff --git a/Resources/Textures/Objects/Misc/kudzuflower.rsi/kudzu_24.png b/Resources/Textures/Objects/Misc/kudzuflower.rsi/kudzu_24.png new file mode 100644 index 0000000000..6909b3c157 Binary files /dev/null and b/Resources/Textures/Objects/Misc/kudzuflower.rsi/kudzu_24.png differ diff --git a/Resources/Textures/Objects/Misc/kudzuflower.rsi/kudzu_25.png b/Resources/Textures/Objects/Misc/kudzuflower.rsi/kudzu_25.png new file mode 100644 index 0000000000..2598af3d4f Binary files /dev/null and b/Resources/Textures/Objects/Misc/kudzuflower.rsi/kudzu_25.png differ diff --git a/Resources/Textures/Objects/Misc/kudzuflower.rsi/kudzu_31.png b/Resources/Textures/Objects/Misc/kudzuflower.rsi/kudzu_31.png new file mode 100644 index 0000000000..59beb95b95 Binary files /dev/null and b/Resources/Textures/Objects/Misc/kudzuflower.rsi/kudzu_31.png differ diff --git a/Resources/Textures/Objects/Misc/kudzuflower.rsi/kudzu_32.png b/Resources/Textures/Objects/Misc/kudzuflower.rsi/kudzu_32.png new file mode 100644 index 0000000000..6640797aad Binary files /dev/null and b/Resources/Textures/Objects/Misc/kudzuflower.rsi/kudzu_32.png differ diff --git a/Resources/Textures/Objects/Misc/kudzuflower.rsi/kudzu_33.png b/Resources/Textures/Objects/Misc/kudzuflower.rsi/kudzu_33.png new file mode 100644 index 0000000000..e44eb74978 Binary files /dev/null and b/Resources/Textures/Objects/Misc/kudzuflower.rsi/kudzu_33.png differ diff --git a/Resources/Textures/Objects/Misc/kudzuflower.rsi/kudzu_34.png b/Resources/Textures/Objects/Misc/kudzuflower.rsi/kudzu_34.png new file mode 100644 index 0000000000..cc226a2721 Binary files /dev/null and b/Resources/Textures/Objects/Misc/kudzuflower.rsi/kudzu_34.png differ diff --git a/Resources/Textures/Objects/Misc/kudzuflower.rsi/kudzu_35.png b/Resources/Textures/Objects/Misc/kudzuflower.rsi/kudzu_35.png new file mode 100644 index 0000000000..379ae4c176 Binary files /dev/null and b/Resources/Textures/Objects/Misc/kudzuflower.rsi/kudzu_35.png differ diff --git a/Resources/Textures/Objects/Misc/kudzuflower.rsi/meta.json b/Resources/Textures/Objects/Misc/kudzuflower.rsi/meta.json new file mode 100644 index 0000000000..b37660be1c --- /dev/null +++ b/Resources/Textures/Objects/Misc/kudzuflower.rsi/meta.json @@ -0,0 +1,56 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation/commit/15bf91049e33979a855995579b48592e34bcdd8c, edited by TheShuEd", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "kudzu_35" + }, + { + "name": "kudzu_34" + }, + { + "name": "kudzu_33" + }, + { + "name": "kudzu_32" + }, + { + "name": "kudzu_31" + }, + { + "name": "kudzu_25" + }, + { + "name": "kudzu_24" + }, + { + "name": "kudzu_23" + }, + { + "name": "kudzu_22" + }, + { + "name": "kudzu_21" + }, + { + "name": "kudzu_15" + }, + { + "name": "kudzu_14" + }, + { + "name": "kudzu_13" + }, + { + "name": "kudzu_12" + }, + { + "name": "kudzu_11" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Structures/Specific/Anomalies/Cores/flora_core.rsi/core.png b/Resources/Textures/Structures/Specific/Anomalies/Cores/flora_core.rsi/core.png new file mode 100644 index 0000000000..eddf23c988 Binary files /dev/null and b/Resources/Textures/Structures/Specific/Anomalies/Cores/flora_core.rsi/core.png differ diff --git a/Resources/Textures/Structures/Specific/Anomalies/Cores/flora_core.rsi/meta.json b/Resources/Textures/Structures/Specific/Anomalies/Cores/flora_core.rsi/meta.json new file mode 100644 index 0000000000..94ffa2be6e --- /dev/null +++ b/Resources/Textures/Structures/Specific/Anomalies/Cores/flora_core.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Created by TheShuEd (github) for ss14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "core" + }, + { + "name": "pulse", + "delays": [ + [ + 0.15625, + 0.15625, + 0.15625, + 0.15625 + ] + ] + } + ] +} diff --git a/Resources/Textures/Structures/Specific/Anomalies/Cores/flora_core.rsi/pulse.png b/Resources/Textures/Structures/Specific/Anomalies/Cores/flora_core.rsi/pulse.png new file mode 100644 index 0000000000..5bfd227196 Binary files /dev/null and b/Resources/Textures/Structures/Specific/Anomalies/Cores/flora_core.rsi/pulse.png differ diff --git a/Resources/Textures/Structures/Specific/Anomalies/flora_anom.rsi/anom.png b/Resources/Textures/Structures/Specific/Anomalies/flora_anom.rsi/anom.png new file mode 100644 index 0000000000..c71c52652d Binary files /dev/null and b/Resources/Textures/Structures/Specific/Anomalies/flora_anom.rsi/anom.png differ diff --git a/Resources/Textures/Structures/Specific/Anomalies/flora_anom.rsi/bulb.png b/Resources/Textures/Structures/Specific/Anomalies/flora_anom.rsi/bulb.png new file mode 100644 index 0000000000..d069082043 Binary files /dev/null and b/Resources/Textures/Structures/Specific/Anomalies/flora_anom.rsi/bulb.png differ diff --git a/Resources/Textures/Structures/Specific/Anomalies/flora_anom.rsi/meta.json b/Resources/Textures/Structures/Specific/Anomalies/flora_anom.rsi/meta.json new file mode 100644 index 0000000000..31c0fc14e0 --- /dev/null +++ b/Resources/Textures/Structures/Specific/Anomalies/flora_anom.rsi/meta.json @@ -0,0 +1,44 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Created by TheShuEd (github) for ss14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "anom", + "delays": [ + [ + 0.38625, + 0.38625, + 0.38625, + 0.38625 + ] + ] + }, + { + "name": "pulse", + "delays": [ + [ + 0.25625, + 0.25625, + 0.25625, + 0.25625 + ] + ] + }, + { + "name": "bulb", + "delays": [ + [ + 0.25625, + 0.25625, + 0.25625, + 0.25625 + ] + ] + } + ] +} diff --git a/Resources/Textures/Structures/Specific/Anomalies/flora_anom.rsi/pulse.png b/Resources/Textures/Structures/Specific/Anomalies/flora_anom.rsi/pulse.png new file mode 100644 index 0000000000..06580ddfe3 Binary files /dev/null and b/Resources/Textures/Structures/Specific/Anomalies/flora_anom.rsi/pulse.png differ