From 6df41b2fa7d4add4e05f934d5df9294116cb52ef Mon Sep 17 00:00:00 2001 From: Swept Date: Sun, 28 Feb 2021 19:57:44 +0000 Subject: [PATCH] Adds material and singularity cargo crates (#3445) * Adds various crates * Removes redundant code from EmitterComponent.cs * (fixed) emitter * Hopefully good * Update meta.json --- .../Singularity/EmitterVisualizer.cs | 6 +- .../Singularity/EmitterComponent.cs | 17 --- .../Singularity/SingularityComponent.cs | 2 +- Resources/Maps/saltern.yml | 4 +- .../Catalog/Cargo/cargo_engines.yml | 53 ++++++- .../Prototypes/Catalog/Cargo/cargo_fun.yml | 4 +- .../Catalog/Cargo/cargo_materials.yml | 35 +++++ .../Catalog/Fills/Storage/Crates/engines.yml | 57 +++++++ .../Fills/Storage/Crates/materials.yml | 40 ++--- .../Constructible/Power/cargo_console.yml | 13 +- .../Engines/Singularity/collector.yml | 41 +++++ .../Engines/Singularity/containment.yml | 65 ++++++++ .../Specific/Engines/Singularity/emitter.yml | 42 +++--- .../Engines/Singularity/generator.yml | 29 ++++ .../Engines/Singularity/singularity.yml | 26 ++++ Resources/Prototypes/Entities/singularity.yml | 140 ------------------ .../collector.rsi}/ca_active.png | Bin .../collector.rsi}/ca_deactive.png | Bin .../collector.rsi}/ca_off.png | Bin .../collector.rsi}/ca_on.png | Bin .../collector.rsi}/cu.png | Bin .../Power/Singularity/collector.rsi/meta.json | 44 ++++++ .../containment.rsi/a1.png} | Bin .../containment.rsi/a2.png} | Bin .../containment.rsi/a3.png} | Bin .../containment.rsi/icon.png} | Bin .../Singularity/containment.rsi/meta.json | 44 ++++++ .../containment.rsi/on.png} | Bin .../containment.rsi/p1.png} | Bin .../containment.rsi/p2.png} | Bin .../containment.rsi/p3.png} | Bin .../containment.rsi/p4.png} | Bin .../containment.rsi/p5.png} | Bin .../containment.rsi/p6.png} | Bin .../containment_field.rsi/field.png} | Bin .../containment_field.rsi/meta.json | 89 +++++++++++ .../emitter.rsi/beam.png} | Bin .../emitter.rsi/emitter0.png | Bin .../emitter.rsi/emitter1.png | Bin .../emitter.rsi/emitter2.png | Bin .../emitter.rsi/lock.png} | Bin .../Power/Singularity/emitter.rsi/meta.json | 56 +++++++ .../emitter.rsi/projectile.png} | Bin .../emitter.rsi/underpowered.png} | Bin .../Power/Singularity/generator.rsi/icon.png} | Bin .../Power/Singularity/generator.rsi/meta.json | 14 ++ .../Singularity/singularity_1.rsi/meta.json | 0 .../singularity_1.rsi/singularity_1.png | Bin .../Singularity/singularity_2.rsi/meta.json | 0 .../singularity_2.rsi/singularity_2.png | Bin .../Singularity/singularity_3.rsi/meta.json | 0 .../singularity_3.rsi/singularity_3.png | Bin .../Singularity/singularity_4.rsi/meta.json | 0 .../singularity_4.rsi/singularity_4.png | Bin .../Singularity/singularity_5.rsi/meta.json | 0 .../singularity_5.rsi/singularity_5.png | Bin .../Singularity/singularity_6.rsi/meta.json | 0 .../singularity_6.rsi/singularity_6.png | Bin .../Constructible/Power/emitter.rsi/meta.json | 1 - .../Power/field_generator.rsi/meta.json | 1 - .../Power/radiation_collector.rsi/meta.json | 1 - .../Singularity/singulo_gen.rsi/meta.json | 1 - .../Textures/Effects/contain_f.rsi/meta.json | 1 - 63 files changed, 608 insertions(+), 218 deletions(-) create mode 100644 Resources/Prototypes/Catalog/Cargo/cargo_materials.yml create mode 100644 Resources/Prototypes/Entities/Constructible/Specific/Engines/Singularity/collector.yml create mode 100644 Resources/Prototypes/Entities/Constructible/Specific/Engines/Singularity/containment.yml create mode 100644 Resources/Prototypes/Entities/Constructible/Specific/Engines/Singularity/generator.yml create mode 100644 Resources/Prototypes/Entities/Constructible/Specific/Engines/Singularity/singularity.yml delete mode 100644 Resources/Prototypes/Entities/singularity.yml rename Resources/Textures/Constructible/Power/{radiation_collector.rsi => Singularity/collector.rsi}/ca_active.png (100%) rename Resources/Textures/Constructible/Power/{radiation_collector.rsi => Singularity/collector.rsi}/ca_deactive.png (100%) rename Resources/Textures/Constructible/Power/{radiation_collector.rsi => Singularity/collector.rsi}/ca_off.png (100%) rename Resources/Textures/Constructible/Power/{radiation_collector.rsi => Singularity/collector.rsi}/ca_on.png (100%) rename Resources/Textures/Constructible/Power/{radiation_collector.rsi => Singularity/collector.rsi}/cu.png (100%) create mode 100644 Resources/Textures/Constructible/Power/Singularity/collector.rsi/meta.json rename Resources/Textures/Constructible/Power/{field_generator.rsi/+a1.png => Singularity/containment.rsi/a1.png} (100%) rename Resources/Textures/Constructible/Power/{field_generator.rsi/+a2.png => Singularity/containment.rsi/a2.png} (100%) rename Resources/Textures/Constructible/Power/{field_generator.rsi/+a3.png => Singularity/containment.rsi/a3.png} (100%) rename Resources/Textures/Constructible/Power/{field_generator.rsi/Field_Gen.png => Singularity/containment.rsi/icon.png} (100%) create mode 100644 Resources/Textures/Constructible/Power/Singularity/containment.rsi/meta.json rename Resources/Textures/Constructible/Power/{field_generator.rsi/+on.png => Singularity/containment.rsi/on.png} (100%) rename Resources/Textures/Constructible/Power/{field_generator.rsi/+p1.png => Singularity/containment.rsi/p1.png} (100%) rename Resources/Textures/Constructible/Power/{field_generator.rsi/+p2.png => Singularity/containment.rsi/p2.png} (100%) rename Resources/Textures/Constructible/Power/{field_generator.rsi/+p3.png => Singularity/containment.rsi/p3.png} (100%) rename Resources/Textures/Constructible/Power/{field_generator.rsi/+p4.png => Singularity/containment.rsi/p4.png} (100%) rename Resources/Textures/Constructible/Power/{field_generator.rsi/+p5.png => Singularity/containment.rsi/p5.png} (100%) rename Resources/Textures/Constructible/Power/{field_generator.rsi/+p6.png => Singularity/containment.rsi/p6.png} (100%) rename Resources/Textures/{Effects/contain_f.rsi/Contain_F.png => Constructible/Power/Singularity/containment_field.rsi/field.png} (100%) create mode 100644 Resources/Textures/Constructible/Power/Singularity/containment_field.rsi/meta.json rename Resources/Textures/Constructible/Power/{emitter.rsi/emitter-beam.png => Singularity/emitter.rsi/beam.png} (100%) rename Resources/Textures/Constructible/Power/{ => Singularity}/emitter.rsi/emitter0.png (100%) rename Resources/Textures/Constructible/Power/{ => Singularity}/emitter.rsi/emitter1.png (100%) rename Resources/Textures/Constructible/Power/{ => Singularity}/emitter.rsi/emitter2.png (100%) rename Resources/Textures/Constructible/Power/{emitter.rsi/emitter-lock.png => Singularity/emitter.rsi/lock.png} (100%) create mode 100644 Resources/Textures/Constructible/Power/Singularity/emitter.rsi/meta.json rename Resources/Textures/Constructible/Power/{emitter.rsi/emitter_projectile.png => Singularity/emitter.rsi/projectile.png} (100%) rename Resources/Textures/Constructible/Power/{emitter.rsi/emitter-underpowered.png => Singularity/emitter.rsi/underpowered.png} (100%) rename Resources/Textures/{Effects/Singularity/singulo_gen.rsi/singulo_gen.png => Constructible/Power/Singularity/generator.rsi/icon.png} (100%) create mode 100644 Resources/Textures/Constructible/Power/Singularity/generator.rsi/meta.json rename Resources/Textures/{Effects => Constructible/Power}/Singularity/singularity_1.rsi/meta.json (100%) rename Resources/Textures/{Effects => Constructible/Power}/Singularity/singularity_1.rsi/singularity_1.png (100%) rename Resources/Textures/{Effects => Constructible/Power}/Singularity/singularity_2.rsi/meta.json (100%) rename Resources/Textures/{Effects => Constructible/Power}/Singularity/singularity_2.rsi/singularity_2.png (100%) rename Resources/Textures/{Effects => Constructible/Power}/Singularity/singularity_3.rsi/meta.json (100%) rename Resources/Textures/{Effects => Constructible/Power}/Singularity/singularity_3.rsi/singularity_3.png (100%) rename Resources/Textures/{Effects => Constructible/Power}/Singularity/singularity_4.rsi/meta.json (100%) rename Resources/Textures/{Effects => Constructible/Power}/Singularity/singularity_4.rsi/singularity_4.png (100%) rename Resources/Textures/{Effects => Constructible/Power}/Singularity/singularity_5.rsi/meta.json (100%) rename Resources/Textures/{Effects => Constructible/Power}/Singularity/singularity_5.rsi/singularity_5.png (100%) rename Resources/Textures/{Effects => Constructible/Power}/Singularity/singularity_6.rsi/meta.json (100%) rename Resources/Textures/{Effects => Constructible/Power}/Singularity/singularity_6.rsi/singularity_6.png (100%) delete mode 100644 Resources/Textures/Constructible/Power/emitter.rsi/meta.json delete mode 100644 Resources/Textures/Constructible/Power/field_generator.rsi/meta.json delete mode 100644 Resources/Textures/Constructible/Power/radiation_collector.rsi/meta.json delete mode 100644 Resources/Textures/Effects/Singularity/singulo_gen.rsi/meta.json delete mode 100644 Resources/Textures/Effects/contain_f.rsi/meta.json diff --git a/Content.Client/GameObjects/Components/Singularity/EmitterVisualizer.cs b/Content.Client/GameObjects/Components/Singularity/EmitterVisualizer.cs index 25e10e341a..f1fd90ab95 100644 --- a/Content.Client/GameObjects/Components/Singularity/EmitterVisualizer.cs +++ b/Content.Client/GameObjects/Components/Singularity/EmitterVisualizer.cs @@ -1,4 +1,4 @@ -using System; +using System; using Content.Shared.GameObjects.Components.Singularity; using JetBrains.Annotations; using Robust.Client.GameObjects; @@ -8,8 +8,8 @@ namespace Content.Client.GameObjects.Components.Singularity [UsedImplicitly] public class EmitterVisualizer : AppearanceVisualizer { - private const string OverlayBeam = "emitter-beam"; - private const string OverlayUnderPowered = "emitter-underpowered"; + private const string OverlayBeam = "beam"; + private const string OverlayUnderPowered = "underpowered"; public override void OnChangeData(AppearanceComponent component) { diff --git a/Content.Server/GameObjects/Components/Singularity/EmitterComponent.cs b/Content.Server/GameObjects/Components/Singularity/EmitterComponent.cs index d86662d49b..0cd2924d93 100644 --- a/Content.Server/GameObjects/Components/Singularity/EmitterComponent.cs +++ b/Content.Server/GameObjects/Components/Singularity/EmitterComponent.cs @@ -98,23 +98,6 @@ namespace Content.Server.GameObjects.Components.Singularity } } - public override void HandleMessage(ComponentMessage message, IComponent? component) - { - base.HandleMessage(message, component); - switch (message) - { - case AnchoredChangedMessage anchoredChanged: - OnAnchoredChanged(anchoredChanged); - break; - } - } - - private void OnAnchoredChanged(AnchoredChangedMessage anchoredChanged) - { - if (anchoredChanged.Anchored) - Owner.SnapToGrid(); - } - void IActivate.Activate(ActivateEventArgs eventArgs) { if (_isLocked) diff --git a/Content.Server/GameObjects/Components/Singularity/SingularityComponent.cs b/Content.Server/GameObjects/Components/Singularity/SingularityComponent.cs index d8c32dc2e3..2351a00b5f 100644 --- a/Content.Server/GameObjects/Components/Singularity/SingularityComponent.cs +++ b/Content.Server/GameObjects/Components/Singularity/SingularityComponent.cs @@ -72,7 +72,7 @@ namespace Content.Server.GameObjects.Components.Singularity if(_radiationPulseComponent != null) _radiationPulseComponent.RadsPerSecond = 10 * value; - _spriteComponent?.LayerSetRSI(0, "Effects/Singularity/singularity_" + _level + ".rsi"); + _spriteComponent?.LayerSetRSI(0, "Constructible/Power/Singularity/singularity_" + _level + ".rsi"); _spriteComponent?.LayerSetState(0, "singularity_" + _level); if(_collidableComponent != null && _collidableComponent.PhysicsShapes.Any() && _collidableComponent.PhysicsShapes[0] is PhysShapeCircle circle) diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml index 1b99c88f7d..91efdba559 100644 --- a/Resources/Maps/saltern.yml +++ b/Resources/Maps/saltern.yml @@ -38423,7 +38423,7 @@ entities: rot: 4.371139006309477E-08 rad type: Transform - uid: 4290 - type: SinguloGenerator + type: SingularityGenerator components: - parent: 853 pos: 49.5,-24.5 @@ -41471,7 +41471,7 @@ entities: rot: 4.371139006309477E-08 rad type: Transform - uid: 4714 - type: CrateMaterialsMetal + type: CrateMaterialMetal components: - parent: 853 pos: 21.5,13.5 diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml b/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml index ab59e2a4ce..1196368491 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml @@ -1,6 +1,6 @@ - type: cargoProduct name: "packaged antimatter reactor crate" - id: cargo.enginesameshielding + id: cargo.engineameshielding description: "9 parts for the main body of an antimatter reactor, or for expanding an existing one." icon: sprite: Objects/Power/AME/ame_part.rsi @@ -12,7 +12,7 @@ - type: cargoProduct name: "antimatter containment jar crate" - id: cargo.enginesamejar + id: cargo.engineamejar description: "3 antimatter jars, for fuelling an antimatter reactor." icon: sprite: Objects/Power/AME/ame_jar.rsi @@ -24,7 +24,7 @@ - type: cargoProduct name: "antimatter control unit crate" - id: cargo.enginesamecontrol + id: cargo.engineamecontrol description: "The control unit of an antimatter reactor." icon: sprite: Constructible/Power/ame_controller.rsi @@ -34,3 +34,50 @@ category: Engineering group: market +- type: cargoProduct + name: "singularity generator crate" + id: cargo.enginesingularitygenerator + description: "Contains one singularity generator. The mother of the beast." + icon: + sprite: Constructible/Power/Singularity/generator.rsi + state: icon + product: CrateEngineeringSingularityGenerator + cost: 4000 + category: Engineering + group: market + +- type: cargoProduct + name: "singularity containment crate" + id: cargo.enginesingularitycontainment + description: "Contains 2 singularity containment field generators." + icon: + sprite: Constructible/Power/Singularity/containment.rsi + state: icon + product: CrateEngineeringSingularityContainment + cost: 1500 + category: Engineering + group: market + +- type: cargoProduct + name: "emitter crate" + id: cargo.enginesingularityemitter + description: "Contains 2 emitters. Used only for dangerous applications." + icon: + sprite: Constructible/Power/Singularity/emitter.rsi + state: emitter2 + product: CrateEngineeringSingularityEmitter + cost: 1500 + category: Engineering + group: market + +- type: cargoProduct + name: "radiation collector crate" + id: cargo.enginesingularitycollector + description: "Contains 2 radiation collectors. Safety first!" + icon: + sprite: Constructible/Power/Singularity/collector.rsi + state: ca_on + product: CrateEngineeringSingularityCollector + cost: 1500 + category: Engineering + group: market diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml index 26fdcc71ae..bdb2996f0d 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml @@ -15,8 +15,8 @@ id: cargo.funartsupplies description: "Make some happy little accidents with lots of crayons!" icon: - sprite: Objects/Misc/crayons.rsi - state: crayonbox + sprite: Objects/Fun/crayons.rsi + state: box product: CrateFunArtSupplies cost: 1000 category: Fun diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml b/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml new file mode 100644 index 0000000000..ec9d50049b --- /dev/null +++ b/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml @@ -0,0 +1,35 @@ +- type: cargoProduct + name: "crate of glass sheets" + id: cargo.materialglass + description: "90 sheets of glass, packed with care." + icon: + sprite: Objects/Materials/Sheets/glass.rsi + state: glass_3 + product: CrateMaterialGlass + cost: 1500 + category: Materials + group: market + +- type: cargoProduct + name: "crate of steel sheets" + id: cargo.materialsteel + description: "90 sheets of steel." + icon: + sprite: Objects/Materials/Sheets/metal.rsi + state: steel_3 + product: CrateMaterialGlass + cost: 1500 + category: Materials + group: market + +- type: cargoProduct + name: "crate of plastic sheets" + id: cargo.materialplastic + description: "90 sheets of plastic." + icon: + sprite: Objects/Materials/Sheets/other.rsi + state: plastic_3 + product: CrateMaterialPlastic + cost: 1500 + category: Materials + group: market diff --git a/Resources/Prototypes/Catalog/Fills/Storage/Crates/engines.yml b/Resources/Prototypes/Catalog/Fills/Storage/Crates/engines.yml index 47efb558be..427dc733b0 100644 --- a/Resources/Prototypes/Catalog/Fills/Storage/Crates/engines.yml +++ b/Resources/Prototypes/Catalog/Fills/Storage/Crates/engines.yml @@ -31,6 +31,63 @@ - name: AMEControllerUnanchored amount: 1 +- type: entity + id: CrateEngineeringSingularityEmitter + name: emitter crate + description: "An emitter, best used for singularity engines." + parent: CrateEngineeringSecure + components: + - type: StorageFill + contents: + - name: Emitter + amount: 2 + +- type: entity + id: CrateEngineeringSingularityCollector + name: radiation collector crate + description: "A radiation collector, best used for singularity engines." + parent: CrateEngineeringSecure + components: + - type: StorageFill + contents: + - name: RadiationCollector + amount: 2 + +- type: entity + id: CrateEngineeringSingularityContainment + name: containment field generator crate + description: "A containment field generator, keeps the singulo in submission." + parent: CrateEngineeringSecure + components: + - type: StorageFill + contents: + - name: ContainmentFieldGenerator + amount: 2 + +- type: entity + id: CrateEngineeringSingularityGenerator + name: singularity generator crate + description: "A singularity generator, the mother of the beast." + parent: CrateEngineeringSecure + components: + - type: StorageFill + contents: + - name: SingularityGenerator + amount: 1 + +# Non-functional for some reason + +#- type: entity +# id: CrateEngineeringSingularity +# name: singularity crate +# description: "Prank the station!" +# parent: CrateEngineeringSecure +# components: +# - type: StorageFill +# contents: +# - name: Singularity +# amount: 1 + - type: entity id: CrateEngineeringGenerator name: generator crate diff --git a/Resources/Prototypes/Catalog/Fills/Storage/Crates/materials.yml b/Resources/Prototypes/Catalog/Fills/Storage/Crates/materials.yml index e4c5198bf9..0dd536348f 100644 --- a/Resources/Prototypes/Catalog/Fills/Storage/Crates/materials.yml +++ b/Resources/Prototypes/Catalog/Fills/Storage/Crates/materials.yml @@ -1,25 +1,35 @@ - type: entity - id: CrateMaterialsGlass + id: CrateMaterialGlass name: glass crate parent: CrateGenericonimo components: - type: StorageFill contents: - name: SheetGlass - amount: 1 + amount: 3 - type: entity - id: CrateMaterialsMetal + id: CrateMaterialMetal name: metals crate parent: CrateGenericonimo components: - type: StorageFill contents: - name: SheetSteel - amount: 1 + amount: 3 - type: entity - id: CrateMaterialsWood + id: CrateMaterialPlastic + name: plastics crate + parent: CrateGenericonimo + components: + - type: StorageFill + contents: + - name: SheetPlastic + amount: 3 + +- type: entity + id: CrateMaterialWood name: wood crate parent: CrateGenericonimo components: @@ -29,7 +39,7 @@ amount: 1 - type: entity - id: CrateMaterialsFuelTank + id: CrateMaterialFuelTank name: fueltank crate parent: CrateGenericonimo components: @@ -39,7 +49,7 @@ amount: 1 #- type: entity -# id: CrateMaterialsHFuelTank +# id: CrateMaterialHFuelTank # name: fueltank crate # parent: CrateGenericonimo # components: @@ -49,7 +59,7 @@ # amount: 1 - type: entity - id: CrateMaterialsWaterTank + id: CrateMaterialWaterTank name: watertank crate parent: CrateGenericonimo components: @@ -59,7 +69,7 @@ amount: 1 #- type: entity -# id: CrateMaterialsHWaterTank +# id: CrateMaterialHWaterTank # name: watertank crate # parent: CrateGenericonimo # components: @@ -69,17 +79,7 @@ # amount: 1 - type: entity - id: CrateMaterialsPlastic - name: plastics crate - parent: CrateGenericonimo - components: - - type: StorageFill - contents: - - name: SheetPlastic - amount: 1 - -- type: entity - id: CrateMaterialsPlasteel + id: CrateMaterialPlasteel name: plasteel crate parent: CrateGenericonimo components: diff --git a/Resources/Prototypes/Entities/Constructible/Power/cargo_console.yml b/Resources/Prototypes/Entities/Constructible/Power/cargo_console.yml index 5f9060bb39..dff20b0e82 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/cargo_console.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/cargo_console.yml @@ -31,12 +31,19 @@ - cargo.hydroponicsseedsexotic - cargo.servicejanitorial - cargo.servicelightsreplacement - - cargo.enginesameshielding - - cargo.enginesamejar - - cargo.enginesamecontrol + - cargo.engineameshielding + - cargo.engineamejar + - cargo.engineamecontrol - cargo.funplushies - cargo.funartsupplies - cargo.funinstruments + - cargo.materialsteel + - cargo.materialglass + - cargo.materialplastic + - cargo.enginesingularityemitter + - cargo.enginesingularitycollector + - cargo.enginesingularitygenerator + - cargo.enginesingularitycontainment - type: UserInterface interfaces: - key: enum.CargoConsoleUiKey.Key diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Engines/Singularity/collector.yml b/Resources/Prototypes/Entities/Constructible/Specific/Engines/Singularity/collector.yml new file mode 100644 index 0000000000..572c5d1b7b --- /dev/null +++ b/Resources/Prototypes/Entities/Constructible/Specific/Engines/Singularity/collector.yml @@ -0,0 +1,41 @@ +- type: entity + id: RadiationCollector + name: Radiation Collector + description: A machine that collects Radiation and turns it into power. + placement: + mode: SnapgridCenter + components: + - type: Clickable + - type: InteractionOutline + - type: Physics + shapes: + - !type:PhysShapeAabb + bounds: "-0.5, -0.5, 0.5, 0.5" + # layer: + # - Impassable + # - MobImpassable + # - VaultImpassable + # - Opaque + # mask: + # - Impassable + # - MobImpassable + # - VaultImpassable + - type: SnapGrid + offset: Center + - type: Sprite + sprite: Constructible/Power/Singularity/collector.rsi + layers: + - state: ca_on + map: ["enum.RadiationCollectorVisualLayers.Main"] + - type: Appearance + visuals: + - type: RadiationCollectorVisualizer + - type: NodeContainer + examinable: true + nodes: + - !type:AdjacentNode + nodeGroupID: HVPower + - type: RadiationCollector + - type: Anchorable + snap: true + - type: Pullable diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Engines/Singularity/containment.yml b/Resources/Prototypes/Entities/Constructible/Specific/Engines/Singularity/containment.yml new file mode 100644 index 0000000000..09a124e8fa --- /dev/null +++ b/Resources/Prototypes/Entities/Constructible/Specific/Engines/Singularity/containment.yml @@ -0,0 +1,65 @@ +- type: entity + name: containment field generator + description: "A machine that generates a containment field when powered by an emitter.\nKeeps the Singularity docile." + id: ContainmentFieldGenerator + placement: + mode: SnapgridCenter + components: + - type: InteractionOutline + - type: Clickable + - type: Physics + shapes: + - !type:PhysShapeAabb + bounds: "-0.5, -0.5, 0.5, 0.5" + # layer: + # - Impassable + # - MobImpassable + # - VaultImpassable + # - Opaque + # mask: + # - Impassable + # - MobImpassable + # - VaultImpassable + - type: SnapGrid + offset: Center + - type: Sprite + sprite: Constructible/Power/Singularity/containment.rsi + state: icon + - type: Icon + sprite: Constructible/Power/Singularity/containment.rsi + state: icon + - type: ContainmentFieldGenerator + - type: Anchorable + snap: true + - type: Pullable + - type: PointLight + enabled: false + color: "#4080FF" + radius: 32 + energy: 2.0 + softness: 32.0 + +- type: entity + name: Containment Field + description: "A containment field that repels gravitational singularities." + id: ContainmentField + placement: + mode: SnapgridCenter + components: + - type: InteractionOutline + - type: Clickable + - type: Physics + anchored: true + shapes: + - !type:PhysShapeAabb + bounds: "-0.5, -0.5, 0.5, 0.5" + layer: [MobMask, Opaque] + - type: SnapGrid + offset: Center + - type: Sprite + sprite: Constructible/Power/Singularity/containment_field.rsi + state: field + - type: Icon + sprite: Constructible/Power/Singularity/containment_field.rsi + state: field + - type: ContainmentField diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Engines/Singularity/emitter.yml b/Resources/Prototypes/Entities/Constructible/Specific/Engines/Singularity/emitter.yml index fa21ea3ee4..ffb470f945 100644 --- a/Resources/Prototypes/Entities/Constructible/Specific/Engines/Singularity/emitter.yml +++ b/Resources/Prototypes/Entities/Constructible/Specific/Engines/Singularity/emitter.yml @@ -1,37 +1,36 @@ - type: entity - name: Emitter + name: emitter description: "A machine that fires bolts of energy, used for powering containment fields at a safe distance." id: Emitter placement: mode: SnapgridCenter components: - - type: InteractionOutline - type: Clickable + - type: InteractionOutline - type: Physics mass: 25 - anchored: true shapes: - !type:PhysShapeAabb bounds: "-0.5, -0.5, 0.5, 0.5" - layer: - - Impassable - - MobImpassable - - VaultImpassable - - Opaque - mask: - - Impassable - - MobImpassable - - VaultImpassable + # layer: + # - Impassable + # - MobImpassable + # - VaultImpassable + # - Opaque + # mask: + # - Impassable + # - MobImpassable + # - VaultImpassable - type: SnapGrid offset: Center - type: Sprite - sprite: Constructible/Power/emitter.rsi + sprite: Constructible/Power/Singularity/emitter.rsi layers: - state: emitter2 - - state: emitter-beam + - state: beam shader: unshaded visible: false - - state: emitter-lock + - state: lock shader: unshaded visible: false - type: Emitter @@ -43,16 +42,15 @@ - !type:AdjacentNode nodeGroupID: MVPower - type: Anchorable + snap: true - type: Pullable + - type: Rotatable - type: Appearance -# - type: Rotatable -# Idk why but the emitter breaks when I apply this. visuals: - type: EmitterVisualizer - type: AccessReader access: [[ "Engineering" ]] - - type: entity name: Emitter Bolt description: "A bolt of energy." @@ -60,14 +58,14 @@ parent: BulletBase components: - type: Sprite - sprite: Constructible/Power/emitter.rsi + sprite: Constructible/Power/Singularity/emitter.rsi state: '' layers: - - state: emitter_projectile + - state: projectile shader: unshaded - type: Icon - sprite: Constructible/Power/emitter.rsi - state: emitter_projectile + sprite: Constructible/Power/Singularity/emitter.rsi + state: projectile - type: EmitterBoltComponent - type: Projectile soundHit: /Audio/Weapons/Guns/Hits/bullet_hit.ogg diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Engines/Singularity/generator.yml b/Resources/Prototypes/Entities/Constructible/Specific/Engines/Singularity/generator.yml new file mode 100644 index 0000000000..8defe6fad0 --- /dev/null +++ b/Resources/Prototypes/Entities/Constructible/Specific/Engines/Singularity/generator.yml @@ -0,0 +1,29 @@ +- type: entity + name: gravitational singularity generator + description: An Odd Device which produces a Gravitational Singularity when set up. + id: SingularityGenerator + components: + - type: Sprite + sprite: Constructible/Power/Singularity/generator.rsi + state: icon + - type: SingularityGenerator + - type: InteractionOutline + - type: Clickable + - type: Physics + shapes: + - !type:PhysShapeAabb + bounds: "-0.5, -0.5, 0.5, 0.5" + # layer: + # - Impassable + # - MobImpassable + # - VaultImpassable + # - Opaque + # mask: + # - Impassable + # - MobImpassable + # - VaultImpassable + - type: SnapGrid + offset: Center + - type: Anchorable + snap: true + - type: Pullable diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Engines/Singularity/singularity.yml b/Resources/Prototypes/Entities/Constructible/Specific/Engines/Singularity/singularity.yml new file mode 100644 index 0000000000..8246655f22 --- /dev/null +++ b/Resources/Prototypes/Entities/Constructible/Specific/Engines/Singularity/singularity.yml @@ -0,0 +1,26 @@ +- type: entity + name: "Gravitational Singularity" + description: "A mesmerizing swirl of darkness that sucks in everything.\nIf it's moving towards you, run." + id: Singularity + components: + - type: Clickable + - type: Physics + anchored: false + shapes: + - !type:PhysShapeCircle + radius: 0.5 + layer: [Impassable] + mask: + - AllMask + mass: 5 + - type: Singularity + - type: RadiationPulse + range: 15 + decay: false + - type: Sprite + sprite: Constructible/Power/Singularity/singularity_1.rsi + state: singularity_1 + - type: Icon + sprite: Constructible/Power/Singularity/singularity_1.rsi + state: singularity_1 + drawdepth: Items diff --git a/Resources/Prototypes/Entities/singularity.yml b/Resources/Prototypes/Entities/singularity.yml deleted file mode 100644 index e1576249ed..0000000000 --- a/Resources/Prototypes/Entities/singularity.yml +++ /dev/null @@ -1,140 +0,0 @@ -- type: entity - name: "Gravitational Singularity" - description: "A mesmerizing swirl of darkness that sucks in everything.\nIf it's moving towards you, run." - id: Singularity - components: - - type: Clickable - - type: Physics - anchored: false - shapes: - - !type:PhysShapeCircle - radius: 0.5 - layer: [Impassable] - mask: - - AllMask - mass: 5 - - type: Singularity - - type: RadiationPulse - range: 15 - decay: false - - type: Sprite - sprite: Effects/Singularity/singularity_1.rsi - state: singularity_1 - - type: Icon - sprite: Effects/Singularity/singularity_1.rsi - state: singularity_1 - drawdepth: Items - -- type: entity - id: RadiationCollector - name: Radiation Collector - description: A machine that collects Radiation and turns it into power. - placement: - mode: SnapgridCenter - components: - - type: Clickable - - type: InteractionOutline - - type: Physics - anchored: true - shapes: - - !type:PhysShapeAabb - bounds: "-0.5, -0.5, 0.5, 0.5" - layer: [MobMask, Opaque] - - type: SnapGrid - offset: Center - - type: Sprite - sprite: Constructible/Power/radiation_collector.rsi - layers: - - state: ca_on - map: ["enum.RadiationCollectorVisualLayers.Main"] - - type: Appearance - visuals: - - type: RadiationCollectorVisualizer - - type: NodeContainer - examinable: true - nodes: - - !type:AdjacentNode - nodeGroupID: HVPower - - type: RadiationCollector - - type: Anchorable - - type: Pullable - -- type: entity - name: Containment Field Generator - description: "A machine that generates a containment field when powered by an emitter.\nKeeps the Singularity docile." - id: ContainmentFieldGenerator - placement: - mode: SnapgridCenter - components: - - type: InteractionOutline - - type: Clickable - - type: Physics - anchored: true - shapes: - - !type:PhysShapeAabb - bounds: "-0.5, -0.5, 0.5, 0.5" - layer: [MobMask, Opaque] - - type: SnapGrid - offset: Center - - type: Sprite - sprite: Constructible/Power/field_generator.rsi - state: Field_Gen - - type: Icon - sprite: Constructible/Power/field_generator.rsi - state: Field_Gen - - type: ContainmentFieldGenerator - - type: Anchorable - - type: Pullable - - type: PointLight - enabled: false - color: "#4080FF" - radius: 32 - energy: 2.0 - softness: 32.0 - -- type: entity - name: Containment Field - description: "A containment field that repels gravitational singularities." - id: ContainmentField - placement: - mode: SnapgridCenter - components: - - type: InteractionOutline - - type: Clickable - - type: Physics - anchored: true - shapes: - - !type:PhysShapeAabb - bounds: "-0.5, -0.5, 0.5, 0.5" - layer: [MobMask, Opaque] - - type: SnapGrid - offset: Center - - type: Sprite - sprite: Effects/contain_f.rsi - state: Contain_F - - type: Icon - sprite: Effects/contain_f.rsi - state: Contain_F - - type: ContainmentField - -- type: entity - name: Gravitational Singularity Generator - description: An Odd Device which produces a Gravitational Singularity when set up. - id: SinguloGenerator - components: - - type: Sprite - sprite: Effects/Singularity/singulo_gen.rsi - state: singulo_gen - - type: SingularityGenerator - - type: InteractionOutline - - type: Clickable - - type: Physics - anchored: true - shapes: - - !type:PhysShapeAabb - bounds: "-0.5, -0.5, 0.5, 0.5" - layer: [ MobMask ] - - type: SnapGrid - offset: Center - - type: Anchorable - - type: Pullable diff --git a/Resources/Textures/Constructible/Power/radiation_collector.rsi/ca_active.png b/Resources/Textures/Constructible/Power/Singularity/collector.rsi/ca_active.png similarity index 100% rename from Resources/Textures/Constructible/Power/radiation_collector.rsi/ca_active.png rename to Resources/Textures/Constructible/Power/Singularity/collector.rsi/ca_active.png diff --git a/Resources/Textures/Constructible/Power/radiation_collector.rsi/ca_deactive.png b/Resources/Textures/Constructible/Power/Singularity/collector.rsi/ca_deactive.png similarity index 100% rename from Resources/Textures/Constructible/Power/radiation_collector.rsi/ca_deactive.png rename to Resources/Textures/Constructible/Power/Singularity/collector.rsi/ca_deactive.png diff --git a/Resources/Textures/Constructible/Power/radiation_collector.rsi/ca_off.png b/Resources/Textures/Constructible/Power/Singularity/collector.rsi/ca_off.png similarity index 100% rename from Resources/Textures/Constructible/Power/radiation_collector.rsi/ca_off.png rename to Resources/Textures/Constructible/Power/Singularity/collector.rsi/ca_off.png diff --git a/Resources/Textures/Constructible/Power/radiation_collector.rsi/ca_on.png b/Resources/Textures/Constructible/Power/Singularity/collector.rsi/ca_on.png similarity index 100% rename from Resources/Textures/Constructible/Power/radiation_collector.rsi/ca_on.png rename to Resources/Textures/Constructible/Power/Singularity/collector.rsi/ca_on.png diff --git a/Resources/Textures/Constructible/Power/radiation_collector.rsi/cu.png b/Resources/Textures/Constructible/Power/Singularity/collector.rsi/cu.png similarity index 100% rename from Resources/Textures/Constructible/Power/radiation_collector.rsi/cu.png rename to Resources/Textures/Constructible/Power/Singularity/collector.rsi/cu.png diff --git a/Resources/Textures/Constructible/Power/Singularity/collector.rsi/meta.json b/Resources/Textures/Constructible/Power/Singularity/collector.rsi/meta.json new file mode 100644 index 0000000000..f03f3b29a6 --- /dev/null +++ b/Resources/Textures/Constructible/Power/Singularity/collector.rsi/meta.json @@ -0,0 +1,44 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from goonstation at https://github.com/goonstation/goonstation/commit/cbe076402ed43b1cd861295bbcb95608c453de7a", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "ca_off" + }, + { + "name": "ca_on" + }, + { + "name": "ca_active", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "ca_deactive", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "cu" + } + ] +} diff --git a/Resources/Textures/Constructible/Power/field_generator.rsi/+a1.png b/Resources/Textures/Constructible/Power/Singularity/containment.rsi/a1.png similarity index 100% rename from Resources/Textures/Constructible/Power/field_generator.rsi/+a1.png rename to Resources/Textures/Constructible/Power/Singularity/containment.rsi/a1.png diff --git a/Resources/Textures/Constructible/Power/field_generator.rsi/+a2.png b/Resources/Textures/Constructible/Power/Singularity/containment.rsi/a2.png similarity index 100% rename from Resources/Textures/Constructible/Power/field_generator.rsi/+a2.png rename to Resources/Textures/Constructible/Power/Singularity/containment.rsi/a2.png diff --git a/Resources/Textures/Constructible/Power/field_generator.rsi/+a3.png b/Resources/Textures/Constructible/Power/Singularity/containment.rsi/a3.png similarity index 100% rename from Resources/Textures/Constructible/Power/field_generator.rsi/+a3.png rename to Resources/Textures/Constructible/Power/Singularity/containment.rsi/a3.png diff --git a/Resources/Textures/Constructible/Power/field_generator.rsi/Field_Gen.png b/Resources/Textures/Constructible/Power/Singularity/containment.rsi/icon.png similarity index 100% rename from Resources/Textures/Constructible/Power/field_generator.rsi/Field_Gen.png rename to Resources/Textures/Constructible/Power/Singularity/containment.rsi/icon.png diff --git a/Resources/Textures/Constructible/Power/Singularity/containment.rsi/meta.json b/Resources/Textures/Constructible/Power/Singularity/containment.rsi/meta.json new file mode 100644 index 0000000000..a0ff9e5c78 --- /dev/null +++ b/Resources/Textures/Constructible/Power/Singularity/containment.rsi/meta.json @@ -0,0 +1,44 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/da354ba4e28fcaf73002d25cab0da4815808be60", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "a1" + }, + { + "name": "a2" + }, + { + "name": "a3" + }, + { + "name": "on" + }, + { + "name": "p1" + }, + { + "name": "p2" + }, + { + "name": "p3" + }, + { + "name": "p4" + }, + { + "name": "p5" + }, + { + "name": "p6" + }, + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/Constructible/Power/field_generator.rsi/+on.png b/Resources/Textures/Constructible/Power/Singularity/containment.rsi/on.png similarity index 100% rename from Resources/Textures/Constructible/Power/field_generator.rsi/+on.png rename to Resources/Textures/Constructible/Power/Singularity/containment.rsi/on.png diff --git a/Resources/Textures/Constructible/Power/field_generator.rsi/+p1.png b/Resources/Textures/Constructible/Power/Singularity/containment.rsi/p1.png similarity index 100% rename from Resources/Textures/Constructible/Power/field_generator.rsi/+p1.png rename to Resources/Textures/Constructible/Power/Singularity/containment.rsi/p1.png diff --git a/Resources/Textures/Constructible/Power/field_generator.rsi/+p2.png b/Resources/Textures/Constructible/Power/Singularity/containment.rsi/p2.png similarity index 100% rename from Resources/Textures/Constructible/Power/field_generator.rsi/+p2.png rename to Resources/Textures/Constructible/Power/Singularity/containment.rsi/p2.png diff --git a/Resources/Textures/Constructible/Power/field_generator.rsi/+p3.png b/Resources/Textures/Constructible/Power/Singularity/containment.rsi/p3.png similarity index 100% rename from Resources/Textures/Constructible/Power/field_generator.rsi/+p3.png rename to Resources/Textures/Constructible/Power/Singularity/containment.rsi/p3.png diff --git a/Resources/Textures/Constructible/Power/field_generator.rsi/+p4.png b/Resources/Textures/Constructible/Power/Singularity/containment.rsi/p4.png similarity index 100% rename from Resources/Textures/Constructible/Power/field_generator.rsi/+p4.png rename to Resources/Textures/Constructible/Power/Singularity/containment.rsi/p4.png diff --git a/Resources/Textures/Constructible/Power/field_generator.rsi/+p5.png b/Resources/Textures/Constructible/Power/Singularity/containment.rsi/p5.png similarity index 100% rename from Resources/Textures/Constructible/Power/field_generator.rsi/+p5.png rename to Resources/Textures/Constructible/Power/Singularity/containment.rsi/p5.png diff --git a/Resources/Textures/Constructible/Power/field_generator.rsi/+p6.png b/Resources/Textures/Constructible/Power/Singularity/containment.rsi/p6.png similarity index 100% rename from Resources/Textures/Constructible/Power/field_generator.rsi/+p6.png rename to Resources/Textures/Constructible/Power/Singularity/containment.rsi/p6.png diff --git a/Resources/Textures/Effects/contain_f.rsi/Contain_F.png b/Resources/Textures/Constructible/Power/Singularity/containment_field.rsi/field.png similarity index 100% rename from Resources/Textures/Effects/contain_f.rsi/Contain_F.png rename to Resources/Textures/Constructible/Power/Singularity/containment_field.rsi/field.png diff --git a/Resources/Textures/Constructible/Power/Singularity/containment_field.rsi/meta.json b/Resources/Textures/Constructible/Power/Singularity/containment_field.rsi/meta.json new file mode 100644 index 0000000000..c77a50c4f4 --- /dev/null +++ b/Resources/Textures/Constructible/Power/Singularity/containment_field.rsi/meta.json @@ -0,0 +1,89 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/da354ba4e28fcaf73002d25cab0da4815808be60", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "field", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Constructible/Power/emitter.rsi/emitter-beam.png b/Resources/Textures/Constructible/Power/Singularity/emitter.rsi/beam.png similarity index 100% rename from Resources/Textures/Constructible/Power/emitter.rsi/emitter-beam.png rename to Resources/Textures/Constructible/Power/Singularity/emitter.rsi/beam.png diff --git a/Resources/Textures/Constructible/Power/emitter.rsi/emitter0.png b/Resources/Textures/Constructible/Power/Singularity/emitter.rsi/emitter0.png similarity index 100% rename from Resources/Textures/Constructible/Power/emitter.rsi/emitter0.png rename to Resources/Textures/Constructible/Power/Singularity/emitter.rsi/emitter0.png diff --git a/Resources/Textures/Constructible/Power/emitter.rsi/emitter1.png b/Resources/Textures/Constructible/Power/Singularity/emitter.rsi/emitter1.png similarity index 100% rename from Resources/Textures/Constructible/Power/emitter.rsi/emitter1.png rename to Resources/Textures/Constructible/Power/Singularity/emitter.rsi/emitter1.png diff --git a/Resources/Textures/Constructible/Power/emitter.rsi/emitter2.png b/Resources/Textures/Constructible/Power/Singularity/emitter.rsi/emitter2.png similarity index 100% rename from Resources/Textures/Constructible/Power/emitter.rsi/emitter2.png rename to Resources/Textures/Constructible/Power/Singularity/emitter.rsi/emitter2.png diff --git a/Resources/Textures/Constructible/Power/emitter.rsi/emitter-lock.png b/Resources/Textures/Constructible/Power/Singularity/emitter.rsi/lock.png similarity index 100% rename from Resources/Textures/Constructible/Power/emitter.rsi/emitter-lock.png rename to Resources/Textures/Constructible/Power/Singularity/emitter.rsi/lock.png diff --git a/Resources/Textures/Constructible/Power/Singularity/emitter.rsi/meta.json b/Resources/Textures/Constructible/Power/Singularity/emitter.rsi/meta.json new file mode 100644 index 0000000000..0456b99ffa --- /dev/null +++ b/Resources/Textures/Constructible/Power/Singularity/emitter.rsi/meta.json @@ -0,0 +1,56 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/da354ba4e28fcaf73002d25cab0da4815808be60", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "beam", + "directions": 4 + }, + { + "name": "underpowered", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "lock", + "directions": 4 + }, + { + "name": "emitter0", + "directions": 4 + }, + { + "name": "emitter1", + "directions": 4 + }, + { + "name": "emitter2", + "directions": 4 + }, + { + "name": "projectile" + } + ] +} diff --git a/Resources/Textures/Constructible/Power/emitter.rsi/emitter_projectile.png b/Resources/Textures/Constructible/Power/Singularity/emitter.rsi/projectile.png similarity index 100% rename from Resources/Textures/Constructible/Power/emitter.rsi/emitter_projectile.png rename to Resources/Textures/Constructible/Power/Singularity/emitter.rsi/projectile.png diff --git a/Resources/Textures/Constructible/Power/emitter.rsi/emitter-underpowered.png b/Resources/Textures/Constructible/Power/Singularity/emitter.rsi/underpowered.png similarity index 100% rename from Resources/Textures/Constructible/Power/emitter.rsi/emitter-underpowered.png rename to Resources/Textures/Constructible/Power/Singularity/emitter.rsi/underpowered.png diff --git a/Resources/Textures/Effects/Singularity/singulo_gen.rsi/singulo_gen.png b/Resources/Textures/Constructible/Power/Singularity/generator.rsi/icon.png similarity index 100% rename from Resources/Textures/Effects/Singularity/singulo_gen.rsi/singulo_gen.png rename to Resources/Textures/Constructible/Power/Singularity/generator.rsi/icon.png diff --git a/Resources/Textures/Constructible/Power/Singularity/generator.rsi/meta.json b/Resources/Textures/Constructible/Power/Singularity/generator.rsi/meta.json new file mode 100644 index 0000000000..e1f4f7c2a9 --- /dev/null +++ b/Resources/Textures/Constructible/Power/Singularity/generator.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/68357f0b64a296d122ff1bdb2f13e9b0cb04a003/icons/obj/singularity.dmi", + "license": "CC-BY-SA-3.0", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/Effects/Singularity/singularity_1.rsi/meta.json b/Resources/Textures/Constructible/Power/Singularity/singularity_1.rsi/meta.json similarity index 100% rename from Resources/Textures/Effects/Singularity/singularity_1.rsi/meta.json rename to Resources/Textures/Constructible/Power/Singularity/singularity_1.rsi/meta.json diff --git a/Resources/Textures/Effects/Singularity/singularity_1.rsi/singularity_1.png b/Resources/Textures/Constructible/Power/Singularity/singularity_1.rsi/singularity_1.png similarity index 100% rename from Resources/Textures/Effects/Singularity/singularity_1.rsi/singularity_1.png rename to Resources/Textures/Constructible/Power/Singularity/singularity_1.rsi/singularity_1.png diff --git a/Resources/Textures/Effects/Singularity/singularity_2.rsi/meta.json b/Resources/Textures/Constructible/Power/Singularity/singularity_2.rsi/meta.json similarity index 100% rename from Resources/Textures/Effects/Singularity/singularity_2.rsi/meta.json rename to Resources/Textures/Constructible/Power/Singularity/singularity_2.rsi/meta.json diff --git a/Resources/Textures/Effects/Singularity/singularity_2.rsi/singularity_2.png b/Resources/Textures/Constructible/Power/Singularity/singularity_2.rsi/singularity_2.png similarity index 100% rename from Resources/Textures/Effects/Singularity/singularity_2.rsi/singularity_2.png rename to Resources/Textures/Constructible/Power/Singularity/singularity_2.rsi/singularity_2.png diff --git a/Resources/Textures/Effects/Singularity/singularity_3.rsi/meta.json b/Resources/Textures/Constructible/Power/Singularity/singularity_3.rsi/meta.json similarity index 100% rename from Resources/Textures/Effects/Singularity/singularity_3.rsi/meta.json rename to Resources/Textures/Constructible/Power/Singularity/singularity_3.rsi/meta.json diff --git a/Resources/Textures/Effects/Singularity/singularity_3.rsi/singularity_3.png b/Resources/Textures/Constructible/Power/Singularity/singularity_3.rsi/singularity_3.png similarity index 100% rename from Resources/Textures/Effects/Singularity/singularity_3.rsi/singularity_3.png rename to Resources/Textures/Constructible/Power/Singularity/singularity_3.rsi/singularity_3.png diff --git a/Resources/Textures/Effects/Singularity/singularity_4.rsi/meta.json b/Resources/Textures/Constructible/Power/Singularity/singularity_4.rsi/meta.json similarity index 100% rename from Resources/Textures/Effects/Singularity/singularity_4.rsi/meta.json rename to Resources/Textures/Constructible/Power/Singularity/singularity_4.rsi/meta.json diff --git a/Resources/Textures/Effects/Singularity/singularity_4.rsi/singularity_4.png b/Resources/Textures/Constructible/Power/Singularity/singularity_4.rsi/singularity_4.png similarity index 100% rename from Resources/Textures/Effects/Singularity/singularity_4.rsi/singularity_4.png rename to Resources/Textures/Constructible/Power/Singularity/singularity_4.rsi/singularity_4.png diff --git a/Resources/Textures/Effects/Singularity/singularity_5.rsi/meta.json b/Resources/Textures/Constructible/Power/Singularity/singularity_5.rsi/meta.json similarity index 100% rename from Resources/Textures/Effects/Singularity/singularity_5.rsi/meta.json rename to Resources/Textures/Constructible/Power/Singularity/singularity_5.rsi/meta.json diff --git a/Resources/Textures/Effects/Singularity/singularity_5.rsi/singularity_5.png b/Resources/Textures/Constructible/Power/Singularity/singularity_5.rsi/singularity_5.png similarity index 100% rename from Resources/Textures/Effects/Singularity/singularity_5.rsi/singularity_5.png rename to Resources/Textures/Constructible/Power/Singularity/singularity_5.rsi/singularity_5.png diff --git a/Resources/Textures/Effects/Singularity/singularity_6.rsi/meta.json b/Resources/Textures/Constructible/Power/Singularity/singularity_6.rsi/meta.json similarity index 100% rename from Resources/Textures/Effects/Singularity/singularity_6.rsi/meta.json rename to Resources/Textures/Constructible/Power/Singularity/singularity_6.rsi/meta.json diff --git a/Resources/Textures/Effects/Singularity/singularity_6.rsi/singularity_6.png b/Resources/Textures/Constructible/Power/Singularity/singularity_6.rsi/singularity_6.png similarity index 100% rename from Resources/Textures/Effects/Singularity/singularity_6.rsi/singularity_6.png rename to Resources/Textures/Constructible/Power/Singularity/singularity_6.rsi/singularity_6.png diff --git a/Resources/Textures/Constructible/Power/emitter.rsi/meta.json b/Resources/Textures/Constructible/Power/emitter.rsi/meta.json deleted file mode 100644 index a880d0e5b6..0000000000 --- a/Resources/Textures/Constructible/Power/emitter.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version":1,"size":{"x":32,"y":32},"license":"CC-BY-SA-3.0","copyright":"Taken from https://github.com/tgstation/tgstation","states":[{"name":"emitter-beam","directions":4,"delays":[[0.1],[0.1],[0.1],[0.1]]},{"name":"emitter-underpowered","directions":4,"delays":[[0.1,0.1],[0.1,0.1],[0.1,0.1],[0.1,0.1]]},{"name":"emitter-lock","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"emitter0","directions":4,"delays":[[0.1],[0.1],[0.1],[0.1]]},{"name":"emitter1","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"emitter2","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"emitter_projectile","directions":1,"delays":[[1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Constructible/Power/field_generator.rsi/meta.json b/Resources/Textures/Constructible/Power/field_generator.rsi/meta.json deleted file mode 100644 index 5850bdbd5c..0000000000 --- a/Resources/Textures/Constructible/Power/field_generator.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/tgstation/tgstation", "states": [{"name": "+a1", "delays": [[1.0]]}, {"name": "+a2", "delays": [[1.0]]}, {"name": "+a3", "delays": [[1.0]]}, {"name": "+on", "delays": [[1.0]]}, {"name": "+p1", "delays": [[1.0]]}, {"name": "+p2", "delays": [[1.0]]}, {"name": "+p3", "delays": [[1.0]]}, {"name": "+p4", "delays": [[1.0]]}, {"name": "+p5", "delays": [[1.0]]}, {"name": "+p6", "delays": [[1.0]]}, {"name": "Field_Gen", "delays": [[1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Constructible/Power/radiation_collector.rsi/meta.json b/Resources/Textures/Constructible/Power/radiation_collector.rsi/meta.json deleted file mode 100644 index 67dfc428d1..0000000000 --- a/Resources/Textures/Constructible/Power/radiation_collector.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/goonstation/goonstation-2020", "states": [{"name": "ca_off", "delays": [[1.0]]}, {"name": "ca_on", "delays": [[1.0]]}, {"name": "ca_active", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "ca_deactive", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "cu", "delays": [[1.0]]}]} diff --git a/Resources/Textures/Effects/Singularity/singulo_gen.rsi/meta.json b/Resources/Textures/Effects/Singularity/singulo_gen.rsi/meta.json deleted file mode 100644 index 7edbcf5edc..0000000000 --- a/Resources/Textures/Effects/Singularity/singulo_gen.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version":1,"size":{"x":32,"y":32},"copyright":"Taken from https://github.com/vgstation-coders/vgstation13/blob/68357f0b64a296d122ff1bdb2f13e9b0cb04a003/icons/obj/singularity.dmi","license":"CC-BY-SA-3.0","states":[{"name":"singulo_gen","directions":1,"delays":[[1]]}]} diff --git a/Resources/Textures/Effects/contain_f.rsi/meta.json b/Resources/Textures/Effects/contain_f.rsi/meta.json deleted file mode 100644 index 1603277d1d..0000000000 --- a/Resources/Textures/Effects/contain_f.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/tgstation/tgstation", "states": [{"name": "Contain_F", "directions": 4, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}]} \ No newline at end of file