From c9057d01ae5674550d891898adc07c072cddf686 Mon Sep 17 00:00:00 2001 From: DrSmugleaf Date: Thu, 23 Jul 2020 00:56:53 +0200 Subject: [PATCH] Remove 2D suffix from visualizers (#1453) --- ...rVisualizer2D.cs => ComputerVisualizer.cs} | 2 +- ...ckVisualizer2D.cs => AirlockVisualizer.cs} | 8 ++-- ...lizer2D.cs => MedicalScannerVisualizer.cs} | 2 +- ...esVisualizer2D.cs => SpeciesVisualizer.cs} | 2 +- ...lizer2D.cs => HandTeleporterVisualizer.cs} | 2 +- ...talVisualizer2D.cs => PortalVisualizer.cs} | 2 +- .../DrinkFoodContainerVisualizer2D.cs | 2 +- ...Visualizer2D.cs => DrinkFoodVisualizer.cs} | 2 +- .../{ApcVisualizer2D.cs => ApcVisualizer.cs} | 2 +- ...Visualizer2D.cs => AutolatheVisualizer.cs} | 2 +- ...Visualizer2D.cs => PowerCellVisualizer.cs} | 2 +- ...ualizer2D.cs => PowerChargerVisualizer.cs} | 2 +- ...sualizer2D.cs => PowerDeviceVisualizer.cs} | 2 +- ...isualizer2D.cs => ProtolatheVisualizer.cs} | 2 +- ...{SmesVisualizer2D.cs => SmesVisualizer.cs} | 2 +- ...geVisualizer2D.cs => StorageVisualizer.cs} | 2 +- ...ualizer2D.cs => TimerTriggerVisualizer.cs} | 2 +- ...lizer2D.cs => VendingMachineVisualizer.cs} | 2 +- ...isualizer2D.cs => BarrelBoltVisualizer.cs} | 6 +-- .../{MagVisualizer2D.cs => MagVisualizer.cs} | 10 ++--- ...Visualizer2D.cs => SpentAmmoVisualizer.cs} | 4 +- ...iresVisualizer2D.cs => WiresVisualizer.cs} | 2 +- .../Constructible/Doors/airlock_base.yml | 4 +- .../Constructible/Doors/airlock_types.yml | 4 +- .../Entities/Constructible/Power/arcade.yml | 6 +-- .../Constructible/Power/computers.yml | 30 ++++++------- .../Entities/Constructible/Power/lathe.yml | 4 +- .../Constructible/Power/medical_scanner.yml | 2 +- .../Entities/Constructible/Power/power.yml | 14 +++---- .../Entities/Constructible/Power/research.yml | 2 +- .../Constructible/Power/vending_machines.yml | 4 +- .../Storage/Closets/Secure/bar.yml | 2 +- .../Storage/Closets/Secure/cargo.yml | 2 +- .../Storage/Closets/Secure/command.yml | 4 +- .../Storage/Closets/Secure/engineering.yml | 10 ++--- .../Storage/Closets/Secure/freezer.yml | 2 +- .../Storage/Closets/Secure/hydroponics.yml | 2 +- .../Storage/Closets/Secure/medical.yml | 8 ++-- .../Storage/Closets/Secure/scientist.yml | 2 +- .../Storage/Closets/Secure/security.yml | 6 +-- .../Constructible/Storage/Closets/closet.yml | 2 +- .../Storage/Closets/job_closests.yml | 4 +- .../Storage/Closets/l3closet.yml | 8 ++-- .../Storage/Closets/syndicate.yml | 2 +- .../Storage/Closets/utility_closets.yml | 10 ++--- .../Storage/Closets/wardrobe.yml | 18 ++++---- .../Constructible/Storage/crate_base.yml | 2 +- .../Constructible/Storage/crate_types.yml | 12 +++--- .../Entities/Mobs/Species/human.yml | 4 +- .../Entities/Objects/Consumable/drinks.yml | 4 +- .../Objects/Consumable/drinks_cups.yml | 24 +++++------ .../Entities/Objects/Consumable/food.yml | 2 +- .../Objects/Consumable/food_containers.yml | 6 +-- .../Prototypes/Entities/Objects/Fun/toys.yml | 2 +- .../Entities/Objects/Misc/teleporters.yml | 4 +- .../Entities/Objects/Power/powercells.yml | 14 +++---- .../Guns/Ammunition/AntiMaterial/boxes.yml | 6 +-- .../Ammunition/AntiMaterial/cartridges.yml | 2 +- .../Weapons/Guns/Ammunition/ClRifle/boxes.yml | 8 ++-- .../Guns/Ammunition/ClRifle/magazines.yml | 12 +++--- .../Guns/Ammunition/Explosives/ammunition.yml | 8 ++-- .../Weapons/Guns/Ammunition/LRifle/boxes.yml | 2 +- .../Guns/Ammunition/LRifle/magazines.yml | 8 ++-- .../Guns/Ammunition/LRifle/speed_loaders.yml | 4 +- .../Weapons/Guns/Ammunition/Magnum/boxes.yml | 2 +- .../Guns/Ammunition/Magnum/magazines.yml | 8 ++-- .../Guns/Ammunition/Magnum/speed_loaders.yml | 2 +- .../Weapons/Guns/Ammunition/Pistol/boxes.yml | 2 +- .../Guns/Ammunition/Pistol/magazines.yml | 8 ++-- .../Guns/Ammunition/Pistol/speed_loaders.yml | 2 +- .../Weapons/Guns/Ammunition/SRifle/boxes.yml | 2 +- .../Guns/Ammunition/SRifle/magazines.yml | 4 +- .../Guns/Ammunition/Shotgun/cartridges.yml | 2 +- .../Guns/Ammunition/Shotgun/magazines.yml | 4 +- .../Guns/Ammunition/Toy/speedloaders.yml | 2 +- .../Weapons/Guns/Battery/battery_guns.yml | 8 ++-- .../Weapons/Guns/Explosives/grenades.yml | 6 +-- .../Objects/Weapons/Guns/LMGs/lmgs.yml | 8 ++-- .../Weapons/Guns/Launchers/launchers.yml | 4 +- .../Objects/Weapons/Guns/Pistols/pistols.yml | 42 +++++++++---------- .../Weapons/Guns/Revolvers/revolvers.yml | 4 +- .../Objects/Weapons/Guns/Rifles/rifles.yml | 36 ++++++++-------- .../Objects/Weapons/Guns/SMGs/smgs.yml | 34 +++++++-------- .../Weapons/Guns/Shotguns/shotguns.yml | 12 +++--- .../Objects/Weapons/Guns/Snipers/snipers.yml | 6 +-- 85 files changed, 269 insertions(+), 269 deletions(-) rename Content.Client/GameObjects/Components/{ComputerVisualizer2D.cs => ComputerVisualizer.cs} (97%) rename Content.Client/GameObjects/Components/Doors/{AirlockVisualizer2D.cs => AirlockVisualizer.cs} (96%) rename Content.Client/GameObjects/Components/MedicalScanner/{MedicalScannerVisualizer2D.cs => MedicalScannerVisualizer.cs} (97%) rename Content.Client/GameObjects/Components/Mobs/{SpeciesVisualizer2D.cs => SpeciesVisualizer.cs} (97%) rename Content.Client/GameObjects/Components/Movement/{HandTeleporterVisualizer2D.cs => HandTeleporterVisualizer.cs} (93%) rename Content.Client/GameObjects/Components/Movement/{PortalVisualizer2D.cs => PortalVisualizer.cs} (96%) rename Content.Client/GameObjects/Components/Nutrition/{DrinkFoodVisualizer2D.cs => DrinkFoodVisualizer.cs} (94%) rename Content.Client/GameObjects/Components/Power/{ApcVisualizer2D.cs => ApcVisualizer.cs} (97%) rename Content.Client/GameObjects/Components/Power/{AutolatheVisualizer2D.cs => AutolatheVisualizer.cs} (98%) rename Content.Client/GameObjects/Components/Power/{PowerCellVisualizer2D.cs => PowerCellVisualizer.cs} (95%) rename Content.Client/GameObjects/Components/Power/{PowerChargerVisualizer2D.cs => PowerChargerVisualizer.cs} (97%) rename Content.Client/GameObjects/Components/Power/{PowerDeviceVisualizer2D.cs => PowerDeviceVisualizer.cs} (91%) rename Content.Client/GameObjects/Components/Power/{ProtolatheVisualizer2D.cs => ProtolatheVisualizer.cs} (98%) rename Content.Client/GameObjects/Components/Power/{SmesVisualizer2D.cs => SmesVisualizer.cs} (97%) rename Content.Client/GameObjects/Components/Storage/{StorageVisualizer2D.cs => StorageVisualizer.cs} (97%) rename Content.Client/GameObjects/Components/Trigger/{TimerTriggerVisualizer2D.cs => TimerTriggerVisualizer.cs} (97%) rename Content.Client/GameObjects/Components/VendingMachines/{VendingMachineVisualizer2D.cs => VendingMachineVisualizer.cs} (98%) rename Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/{BarrelBoltVisualizer2D.cs => BarrelBoltVisualizer.cs} (93%) rename Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/{MagVisualizer2D.cs => MagVisualizer.cs} (97%) rename Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/{SpentAmmoVisualizer2D.cs => SpentAmmoVisualizer.cs} (91%) rename Content.Client/GameObjects/Components/Wires/{WiresVisualizer2D.cs => WiresVisualizer.cs} (92%) diff --git a/Content.Client/GameObjects/Components/ComputerVisualizer2D.cs b/Content.Client/GameObjects/Components/ComputerVisualizer.cs similarity index 97% rename from Content.Client/GameObjects/Components/ComputerVisualizer2D.cs rename to Content.Client/GameObjects/Components/ComputerVisualizer.cs index 84998bbc22..0e1ad20dd7 100644 --- a/Content.Client/GameObjects/Components/ComputerVisualizer2D.cs +++ b/Content.Client/GameObjects/Components/ComputerVisualizer.cs @@ -7,7 +7,7 @@ using YamlDotNet.RepresentationModel; namespace Content.Client.GameObjects.Components { - public sealed class ComputerVisualizer2D : AppearanceVisualizer + public sealed class ComputerVisualizer : AppearanceVisualizer { private string KeyboardState = "generic_key"; private string ScreenState = "generic"; diff --git a/Content.Client/GameObjects/Components/Doors/AirlockVisualizer2D.cs b/Content.Client/GameObjects/Components/Doors/AirlockVisualizer.cs similarity index 96% rename from Content.Client/GameObjects/Components/Doors/AirlockVisualizer2D.cs rename to Content.Client/GameObjects/Components/Doors/AirlockVisualizer.cs index 2b530c70b8..622e9d0c23 100644 --- a/Content.Client/GameObjects/Components/Doors/AirlockVisualizer2D.cs +++ b/Content.Client/GameObjects/Components/Doors/AirlockVisualizer.cs @@ -12,7 +12,7 @@ using YamlDotNet.RepresentationModel; namespace Content.Client.GameObjects.Components.Doors { - public class AirlockVisualizer2D : AppearanceVisualizer + public class AirlockVisualizer : AppearanceVisualizer { private const string AnimationKey = "airlock_animation"; @@ -42,7 +42,7 @@ namespace Content.Client.GameObjects.Components.Doors var flickMaintenancePanel = new AnimationTrackSpriteFlick(); CloseAnimation.AnimationTracks.Add(flickMaintenancePanel); - flickMaintenancePanel.LayerKey = WiresVisualizer2D.WiresVisualLayers.MaintenancePanel; + flickMaintenancePanel.LayerKey = WiresVisualizer.WiresVisualLayers.MaintenancePanel; flickMaintenancePanel.KeyFrames.Add(new AnimationTrackSpriteFlick.KeyFrame("panel_closing", 0f)); var sound = new AnimationTrackPlaySound(); @@ -64,7 +64,7 @@ namespace Content.Client.GameObjects.Components.Doors var flickMaintenancePanel = new AnimationTrackSpriteFlick(); OpenAnimation.AnimationTracks.Add(flickMaintenancePanel); - flickMaintenancePanel.LayerKey = WiresVisualizer2D.WiresVisualLayers.MaintenancePanel; + flickMaintenancePanel.LayerKey = WiresVisualizer.WiresVisualLayers.MaintenancePanel; flickMaintenancePanel.KeyFrames.Add(new AnimationTrackSpriteFlick.KeyFrame("panel_opening", 0f)); var sound = new AnimationTrackPlaySound(); @@ -113,7 +113,7 @@ namespace Content.Client.GameObjects.Components.Doors sprite.LayerSetState(DoorVisualLayers.Base, "closed"); sprite.LayerSetState(DoorVisualLayers.BaseUnlit, "closed_unlit"); sprite.LayerSetState(DoorVisualLayers.BaseBolted, "bolted"); - sprite.LayerSetState(WiresVisualizer2D.WiresVisualLayers.MaintenancePanel, "panel_open"); + sprite.LayerSetState(WiresVisualizer.WiresVisualLayers.MaintenancePanel, "panel_open"); break; case DoorVisualState.Closing: if (!animPlayer.HasRunningAnimation(AnimationKey)) diff --git a/Content.Client/GameObjects/Components/MedicalScanner/MedicalScannerVisualizer2D.cs b/Content.Client/GameObjects/Components/MedicalScanner/MedicalScannerVisualizer.cs similarity index 97% rename from Content.Client/GameObjects/Components/MedicalScanner/MedicalScannerVisualizer2D.cs rename to Content.Client/GameObjects/Components/MedicalScanner/MedicalScannerVisualizer.cs index 7865c3d8ed..e795f3f395 100644 --- a/Content.Client/GameObjects/Components/MedicalScanner/MedicalScannerVisualizer2D.cs +++ b/Content.Client/GameObjects/Components/MedicalScanner/MedicalScannerVisualizer.cs @@ -6,7 +6,7 @@ using static Content.Shared.GameObjects.Components.Medical.SharedMedicalScannerC namespace Content.Client.GameObjects.Components.MedicalScanner { - public class MedicalScannerVisualizer2D : AppearanceVisualizer + public class MedicalScannerVisualizer : AppearanceVisualizer { public override void OnChangeData(AppearanceComponent component) { diff --git a/Content.Client/GameObjects/Components/Mobs/SpeciesVisualizer2D.cs b/Content.Client/GameObjects/Components/Mobs/SpeciesVisualizer.cs similarity index 97% rename from Content.Client/GameObjects/Components/Mobs/SpeciesVisualizer2D.cs rename to Content.Client/GameObjects/Components/Mobs/SpeciesVisualizer.cs index cfd7e09596..cc2e60b92e 100644 --- a/Content.Client/GameObjects/Components/Mobs/SpeciesVisualizer2D.cs +++ b/Content.Client/GameObjects/Components/Mobs/SpeciesVisualizer.cs @@ -9,7 +9,7 @@ using Robust.Shared.Maths; namespace Content.Client.GameObjects.Components.Mobs { - public class SpeciesVisualizer2D : AppearanceVisualizer + public class SpeciesVisualizer : AppearanceVisualizer { public override void OnChangeData(AppearanceComponent component) { diff --git a/Content.Client/GameObjects/Components/Movement/HandTeleporterVisualizer2D.cs b/Content.Client/GameObjects/Components/Movement/HandTeleporterVisualizer.cs similarity index 93% rename from Content.Client/GameObjects/Components/Movement/HandTeleporterVisualizer2D.cs rename to Content.Client/GameObjects/Components/Movement/HandTeleporterVisualizer.cs index 06b67654ce..8214028483 100644 --- a/Content.Client/GameObjects/Components/Movement/HandTeleporterVisualizer2D.cs +++ b/Content.Client/GameObjects/Components/Movement/HandTeleporterVisualizer.cs @@ -7,7 +7,7 @@ using Robust.Client.Interfaces.GameObjects.Components; namespace Content.Client.GameObjects.Components.Movement { [UsedImplicitly] - public class HandTeleporterVisualizer2D : AppearanceVisualizer + public class HandTeleporterVisualizer : AppearanceVisualizer { public override void OnChangeData(AppearanceComponent component) diff --git a/Content.Client/GameObjects/Components/Movement/PortalVisualizer2D.cs b/Content.Client/GameObjects/Components/Movement/PortalVisualizer.cs similarity index 96% rename from Content.Client/GameObjects/Components/Movement/PortalVisualizer2D.cs rename to Content.Client/GameObjects/Components/Movement/PortalVisualizer.cs index a2eed9a340..6ce70fc2a3 100644 --- a/Content.Client/GameObjects/Components/Movement/PortalVisualizer2D.cs +++ b/Content.Client/GameObjects/Components/Movement/PortalVisualizer.cs @@ -7,7 +7,7 @@ using Robust.Shared.Interfaces.GameObjects; namespace Content.Client.GameObjects.Components.Movement { [UsedImplicitly] - public class PortalVisualizer2D : AppearanceVisualizer + public class PortalVisualizer : AppearanceVisualizer { public override void InitializeEntity(IEntity entity) { diff --git a/Content.Client/GameObjects/Components/Nutrition/DrinkFoodContainerVisualizer2D.cs b/Content.Client/GameObjects/Components/Nutrition/DrinkFoodContainerVisualizer2D.cs index 52a6653924..2e84fc415e 100644 --- a/Content.Client/GameObjects/Components/Nutrition/DrinkFoodContainerVisualizer2D.cs +++ b/Content.Client/GameObjects/Components/Nutrition/DrinkFoodContainerVisualizer2D.cs @@ -11,7 +11,7 @@ using YamlDotNet.RepresentationModel; namespace Content.Client.GameObjects.Components.Nutrition { [UsedImplicitly] - public sealed class FoodContainerVisualizer2D : AppearanceVisualizer + public sealed class FoodContainerVisualizer : AppearanceVisualizer { private string _baseState; private int _steps; diff --git a/Content.Client/GameObjects/Components/Nutrition/DrinkFoodVisualizer2D.cs b/Content.Client/GameObjects/Components/Nutrition/DrinkFoodVisualizer.cs similarity index 94% rename from Content.Client/GameObjects/Components/Nutrition/DrinkFoodVisualizer2D.cs rename to Content.Client/GameObjects/Components/Nutrition/DrinkFoodVisualizer.cs index fa76df73dd..caef972db0 100644 --- a/Content.Client/GameObjects/Components/Nutrition/DrinkFoodVisualizer2D.cs +++ b/Content.Client/GameObjects/Components/Nutrition/DrinkFoodVisualizer.cs @@ -9,7 +9,7 @@ using YamlDotNet.RepresentationModel; namespace Content.Client.GameObjects.Components.Nutrition { [UsedImplicitly] - public sealed class DrinkFoodVisualizer2D : AppearanceVisualizer + public sealed class DrinkFoodVisualizer : AppearanceVisualizer { private int _steps; diff --git a/Content.Client/GameObjects/Components/Power/ApcVisualizer2D.cs b/Content.Client/GameObjects/Components/Power/ApcVisualizer.cs similarity index 97% rename from Content.Client/GameObjects/Components/Power/ApcVisualizer2D.cs rename to Content.Client/GameObjects/Components/Power/ApcVisualizer.cs index 098636ae70..2c078f03dc 100644 --- a/Content.Client/GameObjects/Components/Power/ApcVisualizer2D.cs +++ b/Content.Client/GameObjects/Components/Power/ApcVisualizer.cs @@ -5,7 +5,7 @@ using Robust.Shared.Interfaces.GameObjects; namespace Content.Client.GameObjects.Components.Power { - public class ApcVisualizer2D : AppearanceVisualizer + public class ApcVisualizer : AppearanceVisualizer { public override void InitializeEntity(IEntity entity) { diff --git a/Content.Client/GameObjects/Components/Power/AutolatheVisualizer2D.cs b/Content.Client/GameObjects/Components/Power/AutolatheVisualizer.cs similarity index 98% rename from Content.Client/GameObjects/Components/Power/AutolatheVisualizer2D.cs rename to Content.Client/GameObjects/Components/Power/AutolatheVisualizer.cs index 21a22f9569..e952fead3f 100644 --- a/Content.Client/GameObjects/Components/Power/AutolatheVisualizer2D.cs +++ b/Content.Client/GameObjects/Components/Power/AutolatheVisualizer.cs @@ -9,7 +9,7 @@ using YamlDotNet.RepresentationModel; namespace Content.Client.GameObjects.Components.Power { - public class AutolatheVisualizer2D : AppearanceVisualizer + public class AutolatheVisualizer : AppearanceVisualizer { private const string AnimationKey = "autolathe_animation"; diff --git a/Content.Client/GameObjects/Components/Power/PowerCellVisualizer2D.cs b/Content.Client/GameObjects/Components/Power/PowerCellVisualizer.cs similarity index 95% rename from Content.Client/GameObjects/Components/Power/PowerCellVisualizer2D.cs rename to Content.Client/GameObjects/Components/Power/PowerCellVisualizer.cs index 6bb18d2d44..71b4d81ff7 100644 --- a/Content.Client/GameObjects/Components/Power/PowerCellVisualizer2D.cs +++ b/Content.Client/GameObjects/Components/Power/PowerCellVisualizer.cs @@ -8,7 +8,7 @@ using YamlDotNet.RepresentationModel; namespace Content.Client.GameObjects.Components.Power { - public class PowerCellVisualizer2D : AppearanceVisualizer + public class PowerCellVisualizer : AppearanceVisualizer { private string _prefix; diff --git a/Content.Client/GameObjects/Components/Power/PowerChargerVisualizer2D.cs b/Content.Client/GameObjects/Components/Power/PowerChargerVisualizer.cs similarity index 97% rename from Content.Client/GameObjects/Components/Power/PowerChargerVisualizer2D.cs rename to Content.Client/GameObjects/Components/Power/PowerChargerVisualizer.cs index 7c9085941f..32bb1126c8 100644 --- a/Content.Client/GameObjects/Components/Power/PowerChargerVisualizer2D.cs +++ b/Content.Client/GameObjects/Components/Power/PowerChargerVisualizer.cs @@ -7,7 +7,7 @@ using Robust.Shared.Interfaces.GameObjects; namespace Content.Client.GameObjects.Components.Power { [UsedImplicitly] - public class PowerChargerVisualizer2D : AppearanceVisualizer + public class PowerChargerVisualizer : AppearanceVisualizer { public override void InitializeEntity(IEntity entity) { diff --git a/Content.Client/GameObjects/Components/Power/PowerDeviceVisualizer2D.cs b/Content.Client/GameObjects/Components/Power/PowerDeviceVisualizer.cs similarity index 91% rename from Content.Client/GameObjects/Components/Power/PowerDeviceVisualizer2D.cs rename to Content.Client/GameObjects/Components/Power/PowerDeviceVisualizer.cs index b9c7d2cf40..4b6e64ef70 100644 --- a/Content.Client/GameObjects/Components/Power/PowerDeviceVisualizer2D.cs +++ b/Content.Client/GameObjects/Components/Power/PowerDeviceVisualizer.cs @@ -6,7 +6,7 @@ using Robust.Client.Interfaces.GameObjects.Components; namespace Content.Client.GameObjects.Components.Power { [UsedImplicitly] - public class PowerDeviceVisualizer2D : AppearanceVisualizer + public class PowerDeviceVisualizer : AppearanceVisualizer { public override void OnChangeData(AppearanceComponent component) { diff --git a/Content.Client/GameObjects/Components/Power/ProtolatheVisualizer2D.cs b/Content.Client/GameObjects/Components/Power/ProtolatheVisualizer.cs similarity index 98% rename from Content.Client/GameObjects/Components/Power/ProtolatheVisualizer2D.cs rename to Content.Client/GameObjects/Components/Power/ProtolatheVisualizer.cs index 5049757bba..76292302b6 100644 --- a/Content.Client/GameObjects/Components/Power/ProtolatheVisualizer2D.cs +++ b/Content.Client/GameObjects/Components/Power/ProtolatheVisualizer.cs @@ -9,7 +9,7 @@ using YamlDotNet.RepresentationModel; namespace Content.Client.GameObjects.Components.Power { - public class ProtolatheVisualizer2D : AppearanceVisualizer + public class ProtolatheVisualizer : AppearanceVisualizer { private const string AnimationKey = "protolathe_animation"; diff --git a/Content.Client/GameObjects/Components/Power/SmesVisualizer2D.cs b/Content.Client/GameObjects/Components/Power/SmesVisualizer.cs similarity index 97% rename from Content.Client/GameObjects/Components/Power/SmesVisualizer2D.cs rename to Content.Client/GameObjects/Components/Power/SmesVisualizer.cs index 710b113cf7..f03b3793b5 100644 --- a/Content.Client/GameObjects/Components/Power/SmesVisualizer2D.cs +++ b/Content.Client/GameObjects/Components/Power/SmesVisualizer.cs @@ -5,7 +5,7 @@ using Robust.Shared.Interfaces.GameObjects; namespace Content.Client.GameObjects.Components.Power { - public class SmesVisualizer2D : AppearanceVisualizer + public class SmesVisualizer : AppearanceVisualizer { public override void InitializeEntity(IEntity entity) { diff --git a/Content.Client/GameObjects/Components/Storage/StorageVisualizer2D.cs b/Content.Client/GameObjects/Components/Storage/StorageVisualizer.cs similarity index 97% rename from Content.Client/GameObjects/Components/Storage/StorageVisualizer2D.cs rename to Content.Client/GameObjects/Components/Storage/StorageVisualizer.cs index e9cfe3e356..926d4e5c7a 100644 --- a/Content.Client/GameObjects/Components/Storage/StorageVisualizer2D.cs +++ b/Content.Client/GameObjects/Components/Storage/StorageVisualizer.cs @@ -7,7 +7,7 @@ using YamlDotNet.RepresentationModel; namespace Content.Client.GameObjects.Components.Storage { - public sealed class StorageVisualizer2D : AppearanceVisualizer + public sealed class StorageVisualizer : AppearanceVisualizer { private string _stateBase; private string _stateOpen; diff --git a/Content.Client/GameObjects/Components/Trigger/TimerTriggerVisualizer2D.cs b/Content.Client/GameObjects/Components/Trigger/TimerTriggerVisualizer.cs similarity index 97% rename from Content.Client/GameObjects/Components/Trigger/TimerTriggerVisualizer2D.cs rename to Content.Client/GameObjects/Components/Trigger/TimerTriggerVisualizer.cs index bc439ae632..76bce4a420 100644 --- a/Content.Client/GameObjects/Components/Trigger/TimerTriggerVisualizer2D.cs +++ b/Content.Client/GameObjects/Components/Trigger/TimerTriggerVisualizer.cs @@ -10,7 +10,7 @@ using YamlDotNet.RepresentationModel; namespace Content.Client.GameObjects.Components.Doors { - public class TimerTriggerVisualizer2D : AppearanceVisualizer + public class TimerTriggerVisualizer : AppearanceVisualizer { private const string AnimationKey = "priming_animation"; diff --git a/Content.Client/GameObjects/Components/VendingMachines/VendingMachineVisualizer2D.cs b/Content.Client/GameObjects/Components/VendingMachines/VendingMachineVisualizer.cs similarity index 98% rename from Content.Client/GameObjects/Components/VendingMachines/VendingMachineVisualizer2D.cs rename to Content.Client/GameObjects/Components/VendingMachines/VendingMachineVisualizer.cs index 1833b86953..0f052ef173 100644 --- a/Content.Client/GameObjects/Components/VendingMachines/VendingMachineVisualizer2D.cs +++ b/Content.Client/GameObjects/Components/VendingMachines/VendingMachineVisualizer.cs @@ -9,7 +9,7 @@ using static Content.Shared.GameObjects.Components.VendingMachines.SharedVending namespace Content.Client.GameObjects.Components.VendingMachines { - public class VendingMachineVisualizer2D : AppearanceVisualizer + public class VendingMachineVisualizer : AppearanceVisualizer { // TODO: The length of these animations is supposed to be dictated // by the vending machine's pack prototype's `AnimationDuration` diff --git a/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/BarrelBoltVisualizer2D.cs b/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/BarrelBoltVisualizer.cs similarity index 93% rename from Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/BarrelBoltVisualizer2D.cs rename to Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/BarrelBoltVisualizer.cs index 3a074f0c97..4c2f8d0131 100644 --- a/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/BarrelBoltVisualizer2D.cs +++ b/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/BarrelBoltVisualizer.cs @@ -7,7 +7,7 @@ using Robust.Shared.Interfaces.GameObjects; namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels.Visualizers { [UsedImplicitly] - public sealed class BarrelBoltVisualizer2D : AppearanceVisualizer + public sealed class BarrelBoltVisualizer : AppearanceVisualizer { public override void InitializeEntity(IEntity entity) { @@ -19,7 +19,7 @@ namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels.Visualize public override void OnChangeData(AppearanceComponent component) { var sprite = component.Owner.GetComponent(); - + if (!component.TryGetData(BarrelBoltVisuals.BoltOpen, out bool boltOpen)) { return; @@ -35,4 +35,4 @@ namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels.Visualize } } } -} \ No newline at end of file +} diff --git a/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/MagVisualizer2D.cs b/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/MagVisualizer.cs similarity index 97% rename from Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/MagVisualizer2D.cs rename to Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/MagVisualizer.cs index 9d087c2505..f370e47681 100644 --- a/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/MagVisualizer2D.cs +++ b/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/MagVisualizer.cs @@ -10,7 +10,7 @@ using YamlDotNet.RepresentationModel; namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels.Visualizers { [UsedImplicitly] - public sealed class MagVisualizer2D : AppearanceVisualizer + public sealed class MagVisualizer : AppearanceVisualizer { private bool _magLoaded; private string _magState; @@ -63,7 +63,7 @@ namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels.Visualize { return; } - + var step = ContentHelpers.RoundToLevels(current, capacity, _magSteps); if (step == 0 && !_zeroVisible) @@ -72,7 +72,7 @@ namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels.Visualize { sprite.LayerSetVisible(RangedBarrelVisualLayers.Mag, false); } - + if (sprite.LayerMapTryGet(RangedBarrelVisualLayers.MagUnshaded, out _)) { sprite.LayerSetVisible(RangedBarrelVisualLayers.MagUnshaded, false); @@ -99,7 +99,7 @@ namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels.Visualize { sprite.LayerSetVisible(RangedBarrelVisualLayers.Mag, false); } - + if (sprite.LayerMapTryGet(RangedBarrelVisualLayers.MagUnshaded, out _)) { sprite.LayerSetVisible(RangedBarrelVisualLayers.MagUnshaded, false); @@ -107,4 +107,4 @@ namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels.Visualize } } } -} \ No newline at end of file +} diff --git a/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/SpentAmmoVisualizer2D.cs b/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/SpentAmmoVisualizer.cs similarity index 91% rename from Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/SpentAmmoVisualizer2D.cs rename to Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/SpentAmmoVisualizer.cs index 329f085660..cc8dd51679 100644 --- a/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/SpentAmmoVisualizer2D.cs +++ b/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/SpentAmmoVisualizer.cs @@ -6,7 +6,7 @@ using Robust.Client.Interfaces.GameObjects.Components; namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels.Visualizers { [UsedImplicitly] - public sealed class SpentAmmoVisualizer2D : AppearanceVisualizer + public sealed class SpentAmmoVisualizer : AppearanceVisualizer { public override void OnChangeData(AppearanceComponent component) { @@ -26,4 +26,4 @@ namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels.Visualize { Base, } -} \ No newline at end of file +} diff --git a/Content.Client/GameObjects/Components/Wires/WiresVisualizer2D.cs b/Content.Client/GameObjects/Components/Wires/WiresVisualizer.cs similarity index 92% rename from Content.Client/GameObjects/Components/Wires/WiresVisualizer2D.cs rename to Content.Client/GameObjects/Components/Wires/WiresVisualizer.cs index 5038f7fdf6..b914242184 100644 --- a/Content.Client/GameObjects/Components/Wires/WiresVisualizer2D.cs +++ b/Content.Client/GameObjects/Components/Wires/WiresVisualizer.cs @@ -4,7 +4,7 @@ using static Content.Shared.GameObjects.Components.SharedWiresComponent; namespace Content.Client.GameObjects.Components.Wires { - public class WiresVisualizer2D : AppearanceVisualizer + public class WiresVisualizer : AppearanceVisualizer { public override void OnChangeData(AppearanceComponent component) { diff --git a/Resources/Prototypes/Entities/Constructible/Doors/airlock_base.yml b/Resources/Prototypes/Entities/Constructible/Doors/airlock_base.yml index 49811976d8..1e509147e0 100644 --- a/Resources/Prototypes/Entities/Constructible/Doors/airlock_base.yml +++ b/Resources/Prototypes/Entities/Constructible/Doors/airlock_base.yml @@ -38,11 +38,11 @@ - type: Airlock - type: Appearance visuals: - - type: AirlockVisualizer2D + - type: AirlockVisualizer open_sound: /Audio/Machines/airlock_open.ogg close_sound: /Audio/Machines/airlock_close.ogg deny_sound: /Audio/Machines/airlock_deny.ogg - - type: WiresVisualizer2D + - type: WiresVisualizer - type: PowerReceiver - type: Wires BoardName: "Airlock Control" diff --git a/Resources/Prototypes/Entities/Constructible/Doors/airlock_types.yml b/Resources/Prototypes/Entities/Constructible/Doors/airlock_types.yml index 13ad8150a5..77af217d4a 100644 --- a/Resources/Prototypes/Entities/Constructible/Doors/airlock_types.yml +++ b/Resources/Prototypes/Entities/Constructible/Doors/airlock_types.yml @@ -10,11 +10,11 @@ sprite: Constructible/Structures/Doors/airlock_external.rsi - type: Appearance visuals: - - type: AirlockVisualizer2D + - type: AirlockVisualizer open_sound: /Audio/Machines/airlock_ext_open.ogg close_sound: /Audio/Machines/airlock_ext_close.ogg deny_sound: /Audio/Machines/airlock_deny.ogg - - type: WiresVisualizer2D + - type: WiresVisualizer - type: entity parent: Airlock diff --git a/Resources/Prototypes/Entities/Constructible/Power/arcade.yml b/Resources/Prototypes/Entities/Constructible/Power/arcade.yml index 8c52c55ca9..3a815d509b 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/arcade.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/arcade.yml @@ -9,14 +9,14 @@ - type: Sprite layers: - state: arcade - map: ["enum.ComputerVisualizer2D+Layers.Body"] + map: ["enum.ComputerVisualizer+Layers.Body"] - state: invaders shader: unshaded - map: ["enum.ComputerVisualizer2D+Layers.Screen"] + map: ["enum.ComputerVisualizer+Layers.Screen"] - type: Appearance visuals: - - type: ComputerVisualizer2D + - type: ComputerVisualizer screen: invaders key: "" body: arcade diff --git a/Resources/Prototypes/Entities/Constructible/Power/computers.yml b/Resources/Prototypes/Entities/Constructible/Power/computers.yml index a47bb963eb..d922632242 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/computers.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/computers.yml @@ -33,19 +33,19 @@ sprite: Constructible/Power/computers.rsi layers: - state: computer - map: ["enum.ComputerVisualizer2D+Layers.Body"] + map: ["enum.ComputerVisualizer+Layers.Body"] - state: generic_key_off - map: ["enum.ComputerVisualizer2D+Layers.Keyboard"] + map: ["enum.ComputerVisualizer+Layers.Keyboard"] - state: generic shader: unshaded - map: ["enum.ComputerVisualizer2D+Layers.Screen"] + map: ["enum.ComputerVisualizer+Layers.Screen"] - state: generic_key shader: unshaded - map: ["enum.ComputerVisualizer2D+Layers.KeyboardOn"] + map: ["enum.ComputerVisualizer+Layers.KeyboardOn"] - type: Appearance visuals: - - type: ComputerVisualizer2D + - type: ComputerVisualizer key: generic_key screen: generic @@ -57,7 +57,7 @@ components: - type: Appearance visuals: - - type: ComputerVisualizer2D + - type: ComputerVisualizer key: atmos_key screen: "alert-2" @@ -69,7 +69,7 @@ components: - type: Appearance visuals: - - type: ComputerVisualizer2D + - type: ComputerVisualizer key: power_key screen: power_monitor @@ -81,7 +81,7 @@ components: - type: Appearance visuals: - - type: ComputerVisualizer2D + - type: ComputerVisualizer key: tech_key screen: supply - type: CargoConsole @@ -113,7 +113,7 @@ components: - type: Appearance visuals: - - type: ComputerVisualizer2D + - type: ComputerVisualizer key: tech_key screen: request - type: CargoConsole @@ -126,7 +126,7 @@ components: - type: Appearance visuals: - - type: ComputerVisualizer2D + - type: ComputerVisualizer key: med_key screen: medcomp @@ -138,7 +138,7 @@ components: - type: Appearance visuals: - - type: ComputerVisualizer2D + - type: ComputerVisualizer key: rd_key screen: rdcomp - type: ResearchClient @@ -168,7 +168,7 @@ type: IdCardConsoleBoundUserInterface - type: Appearance visuals: - - type: ComputerVisualizer2D + - type: ComputerVisualizer key: id_key screen: id @@ -184,7 +184,7 @@ type: BodyScannerBoundUserInterface - type: Appearance visuals: - - type: ComputerVisualizer2D + - type: ComputerVisualizer key: generic_key screen: generic @@ -195,7 +195,7 @@ components: - type: Appearance visuals: - - type: ComputerVisualizer2D + - type: ComputerVisualizer key: generic_key screen: comm - type: CommunicationsConsole @@ -211,7 +211,7 @@ components: - type: Appearance visuals: - - type: ComputerVisualizer2D + - type: ComputerVisualizer key: generic_key screen: solar_screen - type: SolarControlConsole diff --git a/Resources/Prototypes/Entities/Constructible/Power/lathe.yml b/Resources/Prototypes/Entities/Constructible/Power/lathe.yml index 13a1af204d..eb770f26c7 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/lathe.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/lathe.yml @@ -74,7 +74,7 @@ - Multitool - type: Appearance visuals: - - type: AutolatheVisualizer2D + - type: AutolatheVisualizer - type: entity parent: BaseLathe @@ -129,4 +129,4 @@ type: ResearchClientBoundUserInterface - type: Appearance visuals: - - type: ProtolatheVisualizer2D + - type: ProtolatheVisualizer diff --git a/Resources/Prototypes/Entities/Constructible/Power/medical_scanner.yml b/Resources/Prototypes/Entities/Constructible/Power/medical_scanner.yml index 35a4ae7f3b..bce8deedfe 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/medical_scanner.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/medical_scanner.yml @@ -39,7 +39,7 @@ thresholdvalue: 100 - type: Appearance visuals: - - type: MedicalScannerVisualizer2D + - type: MedicalScannerVisualizer - type: UserInterface interfaces: - key: enum.MedicalScannerUiKey.Key diff --git a/Resources/Prototypes/Entities/Constructible/Power/power.yml b/Resources/Prototypes/Entities/Constructible/Power/power.yml index 3b519ffb79..f9f6e194e0 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/power.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/power.yml @@ -1,5 +1,5 @@ - type: entity - id: DebugGenerator + id: DebugGenerator name: Debug Generator placement: mode: SnapgridCenter @@ -82,7 +82,7 @@ - type: Physics Anchored: true - type: Anchorable - + - type: entity id: DebugBatteryDischarger name: Debug Battery Discharger @@ -110,7 +110,7 @@ - type: Physics Anchored: true - type: Anchorable - + - type: entity id: DebugSmes name: Debug Smes @@ -139,7 +139,7 @@ - type: Smes - type: Appearance visuals: - - type: SmesVisualizer2D + - type: SmesVisualizer - type: Battery maxCharge: 1000 startingCharge: 1000 @@ -215,7 +215,7 @@ texture: Constructible/Power/apc.rsi/apc0.png - type: Appearance visuals: - - type: ApcVisualizer2D + - type: ApcVisualizer - type: Battery maxCharge: 10000 startingCharge: 10000 @@ -233,7 +233,7 @@ interfaces: - key: enum.ApcUiKey.Key type: ApcBoundUserInterface - + - type: entity id: DebugPowerReceiver name: Debug Power Receiver @@ -287,7 +287,7 @@ - type: Damageable - type: Breakable thresholdvalue: 100 - + #Depriciated, to be removed from maps - type: entity diff --git a/Resources/Prototypes/Entities/Constructible/Power/research.yml b/Resources/Prototypes/Entities/Constructible/Power/research.yml index f523b62926..333054bf51 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/research.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/research.yml @@ -56,7 +56,7 @@ type: ResearchClientBoundUserInterface - type: Appearance visuals: - - type: PowerDeviceVisualizer2D + - type: PowerDeviceVisualizer - type: PowerReceiver - type: Anchorable - type: Physics diff --git a/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml b/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml index 5e5bcb502d..1505f208af 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml @@ -37,8 +37,8 @@ - type: Breakable - type: Appearance visuals: - - type: VendingMachineVisualizer2D - - type: WiresVisualizer2D + - type: VendingMachineVisualizer + - type: WiresVisualizer - type: UserInterface interfaces: - key: enum.VendingMachineUiKey.Key diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/bar.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/bar.yml index 42e52bc063..469750bbd2 100644 --- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/bar.yml +++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/bar.yml @@ -5,7 +5,7 @@ components: - type: Appearance visuals: - - type: StorageVisualizer2D + - type: StorageVisualizer state: cabinet - type: Icon state: cabinet_door diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/cargo.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/cargo.yml index 8617c60f86..8208fd08ce 100644 --- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/cargo.yml +++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/cargo.yml @@ -5,7 +5,7 @@ components: - type: Appearance visuals: - - type: StorageVisualizer2D + - type: StorageVisualizer state: qm - type: Icon state: qm_door diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/command.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/command.yml index c343609336..7ea4620e55 100644 --- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/command.yml +++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/command.yml @@ -5,7 +5,7 @@ components: - type: Appearance visuals: - - type: StorageVisualizer2D + - type: StorageVisualizer state: cap - type: Icon state: cap_door @@ -17,7 +17,7 @@ components: - type: Appearance visuals: - - type: StorageVisualizer2D + - type: StorageVisualizer state: hop - type: Icon state: hop_door diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/engineering.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/engineering.yml index 6d59bb7900..ffc621ec0b 100644 --- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/engineering.yml +++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/engineering.yml @@ -6,7 +6,7 @@ components: - type: Appearance visuals: - - type: StorageVisualizer2D + - type: StorageVisualizer state: ce - type: Icon state: ce_door @@ -19,7 +19,7 @@ components: - type: Appearance visuals: - - type: StorageVisualizer2D + - type: StorageVisualizer state: eng state_closed: eng_elec_door - type: Icon @@ -33,7 +33,7 @@ components: - type: Appearance visuals: - - type: StorageVisualizer2D + - type: StorageVisualizer state: eng state_closed: eng_weld_door - type: Icon @@ -47,7 +47,7 @@ components: - type: Appearance visuals: - - type: StorageVisualizer2D + - type: StorageVisualizer state: atmos - type: Icon state: atmos_door @@ -60,7 +60,7 @@ components: - type: Appearance visuals: - - type: StorageVisualizer2D + - type: StorageVisualizer state: eng_secure - type: Icon state: eng_secure_door diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/freezer.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/freezer.yml index 8a22253df9..3b1bff7580 100644 --- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/freezer.yml +++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/freezer.yml @@ -5,7 +5,7 @@ components: - type: Appearance visuals: - - type: StorageVisualizer2D + - type: StorageVisualizer state: freezer - type: Icon state: freezer_door diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/hydroponics.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/hydroponics.yml index 41f1663f90..5dca0d14a2 100644 --- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/hydroponics.yml +++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/hydroponics.yml @@ -5,7 +5,7 @@ components: - type: Appearance visuals: - - type: StorageVisualizer2D + - type: StorageVisualizer state: hydro - type: Icon state: hydro_door diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/medical.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/medical.yml index 2381731940..7bf4690a93 100644 --- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/medical.yml +++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/medical.yml @@ -7,7 +7,7 @@ components: - type: Appearance visuals: - - type: StorageVisualizer2D + - type: StorageVisualizer state: med - type: Icon state: med_door @@ -20,7 +20,7 @@ components: - type: Appearance visuals: - - type: StorageVisualizer2D + - type: StorageVisualizer state: med_secure - type: Icon state: med_secure_door @@ -33,7 +33,7 @@ components: - type: Appearance visuals: - - type: StorageVisualizer2D + - type: StorageVisualizer state: med state_closed: chemical_door - type: Icon @@ -47,7 +47,7 @@ components: - type: Appearance visuals: - - type: StorageVisualizer2D + - type: StorageVisualizer state: cmo - type: Icon state: cmo_door diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/scientist.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/scientist.yml index db275643c0..11697f6ccd 100644 --- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/scientist.yml +++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/scientist.yml @@ -5,7 +5,7 @@ components: - type: Appearance visuals: - - type: StorageVisualizer2D + - type: StorageVisualizer state: rd - type: Icon state: rd_door diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/security.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/security.yml index fc0bf34105..4f6218a8f1 100644 --- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/security.yml +++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/security.yml @@ -6,7 +6,7 @@ components: - type: Appearance visuals: - - type: StorageVisualizer2D + - type: StorageVisualizer state: hos - type: Icon state: hos_door @@ -19,7 +19,7 @@ components: - type: Appearance visuals: - - type: StorageVisualizer2D + - type: StorageVisualizer state: warden - type: Icon state: warden_door @@ -32,7 +32,7 @@ components: - type: Appearance visuals: - - type: StorageVisualizer2D + - type: StorageVisualizer state: sec - type: Icon state: sec_door diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/closet.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/closet.yml index d5e6505817..2439fda242 100644 --- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/closet.yml +++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/closet.yml @@ -44,7 +44,7 @@ thresholdvalue: 100 - type: Appearance visuals: - - type: StorageVisualizer2D + - type: StorageVisualizer state_open: generic_open state_closed: generic_door - type: LoopingSound diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/job_closests.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/job_closests.yml index de9fc35780..6ca48e23e5 100644 --- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/job_closests.yml +++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/job_closests.yml @@ -6,7 +6,7 @@ components: - type: Appearance visuals: - - type: StorageVisualizer2D + - type: StorageVisualizer state: generic state_closed: red_door - type: Icon @@ -20,7 +20,7 @@ components: - type: Appearance visuals: - - type: StorageVisualizer2D + - type: StorageVisualizer state: generic state_closed: atmos_wardrobe_door - type: Icon diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/l3closet.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/l3closet.yml index 1160afc127..0f40a29bcf 100644 --- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/l3closet.yml +++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/l3closet.yml @@ -7,7 +7,7 @@ components: - type: Appearance visuals: - - type: StorageVisualizer2D + - type: StorageVisualizer state: bio - type: Icon state: bio_door @@ -19,7 +19,7 @@ components: - type: Appearance visuals: - - type: StorageVisualizer2D + - type: StorageVisualizer state: bio_viro - type: Icon state: bio_viro_door @@ -31,7 +31,7 @@ components: - type: Appearance visuals: - - type: StorageVisualizer2D + - type: StorageVisualizer state: bio_sec - type: Icon state: bio_sec_door @@ -43,7 +43,7 @@ components: - type: Appearance visuals: - - type: StorageVisualizer2D + - type: StorageVisualizer state: bio_jan - type: Icon state: bio_jan_door diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/syndicate.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/syndicate.yml index d54724893f..14c76852f2 100644 --- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/syndicate.yml +++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/syndicate.yml @@ -7,7 +7,7 @@ components: - type: Appearance visuals: - - type: StorageVisualizer2D + - type: StorageVisualizer state: syndicate - type: Icon state: syndicate_door diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/utility_closets.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/utility_closets.yml index ffb54c3ebe..47f7f7d718 100644 --- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/utility_closets.yml +++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/utility_closets.yml @@ -7,7 +7,7 @@ components: - type: Appearance visuals: - - type: StorageVisualizer2D + - type: StorageVisualizer state: eng state_closed: eng_tool_door - type: Icon @@ -22,7 +22,7 @@ components: - type: Appearance visuals: - - type: StorageVisualizer2D + - type: StorageVisualizer state: eng state_closed: eng_rad_door - type: Icon @@ -37,7 +37,7 @@ components: - type: Appearance visuals: - - type: StorageVisualizer2D + - type: StorageVisualizer state: emergency - type: Icon state: emergency_door @@ -51,7 +51,7 @@ components: - type: Appearance visuals: - - type: StorageVisualizer2D + - type: StorageVisualizer state: fire - type: Icon state: fire_door @@ -65,7 +65,7 @@ components: - type: Appearance visuals: - - type: StorageVisualizer2D + - type: StorageVisualizer state: bomb - type: Icon state: bomb_door diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/wardrobe.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/wardrobe.yml index 9843a45469..b51b081422 100644 --- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/wardrobe.yml +++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/wardrobe.yml @@ -12,7 +12,7 @@ components: - type: Appearance visuals: - - type: StorageVisualizer2D + - type: StorageVisualizer state: generic state_closed: blue_door - type: Icon @@ -26,7 +26,7 @@ components: - type: Appearance visuals: - - type: StorageVisualizer2D + - type: StorageVisualizer state: generic state_closed: pink_door - type: Icon @@ -40,7 +40,7 @@ components: - type: Appearance visuals: - - type: StorageVisualizer2D + - type: StorageVisualizer state: generic state_closed: black_door - type: Icon @@ -54,7 +54,7 @@ components: - type: Appearance visuals: - - type: StorageVisualizer2D + - type: StorageVisualizer state: generic state_closed: green_door - type: Icon @@ -68,7 +68,7 @@ components: - type: Appearance visuals: - - type: StorageVisualizer2D + - type: StorageVisualizer state: generic state_closed: orange_door - type: Icon @@ -82,7 +82,7 @@ components: - type: Appearance visuals: - - type: StorageVisualizer2D + - type: StorageVisualizer state: generic state_closed: yellow_door - type: Icon @@ -96,7 +96,7 @@ components: - type: Appearance visuals: - - type: StorageVisualizer2D + - type: StorageVisualizer state: generic state_closed: white_door - type: Icon @@ -110,7 +110,7 @@ components: - type: Appearance visuals: - - type: StorageVisualizer2D + - type: StorageVisualizer state: generic state_closed: grey_door - type: Icon @@ -124,7 +124,7 @@ components: - type: Appearance visuals: - - type: StorageVisualizer2D + - type: StorageVisualizer state: generic state_closed: mixed_door - type: Icon diff --git a/Resources/Prototypes/Entities/Constructible/Storage/crate_base.yml b/Resources/Prototypes/Entities/Constructible/Storage/crate_base.yml index 5427458170..f7fed23689 100644 --- a/Resources/Prototypes/Entities/Constructible/Storage/crate_base.yml +++ b/Resources/Prototypes/Entities/Constructible/Storage/crate_base.yml @@ -43,7 +43,7 @@ thresholdvalue: 100 - type: Appearance visuals: - - type: StorageVisualizer2D + - type: StorageVisualizer state_open: crate_open state_closed: crate_door - type: LoopingSound diff --git a/Resources/Prototypes/Entities/Constructible/Storage/crate_types.yml b/Resources/Prototypes/Entities/Constructible/Storage/crate_types.yml index 05b07e418d..8aa94093a3 100644 --- a/Resources/Prototypes/Entities/Constructible/Storage/crate_types.yml +++ b/Resources/Prototypes/Entities/Constructible/Storage/crate_types.yml @@ -11,7 +11,7 @@ map: ["enum.StorageVisualLayers.Door"] - type: Appearance visuals: - - type: StorageVisualizer2D + - type: StorageVisualizer state_open: plasticcrate_open state_closed: plasticcrate_door - type: Icon @@ -31,7 +31,7 @@ map: ["enum.StorageVisualLayers.Door"] - type: Appearance visuals: - - type: StorageVisualizer2D + - type: StorageVisualizer state_open: freezer_open state_closed: freezer_door - type: Icon @@ -51,7 +51,7 @@ map: ["enum.StorageVisualLayers.Door"] - type: Appearance visuals: - - type: StorageVisualizer2D + - type: StorageVisualizer state_open: hydrocrate_open state_closed: hydrocrate_door - type: Icon @@ -71,7 +71,7 @@ map: ["enum.StorageVisualLayers.Door"] - type: Appearance visuals: - - type: StorageVisualizer2D + - type: StorageVisualizer state_open: medicalcrate_open state_closed: medicalcrate_door - type: Icon @@ -92,7 +92,7 @@ map: ["enum.StorageVisualLayers.Door"] - type: Appearance visuals: - - type: StorageVisualizer2D + - type: StorageVisualizer state_open: radiationcrate_open state_closed: radiationcrate_door - type: Icon @@ -112,7 +112,7 @@ map: ["enum.StorageVisualLayers.Door"] - type: Appearance visuals: - - type: StorageVisualizer2D + - type: StorageVisualizer state_open: o2crate_open state_closed: o2crate_door - type: Icon diff --git a/Resources/Prototypes/Entities/Mobs/Species/human.yml b/Resources/Prototypes/Entities/Mobs/Species/human.yml index 9a23748bc7..a342c1f408 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/human.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/human.yml @@ -126,7 +126,7 @@ - type: Damageable - type: Appearance visuals: - - type: SpeciesVisualizer2D + - type: SpeciesVisualizer - type: BuckleVisualizer - type: CombatMode - type: Teleportable @@ -253,7 +253,7 @@ - type: Appearance visuals: - - type: SpeciesVisualizer2D + - type: SpeciesVisualizer - type: HumanoidAppearance diff --git a/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml index 11807a2b66..538af7dd14 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml @@ -259,7 +259,7 @@ state: icon-10 - type: Appearance visuals: - - type: DrinkFoodVisualizer2D + - type: DrinkFoodVisualizer steps: 11 - type: entity @@ -1813,7 +1813,7 @@ state: icon-1 - type: Appearance visuals: - - type: DrinkFoodVisualizer2D + - type: DrinkFoodVisualizer steps: 2 - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Consumable/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/drinks_cups.yml index a2aa8c8347..6200536472 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/drinks_cups.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks_cups.yml @@ -46,7 +46,7 @@ state: icon-6 - type: Appearance visuals: - - type: DrinkFoodVisualizer2D + - type: DrinkFoodVisualizer steps: 7 - type: entity @@ -65,7 +65,7 @@ state: icon-3 - type: Appearance visuals: - - type: DrinkFoodVisualizer2D + - type: DrinkFoodVisualizer steps: 4 - type: entity @@ -84,7 +84,7 @@ state: icon-3 - type: Appearance visuals: - - type: DrinkFoodVisualizer2D + - type: DrinkFoodVisualizer steps: 4 - type: entity @@ -103,7 +103,7 @@ state: icon-3 - type: Appearance visuals: - - type: DrinkFoodVisualizer2D + - type: DrinkFoodVisualizer steps: 4 - type: entity @@ -122,7 +122,7 @@ state: icon-3 - type: Appearance visuals: - - type: DrinkFoodVisualizer2D + - type: DrinkFoodVisualizer steps: 4 - type: entity @@ -141,7 +141,7 @@ state: icon-3 - type: Appearance visuals: - - type: DrinkFoodVisualizer2D + - type: DrinkFoodVisualizer steps: 4 - type: entity @@ -160,7 +160,7 @@ state: icon-3 - type: Appearance visuals: - - type: DrinkFoodVisualizer2D + - type: DrinkFoodVisualizer steps: 4 - type: entity @@ -179,7 +179,7 @@ state: icon-3 - type: Appearance visuals: - - type: DrinkFoodVisualizer2D + - type: DrinkFoodVisualizer steps: 4 - type: entity @@ -198,7 +198,7 @@ state: icon-3 - type: Appearance visuals: - - type: DrinkFoodVisualizer2D + - type: DrinkFoodVisualizer steps: 4 - type: entity @@ -217,7 +217,7 @@ state: icon-3 - type: Appearance visuals: - - type: DrinkFoodVisualizer2D + - type: DrinkFoodVisualizer steps: 4 - type: entity @@ -236,7 +236,7 @@ state: icon-3 - type: Appearance visuals: - - type: DrinkFoodVisualizer2D + - type: DrinkFoodVisualizer steps: 4 - type: entity @@ -288,7 +288,7 @@ state: icon-1 - type: Appearance visuals: - - type: DrinkFoodVisualizer2D + - type: DrinkFoodVisualizer steps: 2 - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Consumable/food.yml b/Resources/Prototypes/Entities/Objects/Consumable/food.yml index 2157a27c4e..e078357d06 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/food.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/food.yml @@ -13,7 +13,7 @@ # Only use visualizer if there's multiple steps available # - type: Appearance # visuals: -# - type: FoodVisualizer2D +# - type: FoodVisualizer # base_state: icon # steps: 1 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/food_containers.yml b/Resources/Prototypes/Entities/Objects/Consumable/food_containers.yml index cd9eb764e9..3dbe0e1055 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/food_containers.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/food_containers.yml @@ -158,7 +158,7 @@ sprite: Objects/Consumable/FoodContainers/donutbox.rsi - type: Appearance visuals: - - type: FoodContainerVisualizer2D + - type: FoodContainerVisualizer mode: Discrete base_state: donutbox steps: 7 @@ -198,7 +198,7 @@ sprite: Objects/Consumable/FoodContainers/eggbox.rsi - type: Appearance visuals: - - type: FoodContainerVisualizer2D + - type: FoodContainerVisualizer mode: Discrete base_state: eggbox steps: 13 @@ -325,7 +325,7 @@ sprite: Objects/Consumable/FoodContainers/pizzaboxstack.rsi - type: Appearance visuals: - - type: FoodContainerVisualizer2D + - type: FoodContainerVisualizer mode: Discrete base_state: pizzaboxstack steps: 5 diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 1e62e4ee44..832c914529 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -615,7 +615,7 @@ soundInsert: /Audio/Weapons/Guns/MagIn/revolver_magin.ogg - type: Appearance visuals: - - type: BarrelBoltVisualizer2D + - type: BarrelBoltVisualizer - type: entity name: foamblade diff --git a/Resources/Prototypes/Entities/Objects/Misc/teleporters.yml b/Resources/Prototypes/Entities/Objects/Misc/teleporters.yml index 38d9540283..e929d7e53f 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/teleporters.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/teleporters.yml @@ -19,7 +19,7 @@ - type: LoopingSound - type: Appearance visuals: - - type: HandTeleporterVisualizer2D + - type: HandTeleporterVisualizer - type: entity name: "hand teleporter - random" @@ -62,4 +62,4 @@ state: portal-pending - type: Appearance visuals: - - type: PortalVisualizer2D + - type: PortalVisualizer diff --git a/Resources/Prototypes/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/Entities/Objects/Power/powercells.yml index 534e6b068d..102fa7239c 100644 --- a/Resources/Prototypes/Entities/Objects/Power/powercells.yml +++ b/Resources/Prototypes/Entities/Objects/Power/powercells.yml @@ -31,7 +31,7 @@ charge: 1500 - type: Appearance visuals: - - type: PowerCellVisualizer2D + - type: PowerCellVisualizer prefix: s_st @@ -52,7 +52,7 @@ charge: 3000 - type: Appearance visuals: - - type: PowerCellVisualizer2D + - type: PowerCellVisualizer prefix: s_hi @@ -73,7 +73,7 @@ charge: 6000 - type: Appearance visuals: - - type: PowerCellVisualizer2D + - type: PowerCellVisualizer prefix: s_sup @@ -94,7 +94,7 @@ charge: 10000 - type: Appearance visuals: - - type: PowerCellVisualizer2D + - type: PowerCellVisualizer prefix: s_hy - type: entity @@ -113,7 +113,7 @@ state: empty - type: Appearance visuals: - - type: PowerChargerVisualizer2D + - type: PowerChargerVisualizer - type: Anchorable - type: Physics mass: 5 @@ -143,7 +143,7 @@ state: empty - type: Appearance visuals: - - type: PowerChargerVisualizer2D + - type: PowerChargerVisualizer - type: Anchorable - type: Physics mass: 5 @@ -173,7 +173,7 @@ state: empty - type: Appearance visuals: - - type: PowerChargerVisualizer2D + - type: PowerChargerVisualizer - type: Physics mass: 5 - type: Clickable diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/AntiMaterial/boxes.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/AntiMaterial/boxes.yml index f01f6bbb45..3f0a4f2f54 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/AntiMaterial/boxes.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/AntiMaterial/boxes.yml @@ -10,7 +10,7 @@ - type: Icon sprite: Objects/Weapons/Guns/Ammunition/Boxes/AntiMaterial/anti_material.rsi state: icon - - type: Sprite + - type: Sprite netsync: false sprite: Objects/Weapons/Guns/Ammunition/Boxes/AntiMaterial/anti_material.rsi layers: @@ -20,7 +20,7 @@ map: ["enum.RangedBarrelVisualLayers.Mag"] - type: Appearance visuals: - - type: MagVisualizer2D + - type: MagVisualizer magState: mag steps: 2 - zeroVisible: false \ No newline at end of file + zeroVisible: false diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/AntiMaterial/cartridges.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/AntiMaterial/cartridges.yml index 4fcc3c3c94..1a879e91e5 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/AntiMaterial/cartridges.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/AntiMaterial/cartridges.yml @@ -20,4 +20,4 @@ state: base - type: Appearance visuals: - - type: SpentAmmoVisualizer2D + - type: SpentAmmoVisualizer diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/ClRifle/boxes.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/ClRifle/boxes.yml index 2b72c6c7f9..32febfbd15 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/ClRifle/boxes.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/ClRifle/boxes.yml @@ -18,7 +18,7 @@ map: ["enum.RangedBarrelVisualLayers.Mag"] - type: Appearance visuals: - - type: MagVisualizer2D + - type: MagVisualizer magState: mag steps: 2 zeroVisible: false @@ -99,7 +99,7 @@ fillPrototype: CartridgeClRifleHV - type: Icon sprite: Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_hv.rsi - - type: Sprite + - type: Sprite sprite: Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_hv.rsi - type: entity @@ -112,7 +112,7 @@ fillPrototype: CartridgeClRiflePractice - type: Icon sprite: Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_practice.rsi - - type: Sprite + - type: Sprite sprite: Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_practice.rsi - type: entity @@ -125,5 +125,5 @@ fillPrototype: CartridgeClRifleRubber - type: Icon sprite: Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_rubber.rsi - - type: Sprite + - type: Sprite sprite: Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_rubber.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/ClRifle/magazines.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/ClRifle/magazines.yml index f7d897f744..b30edba88f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/ClRifle/magazines.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/ClRifle/magazines.yml @@ -11,7 +11,7 @@ capacity: 30 - type: Icon state: icon - - type: Sprite + - type: Sprite netsync: false layers: - state: base @@ -20,7 +20,7 @@ map: ["enum.RangedBarrelVisualLayers.Mag"] - type: Appearance visuals: - - type: MagVisualizer2D + - type: MagVisualizer magState: mag steps: 2 zeroVisible: false @@ -54,7 +54,7 @@ sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag.rsi - type: Appearance visuals: - - type: MagVisualizer2D + - type: MagVisualizer magState: mag steps: 6 zeroVisible: false @@ -76,7 +76,7 @@ sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_hv.rsi - type: Appearance visuals: - - type: MagVisualizer2D + - type: MagVisualizer magState: mag steps: 6 zeroVisible: false @@ -96,7 +96,7 @@ sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_practice.rsi - type: Appearance visuals: - - type: MagVisualizer2D + - type: MagVisualizer magState: mag steps: 6 zeroVisible: false @@ -116,7 +116,7 @@ sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_rubber.rsi - type: Appearance visuals: - - type: MagVisualizer2D + - type: MagVisualizer magState: mag steps: 6 zeroVisible: false diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Explosives/ammunition.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Explosives/ammunition.yml index a808bcf81e..34498bd0b6 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Explosives/ammunition.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Explosives/ammunition.yml @@ -37,7 +37,7 @@ state: base - type: Appearance visuals: - - type: SpentAmmoVisualizer2D + - type: SpentAmmoVisualizer - type: entity id: GrenadeBlast @@ -59,7 +59,7 @@ state: base - type: Appearance visuals: - - type: SpentAmmoVisualizer2D + - type: SpentAmmoVisualizer - type: entity id: GrenadeFlash @@ -81,7 +81,7 @@ state: base - type: Appearance visuals: - - type: SpentAmmoVisualizer2D + - type: SpentAmmoVisualizer - type: entity id: GrenadeFrag @@ -103,4 +103,4 @@ state: base - type: Appearance visuals: - - type: SpentAmmoVisualizer2D + - type: SpentAmmoVisualizer diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/boxes.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/boxes.yml index ddce1758a6..084cc73e06 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/boxes.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/boxes.yml @@ -18,7 +18,7 @@ map: ["enum.RangedBarrelVisualLayers.Mag"] - type: Appearance visuals: - - type: MagVisualizer2D + - type: MagVisualizer magState: mag steps: 2 zeroVisible: false diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/magazines.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/magazines.yml index 75e8d4a927..6ab6b615ca 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/magazines.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/magazines.yml @@ -11,7 +11,7 @@ capacity: 30 - type: Icon state: icon - - type: Sprite + - type: Sprite netsync: false layers: - state: base @@ -20,7 +20,7 @@ map: ["enum.RangedBarrelVisualLayers.Mag"] - type: Appearance visuals: - - type: MagVisualizer2D + - type: MagVisualizer magState: mag steps: 2 zeroVisible: false @@ -41,7 +41,7 @@ sprite: Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_box.rsi - type: Appearance visuals: - - type: MagVisualizer2D + - type: MagVisualizer magState: mag steps: 8 zeroVisible: false @@ -135,7 +135,7 @@ sprite: Objects/Weapons/Guns/Ammunition/Magazine/LRifle/pk_box.rsi - type: Appearance visuals: - - type: MagVisualizer2D + - type: MagVisualizer magState: mag steps: 7 zeroVisible: false diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/speed_loaders.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/speed_loaders.yml index aff2129a86..ae9b2ed79b 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/speed_loaders.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/speed_loaders.yml @@ -20,7 +20,7 @@ map: ["enum.RangedBarrelVisualLayers.Mag"] - type: Appearance visuals: - - type: MagVisualizer2D + - type: MagVisualizer magState: mag steps: 6 - zeroVisible: false \ No newline at end of file + zeroVisible: false diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magnum/boxes.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magnum/boxes.yml index ab2ab71c6d..f8af073da0 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magnum/boxes.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magnum/boxes.yml @@ -18,7 +18,7 @@ map: ["enum.RangedBarrelVisualLayers.Mag"] - type: Appearance visuals: - - type: MagVisualizer2D + - type: MagVisualizer magState: mag steps: 2 zeroVisible: false diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magnum/magazines.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magnum/magazines.yml index 3fdec414ae..06cb461ba9 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magnum/magazines.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magnum/magazines.yml @@ -11,7 +11,7 @@ capacity: 10 - type: Icon state: icon - - type: Sprite + - type: Sprite netsync: false layers: - state: base @@ -20,7 +20,7 @@ map: ["enum.RangedBarrelVisualLayers.Mag"] - type: Appearance visuals: - - type: MagVisualizer2D + - type: MagVisualizer magState: mag steps: 5 zeroVisible: false @@ -37,7 +37,7 @@ capacity: 25 - type: Icon state: icon - - type: Sprite + - type: Sprite netsync: false layers: - state: base @@ -46,7 +46,7 @@ map: ["enum.RangedBarrelVisualLayers.Mag"] - type: Appearance visuals: - - type: MagVisualizer2D + - type: MagVisualizer magState: mag steps: 2 zeroVisible: false diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magnum/speed_loaders.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magnum/speed_loaders.yml index 5c41e1e5bd..79599f481b 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magnum/speed_loaders.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magnum/speed_loaders.yml @@ -18,7 +18,7 @@ map: ["enum.RangedBarrelVisualLayers.Mag"] - type: Appearance visuals: - - type: MagVisualizer2D + - type: MagVisualizer magState: mag steps: 7 zeroVisible: false diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/boxes.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/boxes.yml index e9f249f91d..0748c9fe9b 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/boxes.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/boxes.yml @@ -18,7 +18,7 @@ map: ["enum.RangedBarrelVisualLayers.Mag"] - type: Appearance visuals: - - type: MagVisualizer2D + - type: MagVisualizer magState: mag steps: 2 zeroVisible: false diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/magazines.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/magazines.yml index f5cece58c8..2cd1763cd3 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/magazines.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/magazines.yml @@ -19,7 +19,7 @@ map: ["enum.RangedBarrelVisualLayers.Mag"] - type: Appearance visuals: - - type: MagVisualizer2D + - type: MagVisualizer magState: mag steps: 5 zeroVisible: false @@ -45,7 +45,7 @@ map: ["enum.RangedBarrelVisualLayers.Mag"] - type: Appearance visuals: - - type: MagVisualizer2D + - type: MagVisualizer magState: mag steps: 7 zeroVisible: false @@ -71,7 +71,7 @@ map: ["enum.RangedBarrelVisualLayers.Mag"] - type: Appearance visuals: - - type: MagVisualizer2D + - type: MagVisualizer magState: mag steps: 2 zeroVisible: false @@ -98,7 +98,7 @@ shader: unshaded - type: Appearance visuals: - - type: MagVisualizer2D + - type: MagVisualizer magState: mag steps: 6 zeroVisible: false diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/speed_loaders.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/speed_loaders.yml index 4e254d87aa..9213984fac 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/speed_loaders.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/speed_loaders.yml @@ -18,7 +18,7 @@ map: ["enum.RangedBarrelVisualLayers.Mag"] - type: Appearance visuals: - - type: MagVisualizer2D + - type: MagVisualizer magState: mag steps: 7 zeroVisible: false diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SRifle/boxes.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SRifle/boxes.yml index 978ae0f77e..bbc84c88e5 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SRifle/boxes.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SRifle/boxes.yml @@ -18,7 +18,7 @@ map: ["enum.RangedBarrelVisualLayers.Mag"] - type: Appearance visuals: - - type: MagVisualizer2D + - type: MagVisualizer magState: mag steps: 2 zeroVisible: false diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SRifle/magazines.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SRifle/magazines.yml index 235779960a..f3d3da53fa 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SRifle/magazines.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SRifle/magazines.yml @@ -11,7 +11,7 @@ capacity: 25 - type: Icon state: icon - - type: Sprite + - type: Sprite netsync: false layers: - state: base @@ -20,7 +20,7 @@ map: ["enum.RangedBarrelVisualLayers.Mag"] - type: Appearance visuals: - - type: MagVisualizer2D + - type: MagVisualizer magState: mag steps: 2 zeroVisible: false diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Shotgun/cartridges.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Shotgun/cartridges.yml index d34b5e51b1..76b981fdfe 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Shotgun/cartridges.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Shotgun/cartridges.yml @@ -21,7 +21,7 @@ state: base - type: Appearance visuals: - - type: SpentAmmoVisualizer2D + - type: SpentAmmoVisualizer - type: entity id: ShellShotgunBeanbag diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Shotgun/magazines.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Shotgun/magazines.yml index 6b6c207a0f..33f31f7d9a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Shotgun/magazines.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Shotgun/magazines.yml @@ -10,7 +10,7 @@ capacity: 8 - type: Icon state: icon - - type: Sprite + - type: Sprite netsync: false layers: - state: base @@ -19,7 +19,7 @@ map: ["enum.RangedBarrelVisualLayers.Mag"] - type: Appearance visuals: - - type: MagVisualizer2D + - type: MagVisualizer magState: mag steps: 2 zeroVisible: false diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/speedloaders.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/speedloaders.yml index 6e3cf802f8..44bb2954c5 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/speedloaders.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/speedloaders.yml @@ -18,7 +18,7 @@ map: ["enum.RangedBarrelVisualLayers.Mag"] - type: Appearance visuals: - - type: MagVisualizer2D + - type: MagVisualizer magState: mag steps: 7 zeroVisible: false diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index aea65340a6..ef5ae605f1 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -34,7 +34,7 @@ soundGunshot: /Audio/Weapons/Guns/Gunshots/laser.ogg - type: Appearance visuals: - - type: MagVisualizer2D + - type: MagVisualizer magState: mag steps: 5 zeroVisible: true @@ -75,7 +75,7 @@ soundGunshot: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg - type: Appearance visuals: - - type: MagVisualizer2D + - type: MagVisualizer magState: mag steps: 5 zeroVisible: false @@ -117,7 +117,7 @@ soundGunshot: /Audio/Weapons/Guns/Gunshots/laser3.ogg - type: Appearance visuals: - - type: MagVisualizer2D + - type: MagVisualizer magState: mag steps: 5 zeroVisible: true @@ -159,7 +159,7 @@ soundGunshot: /Audio/Weapons/Guns/Gunshots/taser.ogg - type: Appearance visuals: - - type: MagVisualizer2D + - type: MagVisualizer magState: mag steps: 5 zeroVisible: true diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Explosives/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Explosives/grenades.yml index 390279932e..e78d9e73da 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Explosives/grenades.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Explosives/grenades.yml @@ -26,7 +26,7 @@ thresholdvalue: 10 - type: Appearance visuals: - - type: TimerTriggerVisualizer2D + - type: TimerTriggerVisualizer countdown_sound: /Audio/Effects/countdown.ogg - type: entity @@ -53,7 +53,7 @@ thresholdvalue: 10 - type: Appearance visuals: - - type: TimerTriggerVisualizer2D + - type: TimerTriggerVisualizer countdown_sound: /Audio/Effects/countdown.ogg - type: entity @@ -84,5 +84,5 @@ thresholdvalue: 10 - type: Appearance visuals: - - type: TimerTriggerVisualizer2D + - type: TimerTriggerVisualizer countdown_sound: /Audio/Effects/countdown.ogg diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml index ef0c01d369..1708167025 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml @@ -64,8 +64,8 @@ angleDecay: 60 - type: Appearance visuals: - - type: BarrelBoltVisualizer2D - - type: MagVisualizer2D + - type: BarrelBoltVisualizer + - type: MagVisualizer magState: mag steps: 4 zeroVisible: true @@ -100,8 +100,8 @@ angleDecay: 60 - type: Appearance visuals: - - type: BarrelBoltVisualizer2D - - type: MagVisualizer2D + - type: BarrelBoltVisualizer + - type: MagVisualizer magState: mag steps: 6 zeroVisible: true diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index 754b238fea..9e46661326 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -45,7 +45,7 @@ soundInsert: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg - type: Appearance visuals: - - type: BarrelBoltVisualizer2D + - type: BarrelBoltVisualizer - type: entity name: RPG-7 @@ -79,7 +79,7 @@ soundInsert: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg - type: Appearance visuals: - - type: MagVisualizer2D + - type: MagVisualizer magState: mag steps: 1 zeroVisible: true diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index 09d093628e..4107dd634c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -21,7 +21,7 @@ state: icon - type: MagazineBarrel caliber: Pistol - magazineTypes: + magazineTypes: - Pistol currentSelector: Single allSelectors: @@ -41,8 +41,8 @@ soundMagEject: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg - type: Appearance visuals: - - type: BarrelBoltVisualizer2D - - type: MagVisualizer2D + - type: BarrelBoltVisualizer + - type: MagVisualizer magState: mag steps: 1 zeroVisible: true @@ -51,7 +51,7 @@ name: clarissa parent: PistolBase id: PistolClarissa - description: + description: components: - type: Sprite sprite: Objects/Weapons/Guns/Pistols/clarissa.rsi @@ -63,7 +63,7 @@ - type: RangedWeapon - type: MagazineBarrel caliber: Pistol - magazineTypes: + magazineTypes: - Pistol - HCPistol fireRate: 5 @@ -76,7 +76,7 @@ name: colt M1911 parent: PistolBase id: PistolColt - description: + description: components: - type: Sprite sprite: Objects/Weapons/Guns/Pistols/colt.rsi @@ -93,7 +93,7 @@ - type: RangedWeapon - type: MagazineBarrel caliber: Pistol - magazineTypes: + magazineTypes: - Pistol fireRate: 5 minAngle: 0 @@ -102,7 +102,7 @@ angleDecay: 60 - type: Appearance visuals: - - type: BarrelBoltVisualizer2D + - type: BarrelBoltVisualizer - type: entity name: giskard @@ -120,7 +120,7 @@ - type: RangedWeapon - type: MagazineBarrel caliber: Pistol - magazineTypes: + magazineTypes: - Pistol fireRate: 5 minAngle: 0 @@ -169,7 +169,7 @@ soundMagEject: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg - type: Appearance visuals: - - type: BarrelBoltVisualizer2D + - type: BarrelBoltVisualizer - type: entity name: lamia @@ -192,7 +192,7 @@ - type: RangedWeapon - type: MagazineBarrel caliber: Magnum - magazineTypes: + magazineTypes: - Pistol magFillPrototype: MagazineMagnum autoEjectMag: true @@ -208,7 +208,7 @@ soundMagEject: /Audio/Weapons/Guns/MagOut/hpistol_magout.ogg - type: Appearance visuals: - - type: MagVisualizer2D + - type: MagVisualizer magState: mag steps: 1 zeroVisible: true @@ -236,7 +236,7 @@ - type: RangedWeapon - type: MagazineBarrel caliber: ClRifle - magazineTypes: + magazineTypes: - Pistol magFillPrototype: MagazineClRiflePistol autoEjectMag: true @@ -268,7 +268,7 @@ - type: RangedWeapon - type: MagazineBarrel caliber: Pistol - magazineTypes: + magazineTypes: - Pistol fireRate: 5 minAngle: 0 @@ -277,7 +277,7 @@ angleDecay: 60 - type: Appearance visuals: - - type: BarrelBoltVisualizer2D + - type: BarrelBoltVisualizer - type: entity name: mk 58 (wood) @@ -300,7 +300,7 @@ - type: RangedWeapon - type: MagazineBarrel caliber: Pistol - magazineTypes: + magazineTypes: - Pistol fireRate: 5 minAngle: 0 @@ -309,7 +309,7 @@ angleDecay: 60 - type: Appearance visuals: - - type: BarrelBoltVisualizer2D + - type: BarrelBoltVisualizer - type: entity name: molly @@ -330,7 +330,7 @@ currentSelector: Automatic allSelectors: - Automatic - magazineTypes: + magazineTypes: - HCPistol - Smg magFillPrototype: MagazinePistolSmg @@ -362,7 +362,7 @@ - type: RangedWeapon - type: MagazineBarrel caliber: Pistol - magazineTypes: + magazineTypes: - Pistol - HCPistol fireRate: 5 @@ -372,7 +372,7 @@ angleDecay: 60 - type: Appearance visuals: - - type: BarrelBoltVisualizer2D + - type: BarrelBoltVisualizer - type: entity name: paco @@ -390,7 +390,7 @@ - type: RangedWeapon - type: MagazineBarrel caliber: Pistol - magazineTypes: + magazineTypes: - Pistol autoEjectMag: true fireRate: 5 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml index effd1d1b64..2f8b6c8fe3 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -46,8 +46,8 @@ soundInsert: /Audio/Weapons/Guns/MagIn/revolver_magin.ogg - type: Appearance visuals: - - type: BarrelBoltVisualizer2D - - type: MagVisualizer2D + - type: BarrelBoltVisualizer + - type: MagVisualizer magState: mag steps: 4 zeroVisible: true diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index 2c06db575c..eb298ef72b 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -51,7 +51,7 @@ - type: RangedWeapon - type: MagazineBarrel caliber: LRifle - magazineTypes: + magazineTypes: - Rifle fireRate: 5 minAngle: 0 @@ -64,7 +64,7 @@ soundMagEject: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg - type: Appearance visuals: - - type: MagVisualizer2D + - type: MagVisualizer magState: mag steps: 1 zeroVisible: true @@ -90,7 +90,7 @@ - type: RangedWeapon - type: MagazineBarrel caliber: LRifle - magazineTypes: + magazineTypes: - Rifle fireRate: 6 minAngle: 0 @@ -103,7 +103,7 @@ soundMagEject: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg - type: Appearance visuals: - - type: MagVisualizer2D + - type: MagVisualizer magState: mag steps: 1 zeroVisible: true @@ -131,7 +131,7 @@ - type: RangedWeapon - type: MagazineBarrel caliber: SRifle - magazineTypes: + magazineTypes: - Rifle magFillPrototype: MagazineSRifle fireRate: 5 @@ -145,8 +145,8 @@ soundMagEject: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg - type: Appearance visuals: - - type: BarrelBoltVisualizer2D - - type: MagVisualizer2D + - type: BarrelBoltVisualizer + - type: MagVisualizer magState: mag steps: 1 zeroVisible: true @@ -172,7 +172,7 @@ - type: RangedWeapon - type: MagazineBarrel caliber: ClRifle - magazineTypes: + magazineTypes: - Rifle magFillPrototype: MagazineClRifle10x24 fireRate: 8 @@ -186,7 +186,7 @@ soundMagEject: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg - type: Appearance visuals: - - type: MagVisualizer2D + - type: MagVisualizer magState: mag steps: 1 zeroVisible: true @@ -214,7 +214,7 @@ - type: RangedWeapon - type: MagazineBarrel caliber: LRifle - magazineTypes: + magazineTypes: - Rifle fireRate: 5 minAngle: 0 @@ -227,8 +227,8 @@ soundMagEject: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg - type: Appearance visuals: - - type: BarrelBoltVisualizer2D - - type: MagVisualizer2D + - type: BarrelBoltVisualizer + - type: MagVisualizer magState: mag steps: 1 zeroVisible: true @@ -256,7 +256,7 @@ - type: RangedWeapon - type: MagazineBarrel caliber: SRifle - magazineTypes: + magazineTypes: - Rifle magFillPrototype: MagazineSRifle fireRate: 5 @@ -266,8 +266,8 @@ angleDecay: 60 - type: Appearance visuals: - - type: BarrelBoltVisualizer2D - - type: MagVisualizer2D + - type: BarrelBoltVisualizer + - type: MagVisualizer magState: mag steps: 1 zeroVisible: true @@ -295,7 +295,7 @@ - type: RangedWeapon - type: MagazineBarrel caliber: SRifle - magazineTypes: + magazineTypes: - Rifle magFillPrototype: MagazineSRifle autoEjectMag: true @@ -310,8 +310,8 @@ soundMagEject: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg - type: Appearance visuals: - - type: BarrelBoltVisualizer2D - - type: MagVisualizer2D + - type: BarrelBoltVisualizer + - type: MagVisualizer magState: mag steps: 1 zeroVisible: true diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index 452320cdcd..481454a863 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -19,7 +19,7 @@ - Automatic fireRate: 8 caliber: Pistol - magazineTypes: + magazineTypes: - Smg minAngle: 5 maxAngle: 60 @@ -61,7 +61,7 @@ - Automatic fireRate: 10 caliber: Pistol - magazineTypes: + magazineTypes: - Smg minAngle: 10 maxAngle: 60 @@ -69,8 +69,8 @@ angleDecay: 60 - type: Appearance visuals: - - type: BarrelBoltVisualizer2D - - type: MagVisualizer2D + - type: BarrelBoltVisualizer + - type: MagVisualizer magState: mag steps: 1 zeroVisible: true @@ -103,7 +103,7 @@ - Automatic fireRate: 8 caliber: Pistol - magazineTypes: + magazineTypes: - Smg minAngle: 5 maxAngle: 60 @@ -112,8 +112,8 @@ autoEjectMag: true - type: Appearance visuals: - - type: BarrelBoltVisualizer2D - - type: MagVisualizer2D + - type: BarrelBoltVisualizer + - type: MagVisualizer magState: mag steps: 1 zeroVisible: true @@ -154,8 +154,8 @@ angleDecay: 60 - type: Appearance visuals: - - type: BarrelBoltVisualizer2D - - type: MagVisualizer2D + - type: BarrelBoltVisualizer + - type: MagVisualizer magState: mag steps: 1 zeroVisible: true @@ -188,12 +188,12 @@ - Automatic fireRate: 10 caliber: Pistol - magazineTypes: + magazineTypes: - Smg - type: Appearance visuals: - - type: BarrelBoltVisualizer2D - - type: MagVisualizer2D + - type: BarrelBoltVisualizer + - type: MagVisualizer magState: mag steps: 1 zeroVisible: true @@ -229,12 +229,12 @@ - Automatic fireRate: 8 caliber: Pistol - magazineTypes: + magazineTypes: - SmgTopMounted magFillPrototype: MagazinePistolSmgTopMounted - type: Appearance visuals: - - type: MagVisualizer2D + - type: MagVisualizer magState: mag steps: 6 zeroVisible: true @@ -266,13 +266,13 @@ - Automatic fireRate: 8 caliber: Magnum - magazineTypes: + magazineTypes: - Smg magFillPrototype: MagazineMagnumSmg - type: Appearance visuals: - - type: BarrelBoltVisualizer2D - - type: MagVisualizer2D + - type: BarrelBoltVisualizer + - type: MagVisualizer magState: mag steps: 1 zeroVisible: true diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index 5434f0735f..6b69365dd1 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -56,7 +56,7 @@ - Automatic fireRate: 3 caliber: Shotgun - magazineTypes: + magazineTypes: - Rifle magFillPrototype: MagazineShotgun soundGunshot: /Audio/Weapons/Guns/Gunshots/shotgun.ogg @@ -68,8 +68,8 @@ soundMagEject: /Audio/Weapons/Guns/MagOut/smg_magout.ogg - type: Appearance visuals: - - type: BarrelBoltVisualizer2D - - type: MagVisualizer2D + - type: BarrelBoltVisualizer + - type: MagVisualizer magState: mag steps: 1 zeroVisible: true @@ -115,7 +115,7 @@ sound_bolt_closed: /Audio/Weapons/Guns/Cock/shotgun_close.ogg - type: Appearance visuals: - - type: BarrelBoltVisualizer2D + - type: BarrelBoltVisualizer - type: entity name: Bull @@ -142,7 +142,7 @@ maxAngle: 120 - type: Appearance visuals: - - type: MagVisualizer2D + - type: MagVisualizer magState: mag steps: 5 zeroVisible: false @@ -238,4 +238,4 @@ soundBoltClosed: /Audio/Weapons/Guns/Cock/shotgun_close.ogg - type: Appearance visuals: - - type: BarrelBoltVisualizer2D + - type: BarrelBoltVisualizer diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index eacbbc9c58..2d9acc1abb 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -48,7 +48,7 @@ - type: BoltActionBarrel - type: Appearance visuals: - - type: BarrelBoltVisualizer2D + - type: BarrelBoltVisualizer - type: entity name: Kardashev-Mosin @@ -64,7 +64,7 @@ - type: BoltActionBarrel - type: Appearance visuals: - - type: BarrelBoltVisualizer2D + - type: BarrelBoltVisualizer - type: entity name: Hristov @@ -83,4 +83,4 @@ fillPrototype: CartridgeAntiMaterial - type: Appearance visuals: - - type: BarrelBoltVisualizer2D + - type: BarrelBoltVisualizer